Bug 28121 - Дублирование цветовых схем таблицы после сборки версии

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

Common/Shapes/SerializeWriter.js

@@ -541,9 +541,19 @@ function CBinaryFileWriter()
         //if (0 < _count_table_styles)
         //{
 
-        for(var key in presentation.TableStylesIdMap)
+        var oTableStyleIdMap;
+        if(presentation.GetTableStyleIdMap)
         {
-            if(presentation.TableStylesIdMap.hasOwnProperty(key))
+            oTableStyleIdMap = {};
+            presentation.GetTableStyleIdMap(oTableStyleIdMap);
+        }
+        else
+        {
+            oTableStyleIdMap = presentation.TableStylesIdMap;
+        }
+        for(var key in oTableStyleIdMap)
+        {
+            if(oTableStyleIdMap.hasOwnProperty(key))
             {
                 this.tableStylesGuides[key] = "{" + GUID() + "}"
             }

PowerPoint/Editor/Format/Presentation.js

@@ -1516,6 +1516,33 @@ CPresentation.prototype =
         return new CParaPr();
     },
 
+
+    GetTableStyleIdMap : function(oMap)
+    {
+        for(var i = 0; i < this.Slides.length; ++i)
+        {
+            this.CollectStyleId(oMap, this.Slides[i].cSld.spTree);
+        }
+    },
+
+    CollectStyleId : function(oMap, aSpTree)
+    {
+        for(var i = 0; i < aSpTree.length; ++i)
+        {
+            if(aSpTree[i].getObjectType() === historyitem_type_GraphicFrame)
+            {
+                if(isRealObject(aSpTree[i].graphicObject) && typeof aSpTree[i].graphicObject.TableStyle === "string" && isRealObject(g_oTableId.Get_ById(aSpTree[i].graphicObject.TableStyle)))
+                {
+                    oMap[aSpTree[i].graphicObject.TableStyle] = true;
+                }
+            }
+            else if(aSpTree[i].getObjectType() === historyitem_type_GroupShape)
+            {
+                this.CollectStyleId(oMap, aSpTree[i].spTree);
+            }
+        }
+    },
+
     // Обновляем данные в интерфейсе о свойствах параграфа
     Interface_Update_ParaPr : function()
     {