fix bug 34567

cell/apiDefines.js

@@ -50,7 +50,8 @@ var c_oAscConfirm = {
 };
 
 var c_oAscMergeOptions = {
-  Unmerge: 0,
+  Disabled: -1,
+  None: 0,
   Merge: 1,
   MergeCenter: 2,
   MergeAcross: 3
@@ -74,12 +75,6 @@ var c_oAscBorderOptions = {
   InnerH: 7
 };
 
-	var c_oAscMergeOptions = {
-		Disabled: -1,
-		None: 0,
-		Merged: 1
-	};
-
 var c_oAscCleanOptions = {
   All: 0,
   Text: 1,
@@ -437,7 +432,8 @@ var c_oAscPopUpSelectorType = {
   prot['ConfirmPutMergeRange'] = prot.ConfirmPutMergeRange;
   window['Asc']['c_oAscMergeOptions'] = window['Asc'].c_oAscMergeOptions = c_oAscMergeOptions;
   prot = c_oAscMergeOptions;
-  prot['Unmerge'] = prot.Unmerge;
+  prot['Disabled'] = prot.Disabled;
+  prot['None'] = prot.None;
   prot['Merge'] = prot.Merge;
   prot['MergeCenter'] = prot.MergeCenter;
   prot['MergeAcross'] = prot.MergeAcross;
@@ -451,11 +447,6 @@ var c_oAscPopUpSelectorType = {
   prot['DiagU'] = prot.DiagU;
   prot['InnerV'] = prot.InnerV;
   prot['InnerH'] = prot.InnerH;
-	window['Asc']['c_oAscMergeOptions'] = window['Asc'].c_oAscMergeOptions = c_oAscMergeOptions;
-	prot = c_oAscMergeOptions;
-	prot['Disabled'] = prot.Disabled;
-	prot['None'] = prot.None;
-	prot['Merged'] = prot.Merged;
   window['Asc']['c_oAscCleanOptions'] = window['Asc'].c_oAscCleanOptions = c_oAscCleanOptions;
   prot = c_oAscCleanOptions;
   prot['All'] = prot.All;

cell/model/CellInfo.js

@@ -42,7 +42,7 @@
 
   /** @constructor */
   function asc_CCellFlag() {
-    this.merge = false;
+    this.merge = Asc.c_oAscMergeOptions.None;
     this.shrinkToFit = false;
     this.wrapText = false;
     this.selectionType = null;

cell/view/WorksheetView.js

@@ -7037,7 +7037,7 @@
 
         cell_info.comments = this.cellCommentator.getComments(ar.c1, ar.r1);
 		cell_info.flags.merge = range.isOneCell() ? Asc.c_oAscMergeOptions.Disabled :
-			null !== range.hasMerged() ? Asc.c_oAscMergeOptions.Merged : Asc.c_oAscMergeOptions.None;
+			null !== range.hasMerged() ? Asc.c_oAscMergeOptions.Merge : Asc.c_oAscMergeOptions.None;
 
         var sheetId = this.model.getId();
 		var lockInfo;
@@ -8606,7 +8606,7 @@
                                 range.merge(val);
                                 t.cellCommentator.mergeComments(range.getBBox0());
                                 break;
-                            case c_oAscMergeOptions.Unmerge:
+                            case c_oAscMergeOptions.None:
                                 range.unmerge();
                                 break;
                             case c_oAscMergeOptions.MergeAcross: