Поставил пересчет в DrawingObjects после обновления метрик ячеек для...

Поставил пересчет в DrawingObjects после обновления метрик ячеек для правильного расчета позиций картинок на листе.

git-svn-id: svn://192.168.3.15/activex/AVS/Sources/TeamlabOffice/trunk/OfficeWeb@59489 954022d7-b5bf-4e40-9824-e11837661b57

Excel/model/History.js

@@ -276,16 +276,6 @@ CHistory.prototype.UndoRedoEnd = function (Point, oRedoObjectParam, bUndo) {
 
 	if (null != Point) {
 		if (bUndo) {
-
-            if(!window["NATIVE_EDITOR_ENJINE"]) {
-                this.Get_RecalcData(Point);
-                wsViews = Asc["editor"].wb.wsViews;
-                for (i = 0; i < wsViews.length; ++i) {
-                    if (wsViews[i] && wsViews[i].objectRender && wsViews[i].objectRender.controller) {
-                        wsViews[i].objectRender.controller.recalculate2(undefined);
-                    }
-                }
-            }
 			gUndoInsDelCellsFlag = true;
 		}
 		//синхронизация index и id worksheet
@@ -309,6 +299,29 @@ CHistory.prototype.UndoRedoEnd = function (Point, oRedoObjectParam, bUndo) {
 		for (i in Point.UpdateRigions)
 			this.workbook.handlers.trigger("cleanCellCache", i, Point.UpdateRigions[i], false, true);
 
+
+
+		for (i in oRedoObjectParam.oChangeWorksheetUpdate)
+			this.workbook.handlers.trigger("changeWorksheetUpdate",
+				oRedoObjectParam.oChangeWorksheetUpdate[i],{lockDraw: true});
+		if (oRedoObjectParam.bOnSheetsChanged)
+			this.workbook.handlers.trigger("asc_onSheetsChanged");
+		for (i in oRedoObjectParam.oOnUpdateTabColor) {
+			var curSheet = this.workbook.getWorksheetById(i);
+			if (curSheet)
+				this.workbook.handlers.trigger("asc_onUpdateTabColor", curSheet.getIndex());
+		}
+
+        if(!window["NATIVE_EDITOR_ENJINE"]) {
+            this.Get_RecalcData(Point);
+            wsViews = Asc["editor"].wb.wsViews;
+            for (i = 0; i < wsViews.length; ++i) {
+                if (wsViews[i] && wsViews[i].objectRender && wsViews[i].objectRender.controller) {
+                    wsViews[i].objectRender.controller.recalculate2(undefined);
+                }
+            }
+        }
+
         if (bUndo) {
             if (Point.SelectionState) {
                 this.workbook.handlers.trigger("setSelectionState", Point.SelectionState);
@@ -328,16 +341,7 @@ CHistory.prototype.UndoRedoEnd = function (Point, oRedoObjectParam, bUndo) {
                     this.workbook.handlers.trigger("setSelection", oSelectRange.clone());
             }
         }
-		for (i in oRedoObjectParam.oChangeWorksheetUpdate)
-			this.workbook.handlers.trigger("changeWorksheetUpdate",
-				oRedoObjectParam.oChangeWorksheetUpdate[i],{lockDraw: true});
-		if (oRedoObjectParam.bOnSheetsChanged)
-			this.workbook.handlers.trigger("asc_onSheetsChanged");
-		for (i in oRedoObjectParam.oOnUpdateTabColor) {
-			var curSheet = this.workbook.getWorksheetById(i);
-			if (curSheet)
-				this.workbook.handlers.trigger("asc_onUpdateTabColor", curSheet.getIndex());
-		}
+
 		if (oRedoObjectParam.oOnUpdateSheetViewSettings[this.workbook.getWorksheet(this.workbook.getActive()).getId()])
 			this.workbook.handlers.trigger("asc_onUpdateSheetViewSettings");