Перерисовка табнейлов при вставке слайдов, Bug 27833 - [Copy&Paste][CoEdit] JS...

Перерисовка табнейлов при вставке слайдов, Bug 27833 - [Copy&Paste][CoEdit] JS ошибка после undo копирования слайда

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

PowerPoint/Editor/Format/Presentation.js

@@ -256,6 +256,7 @@ function CPresentation(DrawingDocument)
     this.updateSlideIndex = false;
     this.recalcMap = {};
     this.bClearSearch = true;
+    this.needSelectPages = [];
 
     this.forwardChangeThemeTimeOutId = null;
     this.backChangeThemeTimeOutId = null;
@@ -466,6 +467,14 @@ CPresentation.prototype =
                 this.DrawingDocument.m_oWordControl.GoToPage(this.CurPage);
                 this.bGoToPage = false;
             }
+            if(this.needSelectPages.length > 0)
+            {
+                //for(slideIndex = 0; i < this.needSelectPages.length; ++i)
+                //{
+                //    this.DrawingDocument.SelectPage(this.needSelectPages[slideIndex]);
+                //}
+                this.needSelectPages.length = 0;
+            }
         }
         if(this.Slides[this.CurPage])
             this.Slides[this.CurPage].graphicObjects.updateSelectionState();
@@ -2596,6 +2605,7 @@ CPresentation.prototype =
         editor.sync_EndCatchSelectedElements();
         this.Document_UpdateUndoRedoState();
         this.Document_UpdateRulersState();
+
         this.Document_UpdateCanAddHyperlinkState();
         editor.asc_fireCallback("asc_onPresentationSize", this.Width, this.Height);
         editor.asc_fireCallback("asc_canIncreaseIndent", this.Can_IncreaseParagraphLevel(true));
@@ -2926,10 +2936,16 @@ CPresentation.prototype =
         if(Content.SlideObjects.length > 0)
         {
             var las_slide_index = selected_slides[selected_slides.length-1];
+
+            this.needSelectPages.length = 0;
             for(i = 0; i < Content.SlideObjects.length; ++i)
             {
                 this.insertSlide(las_slide_index + i + 1, Content.SlideObjects[i].Slide);
+                this.needSelectPages.push(las_slide_index + i + 1);
             }
+            this.CurPage = las_slide_index + 1;
+            this.bGoToPage = true;
+
         }
         else if(this.Slides[this.CurPage])
         {

PowerPoint/Editor/Format/Slide.js

@@ -954,6 +954,10 @@ Slide.prototype =
 
     recalculate: function()
     {
+        if(!this.Layout || !isRealNumber(this.num))
+        {
+            return;
+        }
         if(this.recalcInfo.recalculateBackground)
         {
             this.recalculateBackground();