баг с запоминанием в меню кртинки для заливки

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

Excel/model/DrawingObjects/DrawingObjectsController.js

@@ -1110,10 +1110,18 @@ DrawingObjectsController.prototype =
                 if (pr.fill != null && pr.fill.fill != null && pr.fill.fill.type == FILL_TYPE_BLIP)
                 {
                     this.drawingObjects.drawingDocument.DrawImageTextureFillShape(pr.fill.fill.RasterImageId);
+                }
+                else
+                {
+                    this.drawingObjects.drawingDocument.DrawImageTextureFillShape(null);
                 }
 				shape_props.ShapeProperties.fill = CreateAscFillEx(shape_props.ShapeProperties.fill);
 				shape_props.ShapeProperties.stroke = CreateAscStrokeEx(shape_props.ShapeProperties.stroke);
             }
+            else
+            {
+                this.drawingObjects.drawingDocument.DrawImageTextureFillShape(null);
+            }
             
             ret.push(shape_props);
         }

PowerPoint/api.js

@@ -4092,6 +4092,10 @@ asc_docs_api.prototype.sync_shapePropCallback = function(pr)
     {
         this.WordControl.m_oDrawingDocument.DrawImageTextureFillShape(pr.fill.fill.RasterImageId);
     }
+    else
+    {
+        this.WordControl.m_oDrawingDocument.DrawImageTextureFillShape(null);
+    }
 
     var _len = this.SelectedObjectsStack.length;
     if (_len > 0)
@@ -4151,6 +4155,8 @@ asc_docs_api.prototype.sync_slidePropCallback = function(slide)
     {
         obj.Background = new CAscFill();
         obj.Background.type = c_oAscFill.FILL_TYPE_NOFILL;
+
+        this.WordControl.m_oDrawingDocument.DrawImageTextureFillSlide(null);
     }
     else
     {
@@ -4160,6 +4166,10 @@ asc_docs_api.prototype.sync_slidePropCallback = function(slide)
         {
             this.WordControl.m_oDrawingDocument.DrawImageTextureFillSlide(bgFill.fill.RasterImageId);
         }
+        else
+        {
+            this.WordControl.m_oDrawingDocument.DrawImageTextureFillSlide(null);
+        }
     }
 
     obj.Timing = slide.timing;

Word/Editor/GraphicObjects/GraphicObjects.js

@@ -573,9 +573,17 @@ CGraphicObjects.prototype =
                 {
                     this.drawingDocument.DrawImageTextureFillShape(pr.fill.fill.RasterImageId);
                 }
+                else
+                {
+                    this.drawingDocument.DrawImageTextureFillShape(null);
+                }
 
                 shape_props.ShapeProperties = CreateAscShapePropFromProp(shape_props.ShapeProperties);
             }
+            else
+            {
+                this.drawingDocument.DrawImageTextureFillShape(null);
+            }
 
             if(shape_props.ChartProperties)
             {