Bug 27747 - Невозможно применить заливку для автофигур по умолчанию

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

Common/Drawings/Format/Format.js

@@ -8646,29 +8646,6 @@ function CSpPr()
     this.Fill       = null;
     this.ln         = null;
     this.parent     = null;
-    this.merge = function(spPr)
-    {
-        /*if(spPr.xfrm != null)
-         {
-         this.xfrm.merge(spPr.xfrm);
-         }  */
-        if(spPr.geometry!=null)
-        {
-            this.geometry = spPr.geometry.createDuplicate();
-        }
-
-        if(spPr.Fill!=null && spPr.Fill.fill!=null)
-        {
-            //this.Fill = spPr.Fill.createDuplicate();
-        }
-
-        /*if(spPr.ln!=null)
-         {
-         if(this.ln == null)
-         this.ln = new CLn();
-         this.ln.merge(spPr.ln);
-         }  */
-    };
 
 
     this.Id = g_oIdCounter.Get_NewId();
@@ -8765,6 +8742,30 @@ CSpPr.prototype =
         }
     },
 
+    merge: function(spPr)
+    {
+        /*if(spPr.xfrm != null)
+         {
+         this.xfrm.merge(spPr.xfrm);
+         }  */
+        if(spPr.geometry!=null)
+        {
+            this.geometry = spPr.geometry.createDuplicate();
+        }
+
+        if(spPr.Fill!=null && spPr.Fill.fill!=null)
+        {
+            //this.Fill = spPr.Fill.createDuplicate();
+        }
+
+        /*if(spPr.ln!=null)
+         {
+         if(this.ln == null)
+         this.ln = new CLn();
+         this.ln.merge(spPr.ln);
+         }  */
+    },
+
     getObjectType: function()
     {
         return historyitem_type_SpPr;

Common/Drawings/Format/Shape.js

@@ -669,7 +669,7 @@ CShape.prototype =
         {
             return this.spPr.geometry.canFill();
         }
-        return false;
+        return true;
     },
 
     isShape: function () {