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

build/configs/webexcel.json

@@ -25,11 +25,11 @@
 		"../common/Drawings/WorkEvents.js",
 		
 		"../cell/model/History.js",
-		"../common/editor/styles.js",
-		"../common/editor/paragraphContent.js",
-		"../common/editor/paragraph.js",
-		"../common/editor/document.js",
-		"../common/editor/documentContent.js",
+		"../word/Editor/Styles.js",
+		"../word/Editor/ParagraphContent.js",
+		"../word/Editor/Paragraph.js",
+		"../word/Editor/Document.js",
+		"../word/Editor/DocumentContent.js",
 		
 		"../common/Shapes/EditorSettings.js",
 		"../common/Shapes/Serialize.js",

build/configs/webpowerpoint.json

@@ -25,11 +25,11 @@
 		"../common/Drawings/WorkEvents.js",
 		
 		"../word/Editor/History.js",
-		"../common/editor/styles.js",
-		"../common/editor/paragraphContent.js",
-		"../common/editor/paragraph.js",
-		"../common/editor/document.js",
-		"../common/editor/documentContent.js",
+		"../word/Editor/Styles.js",
+		"../word/Editor/ParagraphContent.js",
+		"../word/Editor/Paragraph.js",
+		"../word/Editor/Document.js",
+		"../word/Editor/DocumentContent.js",
 		
 		"../common/Shapes/EditorSettings.js",
 		"../common/Shapes/Serialize.js",

build/configs/webword.json

@@ -28,11 +28,11 @@
 		"../common/Drawings/WorkEvents.js",
 		
 		"../word/Editor/History.js",
-		"../common/editor/styles.js",
-		"../common/editor/paragraphContent.js",
-		"../common/editor/paragraph.js",
-		"../common/editor/document.js",
-		"../common/editor/documentContent.js",
+		"../word/Editor/Styles.js",
+		"../word/Editor/ParagraphContent.js",
+		"../word/Editor/Paragraph.js",
+		"../word/Editor/Document.js",
+		"../word/Editor/DocumentContent.js",
 		
 		"../common/Shapes/EditorSettings.js",
 		"../common/Shapes/Serialize.js",

cell/view/WorksheetView.js

@@ -8865,6 +8865,8 @@
 				{
 					t.model.workbook.handlers.trigger( "asc_onConfirmAction", Asc.c_oAscConfirm.ConfirmPutMergeRange, function () {
 						t.model.autoFilters.unmergeTablesAfterMove( arnTo );
+						t._updateCellsRange( arnTo, false, true );
+						t._recalculateAfterUpdate( [arnFrom, arnTo] );
 					});
 				}
             };