отдача в интерфейс заливки параграфа из темы

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

Common/Charts/DrawingObjects.js

@@ -873,7 +873,14 @@ function asc_CParagraphShd(obj) {
 
     if (obj) {
         this.Value = (undefined != obj.Value) ? obj.Value : null;
-        this.Color = (undefined != obj.Color && null != obj.Color) ? CreateAscColorCustom( obj.Color.r, obj.Color.g, obj.Color.b ) : null;
+        if(obj.Unifill && obj.Unifill.fill && obj.Unifill.fill.type === FILL_TYPE_SOLID && obj.Unifill.fill.color)
+        {
+            this.Color = CreateAscColor(obj.Unifill.fill.color);
+        }
+        else
+        {
+            this.Color = (undefined != obj.Color && null != obj.Color) ? CreateAscColorCustom( obj.Color.r, obj.Color.g, obj.Color.b ) : null;
+        }
     }
     else {
         this.Value = shd_Nil;

Common/Drawings/Format/GroupShape.js

@@ -1542,19 +1542,10 @@ CGroupShape.prototype =
     updateCoordinatesAfterInternalResize: function()
     {
         this.normalize();
-        //var scale_coeffs = this.getResultScaleCoefficients();
         for(var i = 0; i < this.spTree.length; ++i)
         {
             if(this.spTree[i].isGroup())
                 this.spTree[i].updateCoordinatesAfterInternalResize();
-          /*  else
-            {
-                var xfrm2 = this.spTree[i].spPr.xfrm;
-                xfrm2.setOffX(xfrm2.offX*scale_coeffs.cx);
-                xfrm2.setOffY(xfrm2.offY*scale_coeffs.cy);
-                xfrm2.setExtX(xfrm2.extX*scale_coeffs.cx);
-                xfrm2.setExtY(xfrm2.extY*scale_coeffs.cy);
-            }*/
         }
 
         var sp_tree = this.spTree;

Word/Editor/Document.js

@@ -7486,6 +7486,10 @@ CDocument.prototype =
             if ( undefined != ParaPr.Tabs )
                 editor.Update_ParaTab( Default_Tab_Stop, ParaPr.Tabs );
 
+            if(ParaPr.Shd && ParaPr.Shd.Unifill)
+            {
+                ParaPr.Shd.Unifill.check(this.theme, this.Get_ColorMap());
+            }
             editor.UpdateParagraphProp( ParaPr );
         }
     },
@@ -7521,6 +7525,10 @@ CDocument.prototype =
                 var RGBAColor = TextPr.Unifill.getRGBAColor();
                 TextPr.Color = new CDocumentColor(RGBAColor.R, RGBAColor.G, RGBAColor.B, false);
             }
+            if(TextPr.Shd && TextPr.Shd.Unifill)
+            {
+                TextPr.Shd.Unifill.check(this.theme, this.Get_ColorMap());
+            }
             editor.UpdateTextPr(TextPr);
         }
     },

Word/api.js

@@ -1834,7 +1834,15 @@ function CParagraphShd (obj)
 	if (obj)
 	{
 		this.Value = (undefined != obj.Value) ? obj.Value : null;
-		this.Color = (undefined != obj.Color && null != obj.Color) ? CreateAscColorCustom( obj.Color.r, obj.Color.g, obj.Color.b ) : null;
+
+        if(obj.Unifill && obj.Unifill.fill && obj.Unifill.fill.type === FILL_TYPE_SOLID && obj.Unifill.fill.color)
+        {
+            this.Color = CreateAscColor(obj.Unifill.fill.color);
+        }
+        else
+        {
+            this.Color = (undefined != obj.Color && null != obj.Color) ? CreateAscColorCustom( obj.Color.r, obj.Color.g, obj.Color.b ) : null;
+        }
 	}
 	else
 	{