Merge branch 'develop' of https://github.com/ONLYOFFICE/sdkjs into develop

cell/apiDefines.js

@@ -38,7 +38,8 @@ function (window, undefined) {
   var CColor = AscCommon.CColor;
 
 var c_oAscConfirm = {
-  ConfirmReplaceRange: 0
+  ConfirmReplaceRange: 0,
+  ConfirmPutMergeRange: 1
 };
 
 var c_oAscAlignType = {
@@ -319,6 +320,7 @@ var c_oAscPopUpSelectorType = {
   window['Asc']['c_oAscConfirm'] = window['Asc'].c_oAscConfirm = c_oAscConfirm;
   prot = c_oAscConfirm;
   prot['ConfirmReplaceRange'] = prot.ConfirmReplaceRange;
+  prot['ConfirmPutMergeRange'] = prot.ConfirmPutMergeRange;
   window['Asc']['c_oAscMergeOptions'] = window['Asc'].c_oAscMergeOptions = c_oAscMergeOptions;
   prot = c_oAscMergeOptions;
   prot['Unmerge'] = prot.Unmerge;

cell/model/Workbook.js

@@ -4823,7 +4823,10 @@ Woorksheet.prototype._moveRange=function(oBBoxFrom, oBBoxTo, copyRange){
         sortDependency(this.workbook);
 	}
 	
-	this.autoFilters.unmergeTablesAfterMove( oBBoxTo );
+	if(true == this.workbook.bUndoChanges || true == this.workbook.bRedoChanges)
+	{
+		this.autoFilters.unmergeTablesAfterMove( oBBoxTo );
+	}
 	
 	// ToDo возможно нужно уменьшить диапазон обновления
     History.Add(AscCommonExcel.g_oUndoRedoWorksheet, AscCH.historyitem_Worksheet_MoveRange,

cell/view/WorksheetView.js

@@ -8860,6 +8860,13 @@
 
                 // Вызовем на всякий случай, т.к. мы можем уже обновиться из-за формул ToDo возможно стоит убрать это в дальнейшем (но нужна переработка формул) - http://bugzserver/show_bug.cgi?id=24505
                 t._updateSelectionNameAndInfo();
+				
+				if(null !== t.model.getRange3( arnTo.r1, arnTo.c1, arnTo.r2, arnTo.c2 ).hasMerged() && false !== t.model.autoFilters._intersectionRangeWithTableParts(arnTo))
+				{
+					t.model.workbook.handlers.trigger( "asc_onConfirmAction", Asc.c_oAscConfirm.ConfirmPutMergeRange, function () {
+						t.model.autoFilters.unmergeTablesAfterMove( arnTo );
+					});
+				}
             };
 
             if ( t.model.autoFilters._searchFiltersInRange( arnFrom ) ) {

word/Editor/GraphicObjects/GraphicObjects.js

@@ -69,7 +69,7 @@ function CBoundsRectForMath(oDrawing)
                         this.B = oDrawing.wrappingPolygon.bottom - this.Distance.B;
                         break;
                     }
-                    case WRAPPING_TYPE_TOP_AND_BOTTOM:
+                    case AscCommon.WRAPPING_TYPE_TOP_AND_BOTTOM:
                     {
                         var oLimits = editor.WordControl.m_oLogicDocument.Get_PageLimits(oDrawing.PageNum);
                         this.L = oLimits.X;
@@ -101,7 +101,7 @@ function CBoundsRectForMath(oDrawing)
                         this.B = oDrawing.Y + oDrawing.H;
                         break;
                     }
-                    case WRAPPING_TYPE_TOP_AND_BOTTOM:
+                    case AscCommon.WRAPPING_TYPE_TOP_AND_BOTTOM:
                     {
                         var oLimits = editor.WordControl.m_oLogicDocument.Get_PageLimits(oDrawing.PageNum);
                         this.L = oLimits.X;

word/Editor/GraphicObjects/WrapManager.js

@@ -288,7 +288,7 @@ CWrapPolygon.prototype =
                 }
                 break;
             }
-            case WRAPPING_TYPE_TOP_AND_BOTTOM:
+            case AscCommon.WRAPPING_TYPE_TOP_AND_BOTTOM:
             {
                 if (this.right < LeftField || this.left > RightField)
                     return ret;