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

Common/Shapes/Serialize.js

@@ -1804,7 +1804,7 @@ function BinaryPPTYLoader()
                                     uni_fill.fill.colors[uni_fill.fill.colors.length] = _gs;
                                 }
 
-                                s.Seek2(_e);
+                                s.Seek2(_e1);
 
                                 uni_fill.fill.colors.sort(function(a,b){return a.pos- b.pos;});
 

PowerPoint/Drawing/DrawingDocument.js

@@ -1113,6 +1113,7 @@ function CDrawingDocument()
 
     this.ClearCachePages = function()
     {
+        this.m_oWordControl.SlideDrawer.IsCached = false;
         return;
     }
 

PowerPoint/Editor/Format.js

@@ -1077,11 +1077,72 @@ CGs.prototype =
     }
 };
 
+function GradLin()
+{
+    this.angle = 5400000;
+    this.scale = true;
+}
+GradLin.prototype =
+{
+    IsIdentical : function(lin)
+    {
+        if (this.angle != lin.angle)
+            return false;
+        if (this.scale != lin.scale)
+            return false;
+
+        return true;
+    },
+
+    createDuplicate : function()
+    {
+        var duplicate = new GradLin();
+        duplicate.angle = this.angle;
+        duplicate.scale = this.scale;
+        return duplicate;
+    },
+
+    compare : function(lin)
+    {
+        return null;
+    }
+};
+
+function GradPath()
+{
+    this.path = 0;
+    this.rect = null;
+}
+GradPath.prototype =
+{
+    IsIdentical : function(path)
+    {
+        if (this.path != path.path)
+            return false;
+        return true;
+    },
+
+    createDuplicate : function()
+    {
+        var duplicate = new GradPath();
+        duplicate.path = this.path;
+        return duplicate;
+    },
+
+    compare : function(path)
+    {
+        return null;
+    }
+};
+
 function CGradFill()
 {
     this.type = FILL_TYPE_GRAD;
     // пока просто front color
     this.colors = new Array();
+
+    this.lin = null;
+    this.path = null;
 }
 
 CGradFill.prototype =
@@ -1118,6 +1179,12 @@ CGradFill.prototype =
             duplicate.colors[i] = this.colors[i].createDuplicate();
         }
 
+        if (this.lin)
+            duplicate.lin = this.lin.createDuplicate();
+
+        if (this.path)
+            duplicate.path = this.path.createDuplicate();
+
         return duplicate;
     },