git-svn-id:...

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

PowerPoint/Drawing/DrawingDocument.js

@@ -1082,7 +1082,8 @@ function CDrawingDocument()
         if (index == this.SlideCurrent)
         {
             this.m_oWordControl.Thumbnails.LockMainObjType = true;
-            this.m_oWordControl.SlideDrawer.CheckSlide(this.SlideCurrent);
+            //this.m_oWordControl.SlideDrawer.CheckSlide(this.SlideCurrent);
+            this.m_oWordControl.SlideDrawer.IsRecalculateSlide = true;
             this.m_oWordControl.CalculateDocumentSize(false);
             this.m_oWordControl.OnScroll();
             this.m_oWordControl.Thumbnails.LockMainObjType = false;
@@ -1687,7 +1688,8 @@ function CDrawingDocument()
         //this.m_oWordControl.OnScroll();
 
         this.m_oWordControl.Thumbnails.LockMainObjType = true;
-        this.m_oWordControl.SlideDrawer.CheckSlide(this.SlideCurrent);
+        //this.m_oWordControl.SlideDrawer.CheckSlide(this.SlideCurrent);
+        this.m_oWordControl.SlideDrawer.IsRecalculateSlide = true;
         this.m_oWordControl.CalculateDocumentSize(false);
         this.m_oWordControl.OnScroll();
         this.m_oWordControl.Thumbnails.LockMainObjType = false;
@@ -4708,6 +4710,7 @@ function CSlideDrawer()
     this.BoundsChecker      = new CSlideBoundsChecker();
 
     this.bIsEmptyPresentation = false;
+    this.IsRecalculateSlide = false;
 
     this.CheckSlide = function(slideNum)
     {

PowerPoint/Drawing/HtmlPage.js

@@ -2404,6 +2404,12 @@ function CEditorPage(api)
         context.fillRect(0, 0, _width, _height);
         //context.clearRect(0, 0, _width, _height);
 
+        if (this.SlideDrawer.IsRecalculateSlide == true)
+        {
+            this.SlideDrawer.CheckSlide(this.m_oDrawingDocument.SlideCurrent);
+            this.SlideDrawer.IsRecalculateSlide = false;
+        }
+
         this.SlideDrawer.DrawSlide(context, this.m_dScrollX, this.m_dScrollX_max,
             this.m_dScrollY - this.SlideScrollMIN, this.m_dScrollY_max, this.m_oDrawingDocument.SlideCurrent);