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

Excel/model/DrawingObjects/Format/Format.js

@@ -4575,6 +4575,21 @@ function CTheme()
         }
         return new CLn();
     }
+
+    this.changeColorScheme = function(clrScheme)
+    {
+        this.themeElements.clrScheme = clrScheme;
+    };
+
+    this.setFontScheme = function(fontScheme)
+    {
+        this.themeElements.fontScheme = fontScheme;
+    };
+
+    this.setFormatScheme = function(fmtScheme)
+    {
+        this.themeElements.fmtScheme = fmtScheme;
+    };
 }
 // ----------------------------------
 

PowerPoint/Editor/Format/Presentation.js

@@ -1020,6 +1020,17 @@ CPresentation.prototype =
         return this.DrawingObjects.canUnGroup();
     },
 
+    groupShapes: function()
+    {
+        if(this.Document_Is_SelectionLocked(changestype_DrawingProps) === false)
+        {
+            this.Slides[this.CurPage].graphicObjects.groupShapes();
+            this.Recalculate();
+        }
+    },
+
+
+
     Add_FlowImage : function(W, H, Img)
     {
         this.Slides[this.CurPage].graphicObjects.Add_FlowImage(W, H, Img);

PowerPoint/Editor/Format/Shape.js

@@ -3469,7 +3469,7 @@ CShape.prototype =
 
     canGroup: function()
     {
-        return true;//TODO
+        return !this.isPlaceholder();//TODO
     },
 
 

PowerPoint/Editor/GraphicObjects.js

@@ -1613,6 +1613,26 @@ CGraphicObjects.prototype = {
         editor.WordControl.m_oLogicDocument.recalcMap[image.Id] = image;
     },
 
+
+    groupShapes: function()
+    {
+        var objects_for_group = [];
+        var spTree = this.slide.cSld.spTree;
+        for(var i = 0;  i < spTree.length; ++i)
+        {
+            if(spTree[i].selected)
+            {
+                objects_for_group.push(spTree[i]);
+            }
+        }
+        this.slide.removeSelectedObjects();
+        for(var i = 0; i < objects_for_group.length; ++i)
+        {
+
+        }
+    },
+
+
     addChart: function(binary)
     {
         var chart = new CChartAsGroup(this.slide);

Word/Editor/GraphicObjects/ObjectTypes/Format.js

@@ -3464,6 +3464,20 @@ function CTheme()
         }
         return new CLn();
     }
+    this.changeColorScheme = function(clrScheme)
+    {
+        this.themeElements.clrScheme = clrScheme;
+    };
+
+    this.setFontScheme = function(fontScheme)
+    {
+        this.themeElements.fontScheme = fontScheme;
+    };
+
+    this.setFormatScheme = function(fmtScheme)
+    {
+        this.themeElements.fmtScheme = fmtScheme;
+    };
 }
 // ----------------------------------