Bug 30335 - [TextArt][CoEdit] JS ошибка "createDuplicate" после изменения 2-ым...

Bug 30335 - [TextArt][CoEdit] JS ошибка "createDuplicate" после изменения 2-ым юзером текста с узорной заливкой

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

Common/Drawings/Format/Format.js

@@ -2179,7 +2179,10 @@ CSolidFill.prototype =
     createDuplicate : function()
     {
         var duplicate = new CSolidFill();
-        duplicate.color = this.color.createDuplicate();
+        if(this.color)
+        {
+            duplicate.color = this.color.createDuplicate();
+        }
         return duplicate;
     },
 
@@ -2267,7 +2270,10 @@ CGs.prototype =
     {
         var duplicate = new CGs();
         duplicate.pos = this.pos;
-        duplicate.color = this.color.createDuplicate();
+        if(this.color)
+        {
+            duplicate.color = this.color.createDuplicate();
+        }
         return duplicate;
     },
 
@@ -2781,8 +2787,14 @@ CPattFill.prototype =
     {
         var duplicate = new CPattFill();
         duplicate.ftype = this.ftype;
-        duplicate.fgClr = this.fgClr.createDuplicate();
-        duplicate.bgClr = this.bgClr.createDuplicate();
+        if(this.fgClr)
+        {
+            duplicate.fgClr = this.fgClr.createDuplicate();
+        }
+        if(this.bgClr)
+        {
+            duplicate.bgClr = this.bgClr.createDuplicate();
+        }
         return duplicate;
     },
     compare : function(fill)

Common/apiCommon.js

@@ -2961,10 +2961,18 @@ function CorrectUniFill(asc_fill, unifill, editorId)
                 {
                     ret.fill.fgClr = CorrectUniColor(_fill.fgClr, ret.fill.fgClr, editorId);
                 }
+                if(!ret.fill.fgClr)
+                {
+                    ret.fill.fgClr = CreateUniColorRGB(0, 0, 0);
+                }
                 if (undefined != _fill.bgClr)
                 {
                     ret.fill.bgClr = CorrectUniColor(_fill.bgClr, ret.fill.bgClr, editorId);
                 }
+                if(!ret.fill.bgClr)
+                {
+                    ret.fill.bgClr = CreateUniColorRGB(0, 0, 0);
+                }
 
                 break;
             }