Поправлен баг с черным фоном preview текстартов для некоторых документов.

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

Common/Charts/charts.js

@@ -815,6 +815,8 @@ TextArtPreviewManager.prototype.getShape =  function()
 	var oTrack = new NewShapeTrack("textRect", 0, 0, oParentObjects.theme, oParentObjects.master, oParentObjects.layout, oParentObjects.slide, 0);
 	oTrack.track({}, oShape.convertPixToMM(this.canvasWidth), oShape.convertPixToMM(this.canvasHeight));
 	oShape = oTrack.getShape(bWord, oShape.getDrawingDocument(), oShape.drawingObjects);
+    oShape.setStyle(null);
+    oShape.spPr.setFill(CreateUnfilFromRGB(255, 255, 255));
 	var oBodypr = oShape.getBodyPr().createDuplicate();
 	oBodypr.lIns = 0;
 	oBodypr.tIns = 0;

Common/Drawings/States.js

@@ -25,7 +25,18 @@ StartAddNewShape.prototype =
         this.startX = x;
         this.startY = y;
         this.drawingObjects.arrPreTrackObjects.length = 0;
-        this.drawingObjects.arrPreTrackObjects.push(new NewShapeTrack(this.preset, x, y, this.drawingObjects.getTheme(), null, null, null, 0));
+        var layout = null, master = null, slide = null;
+        if(this.drawingObjects.drawingObjects && this.drawingObjects.drawingObjects.cSld &&  this.drawingObjects.drawingObjects.getParentObjects)
+        {
+            var oParentObjects = this.drawingObjects.drawingObjects.getParentObjects();
+            if(isRealObject(oParentObjects))
+            {
+                layout = oParentObjects.layout;
+                master = oParentObjects.master;
+                slide = oParentObjects.slide;
+            }
+        }
+        this.drawingObjects.arrPreTrackObjects.push(new NewShapeTrack(this.preset, x, y, this.drawingObjects.getTheme(), master, layout, slide, 0));
         this.bStart = true;
         this.drawingObjects.swapTrackObjects();
     },

Common/Drawings/TrackObjects/NewShapeTracks.js

@@ -78,6 +78,11 @@ function NewShapeTrack(presetGeom, startX, startY, theme, master, layout, slide,
             fill.fill.color.color.id = 12;
             pen.merge(ln);
             brush.merge(fill);
+            if(slide)
+            {
+                brush = CreateNoFillUniFill();
+                pen = CreateNoFillLine();
+            }
         }
 
         if(this.arrowsCount > 0)

PowerPoint/Editor/Format/Slide.js

@@ -885,6 +885,20 @@ Slide.prototype =
         }
     },
 
+    getParentObjects: function()
+    {
+        var oRet = {master: null, layout: null, slide: this};
+        if(this.Layout)
+        {
+            oRet.layout = this.Layout;
+            if(this.Layout.Master)
+            {
+                oRet.master = this.Layout.Master;
+            }
+        }
+        return oRet;
+    },
+
     getAllImages: function(images)
     {
         if(this.cSld.Bg && this.cSld.Bg.bgPr && this.cSld.Bg.bgPr.Fill && this.cSld.Bg.bgPr.Fill.fill instanceof  CBlipFill && typeof this.cSld.Bg.bgPr.Fill.fill.RasterImageId === "string" )