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

Common/scroll.js

@@ -509,12 +509,12 @@ ScrollObject.prototype = {
         this._draw();
         this._drawArrow();
     },
-    _scrollV:function ( that, evt, pos, isTop, isBottom ) {
+    _scrollV:function ( that, evt, pos, isTop, isBottom, bIsAttack ) {
         if ( !this.isVerticalScroll ) {
             return;
         }
 
-        if ( that.scrollVCurrentY !== pos ) {
+        if ( that.scrollVCurrentY !== pos || bIsAttack === true) {
             that.scrollVCurrentY = pos;
             evt.scrollD = evt.scrollPositionY = that.scrollVCurrentY;
             evt.maxScrollY = that.maxScrollY;
@@ -573,7 +573,7 @@ ScrollObject.prototype = {
         }
 
     },
-    scrollByY:function ( delta ) {
+    scrollByY:function ( delta, bIsAttack ) {
         if ( !this.isVerticalScroll ) {
             return;
         }
@@ -613,7 +613,7 @@ ScrollObject.prototype = {
         if ( vend ) {
             this.moveble = true;
         }
-        this._scrollV( this, {}, destY, isTop, isBottom );
+        this._scrollV( this, {}, destY, isTop, isBottom, bIsAttack );
         if ( vend ) {
             this.moveble = false;
         }

PowerPoint/Drawing/HtmlPage.js

@@ -1885,7 +1885,7 @@ function CEditorPage(api)
         if (this.m_oDrawingDocument.IsEmptyPresentation)
         {
             this.StartVerticalScroll = false;
-            this.m_oScrollVerApi.scrollByY(0, false);
+            this.m_oScrollVerApi.scrollByY(0, true);
             return;
         }
 
@@ -1896,7 +1896,7 @@ function CEditorPage(api)
             this.StartVerticalScroll = false;
             this.m_oApi.asc_fireCallback("asc_onEndPaintSlideNum");
 
-            this.m_oScrollVerApi.scrollByY(0, false);
+            this.m_oScrollVerApi.scrollByY(0, true);
         }
     }
     this.CorrectSpeedVerticalScroll = function(newScrollPos)