fix bug 34567

apps/spreadsheeteditor/main/app/controller/Toolbar.js

@@ -608,7 +608,7 @@ define([
 
             if (me.api) {
                 var merged = me.api.asc_getCellInfo().asc_getFlags().asc_getMerge();
-                if ((merged !== Asc.c_oAscMergeOptions.Merged) && me.api.asc_mergeCellsDataLost(item.value)) {
+                if ((merged !== Asc.c_oAscMergeOptions.Merge) && me.api.asc_mergeCellsDataLost(item.value)) {
                     Common.UI.warning({
                         msg: me.warnMergeLostData,
                         buttons: ['yes', 'no'],
@@ -1940,7 +1940,7 @@ define([
 
                     val = info.asc_getFlags().asc_getMerge();
                     if (this._state.merge !== val) {
-                        toolbar.btnMerge.toggle(val===Asc.c_oAscMergeOptions.Merged, true);
+                        toolbar.btnMerge.toggle(val===Asc.c_oAscMergeOptions.Merge, true);
                         this._state.merge = val;
                     }
 

apps/spreadsheeteditor/main/app/view/Toolbar.js

@@ -392,7 +392,7 @@ define([
                         },
                         {
                             caption : me.txtUnmerge,
-                            value   : Asc.c_oAscMergeOptions.Unmerge
+                            value   : Asc.c_oAscMergeOptions.None
                         }
                     ]
                 })

apps/spreadsheeteditor/mobile/app/controller/DocumentHolder.js

@@ -127,7 +127,7 @@ define([
                     }
                     break;
                 case 'unmerge':
-                    me.api.asc_mergeCells(Asc.c_oAscMergeOptions.Unmerge);
+                    me.api.asc_mergeCells(Asc.c_oAscMergeOptions.None);
                     break;
                 case 'hide':
                     me.api[info.asc_getFlags().asc_getSelectionType() == Asc.c_oAscSelectionType.RangeRow ? 'asc_hideRows' : 'asc_hideColumns']();
@@ -284,7 +284,7 @@ define([
                                 event: 'merge'
                             });
 
-                            (cellinfo.asc_getFlags().asc_getMerge() ==  Asc.c_oAscMergeOptions.Merged) &&
+                            (cellinfo.asc_getFlags().asc_getMerge() ==  Asc.c_oAscMergeOptions.Merge) &&
                             menuItems.push({
                                 caption: me.menuUnmerge,
                                 event: 'unmerge'