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

Excel/model/DrawingObjects/Format/Chart.js

@@ -65,6 +65,12 @@ CChartAsGroup.prototype =
 
     },
 
+
+    recalculateColors: function()
+    {
+        this.recalculate();
+    },
+
     isChart: function()
     {
         return true;

Excel/model/DrawingObjects/Format/GroupShape.js

@@ -405,6 +405,8 @@ CGroupShape.prototype =
         }
     },
 
+
+
     recalculateTransform: function()
     {
         var xfrm = this.spPr.xfrm;
@@ -705,6 +707,139 @@ CGroupShape.prototype =
 
     },
 
+    setCellBackgroundColor: function(color)
+    {
+        for(var i = 0; i < this.spTree.length; ++i)
+        {
+            if(typeof this.spTree[i].setCellBackgroundColor === "function")
+                this.spTree[i].setCellBackgroundColor(color);
+        }
+    },
+
+    setCellAllFontName: function(fontName)
+    {
+        for(var i = 0; i < this.spTree.length; ++i)
+        {
+            if(typeof this.spTree[i].setCellAllFontName === "function")
+                this.spTree[i].setCellAllFontName(fontName);
+        }
+    },
+
+    setCellAllFontSize: function(val)
+    {
+        for(var i = 0; i < this.spTree.length; ++i)
+        {
+            if(typeof this.spTree[i].setCellAllFontSize === "function")
+                this.spTree[i].setCellAllFontSize(val);
+        }
+    },
+
+    setCellAllBold: function(val)
+    {
+        for(var i = 0; i < this.spTree.length; ++i)
+        {
+            if(typeof this.spTree[i].setCellAllBold === "function")
+                this.spTree[i].setCellAllBold(val);
+        }
+    },
+
+    setCellAllItalic: function(val)
+    {
+        for(var i = 0; i < this.spTree.length; ++i)
+        {
+            if(typeof this.spTree[i].setCellAllItalic === "function")
+                this.spTree[i].setCellAllItalic(val);
+        }
+    },
+
+    setCellAllUnderline: function(val)
+    {
+        for(var i = 0; i < this.spTree.length; ++i)
+        {
+            if(typeof this.spTree[i].setCellAllUnderline === "function")
+                this.spTree[i].setCellAllUnderline(val);
+        }
+    },
+
+    setCellAllStrikeout: function(val)
+    {
+        for(var i = 0; i < this.spTree.length; ++i)
+        {
+            if(typeof this.spTree[i].setCellAllStrikeout === "function")
+                this.spTree[i].setCellAllStrikeout(val);
+        }
+    },
+
+    setCellAllSubscript: function(val)
+    {
+        for(var i = 0; i < this.spTree.length; ++i)
+        {
+            if(typeof this.spTree[i].setCellAllSubscript === "function")
+                this.spTree[i].setCellAllSubscript(val);
+        }
+    },
+
+    setCellAllSuperscript: function(val)
+    {
+        for(var i = 0; i < this.spTree.length; ++i)
+        {
+            if(typeof this.spTree[i].setCellAllSuperscript === "function")
+                this.spTree[i].setCellAllSuperscript(val);
+        }
+    },
+
+    setCellAllAlign: function(val)
+    {
+        for(var i = 0; i < this.spTree.length; ++i)
+        {
+            if(typeof this.spTree[i].setCellAllAlign === "function")
+                this.spTree[i].setCellAllAlign(val);
+        }
+    },
+
+    setCellAllVertAlign: function(val)
+    {
+        for(var i = 0; i < this.spTree.length; ++i)
+        {
+            if(typeof this.spTree[i].setCellAllVertAlign === "function")
+                this.spTree[i].setCellAllVertAlign(val);
+        }
+    },
+
+    setCellAllTextColor:  function(val)
+    {
+        for(var i = 0; i < this.spTree.length; ++i)
+        {
+            if(typeof this.spTree[i].setCellAllTextColor === "function")
+                this.spTree[i].setCellAllTextColor(val);
+        }
+    },
+    setCellAllAngle: function(val)
+    {
+        for(var i = 0; i < this.spTree.length; ++i)
+        {
+            if(typeof this.spTree[i].setCellAllAngle === "function")
+                this.spTree[i].setCellAllAngle(val);
+        }
+    },
+
+    increaseAllFontSize: function()
+    {
+        for(var i = 0; i < this.spTree.length; ++i)
+        {
+            if(typeof this.spTree[i].increaseAllFontSize === "function")
+                this.spTree[i].increaseAllFontSize();
+        }
+    },
+
+    decreaseAllFontSize: function()
+    {
+        for(var i = 0; i < this.spTree.length; ++i)
+        {
+            if(typeof this.spTree[i].decreaseAllFontSize === "function")
+                this.spTree[i].decreaseAllFontSize();
+        }
+    },
 
     drawAdjustments: function(drawingDocument)
     {
@@ -830,6 +965,16 @@ CGroupShape.prototype =
     },
 
 
+
+    recalculateColors: function()
+    {
+        for(var i = 0; i < this.spTree.length; ++i)
+        {
+            if(typeof this.spTree[i].recalculateColors==="function")
+                this.spTree[i].recalculateColors();
+        }
+    },
+
     deselect: function(drawingObjectsController)
     {
         this.selected = false;

Excel/model/DrawingObjects/Format/Shape.js

@@ -442,7 +442,6 @@ CShape.prototype =
             this.txBody.paragraphAdd(text_pr);
             this.txBody.content.Set_ApplyToAll(false);
             this.calculateTransformTextMatrix();
-
         }
     },
 
@@ -570,7 +569,8 @@ CShape.prototype =
                 this.txBody.content.Set_ApplyToAll(true);
                 this.txBody.content.Set_ParagraphAlign(align_num);
                 this.txBody.content.Set_ApplyToAll(false);
-                //this.calculateTransformTextMatrix();
+                this.calculateContent();
+                this.calculateTransformTextMatrix();
             }
         }
     },
@@ -676,6 +676,29 @@ CShape.prototype =
     },
 
 
+    increaseAllFontSize: function () {
+        if(isRealObject(this.txBody))
+        {
+            this.txBody.content.Set_ApplyToAll(true);
+            this.txBody.content.Paragraph_IncDecFontSize(true);
+            this.txBody.content.Set_ApplyToAll(false);
+            this.txBody.calculateContent();
+            this.calculateTransformTextMatrix();
+        }
+    },
+
+    // Уменьшение размера шрифта
+    decreaseAllFontSize: function () {
+        if(isRealObject(this.txBody))
+        {
+            this.txBody.content.Set_ApplyToAll(true);
+            this.txBody.content.Paragraph_IncDecFontSize(false);
+            this.txBody.content.Set_ApplyToAll(false);
+            this.txBody.calculateContent();
+            this.calculateTransformTextMatrix();
+        }
+    },
+
     insertHyperlink: function (options) {
         if(typeof this.curState.insertHyperlink === "function")
         {
@@ -709,6 +732,12 @@ CShape.prototype =
         this.spPr.xfrm = xfrm;
     },
 
+
+    recalculateColors: function()
+    {
+        this.recalculatePen();
+        this.recalculateBrush();
+    },
     initDefaultTextRect: function(x, y, extX, extY, flipH, flipV)
     {
         this.setXfrmObject(new CXfrm());
@@ -1058,7 +1087,6 @@ CShape.prototype =
 
     paragraphAdd: function(paraItem, bRecalculate)
     {
-        History.Create_NewPoint();
 
         History.Add(g_oUndoRedoGraphicObjects, historyitem_AutoShapes_RecalculateAfterParagraphAddUndo, null, null,
             new UndoRedoDataGraphicObjects(this.Get_Id(), new UndoRedoDataGOSingleProp(null, null)));