From 00fc3770d594315a5c07666e69894dfb36407583 Mon Sep 17 00:00:00 2001
From: Alexander Trofimov <Alexander.Trofimov@onlyoffice.com>
Date: Thu, 14 May 2020 12:16:27 +0300
Subject: [PATCH] [SSE] Move

Move asc_getMerge to cell info
---
 apps/spreadsheeteditor/main/app/controller/Toolbar.js         | 4 ++--
 .../spreadsheeteditor/mobile/app/controller/DocumentHolder.js | 4 ++--
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/apps/spreadsheeteditor/main/app/controller/Toolbar.js b/apps/spreadsheeteditor/main/app/controller/Toolbar.js
index c3f86bb03..02149319c 100644
--- a/apps/spreadsheeteditor/main/app/controller/Toolbar.js
+++ b/apps/spreadsheeteditor/main/app/controller/Toolbar.js
@@ -750,7 +750,7 @@ define([
             }
 
             if (me.api) {
-                var merged = me.api.asc_getCellInfo().asc_getFlags().asc_getMerge();
+                var merged = me.api.asc_getCellInfo().asc_getMerge();
                 if ((merged !== Asc.c_oAscMergeOptions.Merge) && me.api.asc_mergeCellsDataLost(item.value)) {
                     Common.UI.warning({
                         msg: me.warnMergeLostData,
@@ -2312,7 +2312,7 @@ define([
 //                (need_disable !== toolbar.btnMerge.isDisabled()) && toolbar.btnMerge.setDisabled(need_disable);
                     toolbar.lockToolbar(SSE.enumLock.ruleMerge, need_disable, {array:[toolbar.btnMerge, toolbar.btnInsertTable]});
 
-                    val = info.asc_getFlags().asc_getMerge();
+                    val = info.asc_getMerge();
                     if (this._state.merge !== val) {
                         toolbar.btnMerge.toggle(val===Asc.c_oAscMergeOptions.Merge, true);
                         this._state.merge = val;
diff --git a/apps/spreadsheeteditor/mobile/app/controller/DocumentHolder.js b/apps/spreadsheeteditor/mobile/app/controller/DocumentHolder.js
index fa3bc06ca..d2690e3ad 100644
--- a/apps/spreadsheeteditor/mobile/app/controller/DocumentHolder.js
+++ b/apps/spreadsheeteditor/mobile/app/controller/DocumentHolder.js
@@ -407,13 +407,13 @@ define([
                                     event: 'edit'
                                 });
 
-                                (cellinfo.asc_getFlags().asc_getMerge() == Asc.c_oAscMergeOptions.None) &&
+                                (cellinfo.asc_getMerge() == Asc.c_oAscMergeOptions.None) &&
                                 arrItems.push({
                                     caption: me.menuMerge,
                                     event: 'merge'
                                 });
 
-                                (cellinfo.asc_getFlags().asc_getMerge() == Asc.c_oAscMergeOptions.Merge) &&
+                                (cellinfo.asc_getMerge() == Asc.c_oAscMergeOptions.Merge) &&
                                 arrItems.push({
                                     caption: me.menuUnmerge,
                                     event: 'unmerge'