Bug 28138 - Ошибка в консоли после отмены примененного стиля и применения шаблона

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

PowerPoint/Editor/Format/Presentation.js

@@ -372,8 +372,10 @@ CPresentation.prototype =
         }
         var _RecalcData = RecalcData ? RecalcData : History.Get_RecalcData(), key, recalcMap, bSync = true, i, bRedrawAllSlides = false, aToRedrawSlides = [], redrawSlideIndexMap = {}, slideIndex;
         this.updateSlideIndexes();
+        var b_check_layout = false;
         if(_RecalcData.Drawings.All || _RecalcData.Drawings.ThemeInfo)
         {
+            b_check_layout = true;
             recalcMap = this.GetRecalculateMaps();
             for(key in recalcMap.masters)
             {
@@ -468,6 +470,10 @@ CPresentation.prototype =
                 this.DrawingDocument.m_oWordControl.GoToPage(this.CurPage);
                 this.bGoToPage = false;
             }
+            else if(b_check_layout)
+            {
+                this.DrawingDocument.m_oWordControl.CheckLayouts();
+            }
             if(this.needSelectPages.length > 0)
             {
                 //for(slideIndex = 0; i < this.needSelectPages.length; ++i)
@@ -2167,6 +2173,7 @@ CPresentation.prototype =
             if ( null != TextPr )
             {
                 this.Paragraph_Add( new ParaTextPr( { VertAlign : TextPr.VertAlign === vertalign_SuperScript ? vertalign_Baseline : vertalign_SuperScript } ) );
+                this.Document_UpdateInterfaceState();
                 bRetValue = true;
             }
         }
@@ -2262,7 +2269,21 @@ CPresentation.prototype =
 
            //this.DrawingDocument.TargetStart();
            //this.DrawingDocument.TargetShow();
+            var target_doc_content1, target_doc_content2, b_update_interface = false;
+            if(this.Slides[this.CurPage])
+            {
+                target_doc_content1 = this.Slides[this.CurPage].graphicObjects.getTargetDocContent();
+            }
             this.Paragraph_Add( new ParaText( String.fromCharCode( Code ) ) );
+            if(this.Slides[this.CurPage])
+            {
+                target_doc_content2 = this.Slides[this.CurPage].graphicObjects.getTargetDocContent();
+            }
+            if(!target_doc_content1 && target_doc_content2)
+            {
+                b_update_interface = true;
+                this.Document_UpdateInterfaceState();
+            }
         }
         bRetValue = true;
     }
@@ -2270,8 +2291,11 @@ CPresentation.prototype =
         if ( true == bRetValue )
         {
             this.Document_UpdateSelectionState();
+            if(!b_update_interface)
+            {
                 this.Document_UpdateUndoRedoState();
             }
+        }
 
         return bRetValue;
     },