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

Excel/api.js

@@ -2005,9 +2005,6 @@ var ASC_DOCS_API_USE_EMBEDDED_FONTS = "@@ASC_DOCS_API_USE_EMBEDDED_FONTS";
 				this.sheetsChanged();
 			},
 
-            setStartPointHistory: function(){History.Create_NewPoint(); History.StartTransaction()},
-            setEndPointHistory: function(){History.EndTransaction()},
-
 			// Удаление листа
 			asc_deleteWorksheet: function () {
 				// Проверка глобального лока
@@ -2389,6 +2386,9 @@ var ASC_DOCS_API_USE_EMBEDDED_FONTS = "@@ASC_DOCS_API_USE_EMBEDDED_FONTS";
 			},
 
 			// Shapes
+            setStartPointHistory: function(){History.Create_NewPoint(); History.StartTransaction()},
+            setEndPointHistory: function(){History.EndTransaction()},
+
 			asc_startAddShape: function(sPreset) {
 				this.isStartAddShape = true;
 				var ws = this.wb.getWorksheet();
@@ -3396,6 +3396,8 @@ var ASC_DOCS_API_USE_EMBEDDED_FONTS = "@@ASC_DOCS_API_USE_EMBEDDED_FONTS";
 		prot["asc_getWorkbookComments"] = prot.asc_getWorkbookComments;
 		
 		// Shapes
+        prot["setStartPointHistory"] = prot.setStartPointHistory;
+        prot["setEndPointHistory"] = prot.setEndPointHistory;
 		prot["asc_startAddShape"] = prot.asc_startAddShape;
 		prot["asc_endAddShape"] = prot.asc_endAddShape;
 		prot["asc_isAddAutoshape"] = prot.asc_isAddAutoshape;

Excel/model/DrawingObjects/Format/Shape.js

@@ -1070,7 +1070,7 @@ CShape.prototype =
         this.drawingBase = drawingBase;
     },
 
-    recalculate: function()
+    recalculate: function(aImges)
     {
         if(this.recalcInfo.recalculateTransform)
 		{
@@ -1079,7 +1079,7 @@ CShape.prototype =
 		}
         if(this.recalcInfo.recalculateBrush)
 		{
-            this.recalculateBrush();
+            this.recalculateBrush(aImges);
 			this.recalcInfo.recalculateBrush = false;
 		}
 		if(this.recalcInfo.recalculatePen)
@@ -1992,7 +1992,7 @@ CShape.prototype =
         this.setExtents(new_ext_x, new_ext_y);
     },
 
-    recalculateBrush: function()
+    recalculateBrush: function(aImagesSync)
     {
         var brush;
         var wb = this.drawingObjects.getWorkbook();
@@ -2022,6 +2022,17 @@ CShape.prototype =
         brush.merge(this.spPr.Fill);
         this.brush = brush;
         this.brush.calculate(theme, colorMap, RGBA);
+        if(this.brush.fill instanceof CBlipFill && typeof this.brush.fill.RasterImageId === "string")
+        {
+            if(Array.isArray(aImagesSync))
+            {
+                aImagesSync.push(getFullImageSrc(this.brush.fill.RasterImageId));
+            }
+            if(this.drawingObjects)
+            {
+                this.drawingObjects.loadImageRedraw(getFullImageSrc(this.brush.fill.RasterImageId));
+            }
+        }
     },
 
     recalculatePen: function()