стандартные темы добавлялись в меню еще раз после переоткрытия.

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

PowerPoint/Editor/Format/Presentation.js

@@ -335,10 +335,16 @@ CPresentation.prototype =
         };
 
         for(var i = 0; i < this.Slides.length; ++i)
+        {
+            if(this.Slides[i].Layout)
             {
                 ret.layouts[this.Slides[i].Layout.Id] = this.Slides[i].Layout;
+                if(this.Slides[i].Layout.Master)
+                {
                     ret.masters[this.Slides[i].Layout.Master.Id] = this.Slides[i].Layout.Master;
                 }
+            }
+        }
         return ret;
     },
 
@@ -3788,7 +3794,17 @@ CPresentation.prototype =
         }
         this.clearThemeTimeouts();
 
+        for(i = 0; i < this.slideMasters.length; ++i)
+        {
+            if(this.slideMasters[i] === themeInfo.Master)
+            {
+                break;
+            }
+        }
+        if(i === this.slideMasters.length)
+        {
             this.addSlideMaster(this.slideMasters.length, themeInfo.Master);
+        }
         var _new_master = themeInfo.Master;
         _new_master.presentation = this;
         var _master_width = _new_master.Width;

PowerPoint/api.js

@@ -3800,6 +3800,8 @@ asc_docs_api.prototype.OpenDocumentEndCallback = function()
 
             var _masters = this.WordControl.m_oLogicDocument.slideMasters;
             for (var i = 0; i < _masters.length; i++)
+            {
+                if(_masters[i].ThemeIndex < 0)//только темы презентации
                 {
                     var theme_load_info = new CThemeLoadInfo();
                     theme_load_info.Master = _masters[i];
@@ -3820,6 +3822,7 @@ asc_docs_api.prototype.OpenDocumentEndCallback = function()
 
                     this.ThemeLoader.themes_info_document[this.ThemeLoader.Themes.DocumentThemes.length - 1] = theme_load_info;
                 }
+            }
 
             this.sync_InitEditorThemes(this.ThemeLoader.Themes.EditorThemes, this.ThemeLoader.Themes.DocumentThemes);