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

Excel/model/DrawingObjects/Format/Chart.js

@@ -1638,6 +1638,11 @@ CChartAsGroup.prototype =
             this.spPr.xfrm.setPosition(x, y);
         this.init();
         this.recalculate();
+    },
+
+    getBase64Image: function()
+    {
+        return this.brush.fill.canvas.toDataURL();
     }
 };
 

Excel/model/DrawingObjects/Format/Format.js

@@ -4218,7 +4218,9 @@ function CSpPr()
         var boolBWMode = this.bwMode == 1;
         Writer.WriteBool(boolBWMode);
 
-        this.xfrm.Write_ToBinary2(Writer);
+        Writer.WriteBool(isRealObject(this.xfrm));
+        if(isRealObject(this.xfrm))
+            this.xfrm.Write_ToBinary2(Writer);
         var flag = this.geometry != null;
         Writer.WriteBool(flag);
         if(flag)
@@ -4242,11 +4244,14 @@ function CSpPr()
         var boolBWMode = Reader.GetBool();
 
         this.bwMode = boolBWMode ? 1 : 0;
-        if(!this.xfrm)
+        if(Reader.GetBool())
         {
-            this.xfrm = new CXfrm();
+            if(!this.xfrm)
+            {
+                this.xfrm = new CXfrm();
+            }
+            this.xfrm.Read_FromBinary2(Reader);
         }
-        this.xfrm.Read_FromBinary2(Reader);
         var flag = Reader.GetBool();
         if(flag)
         {