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

Common/Shapes/Serialize.js

@@ -2675,10 +2675,10 @@ function BinaryPPTYLoader()
             }
             else if (3 == _at)
             {
+                var _spd = s.GetUChar();
                 if (!_presentDuration)
                 {
                     _timing.TransitionDuration = 250;
-                    var _spd = s.GetUChar();
                     if (_spd == 1)
                         _timing.TransitionDuration = 500;
                     else if (_spd == 2)

PowerPoint/api.js

@@ -3453,6 +3453,10 @@ asc_docs_api.prototype.sync_AddComment = function(Id, CommentData)
 
 asc_docs_api.prototype.sync_ShowComment = function(Id, X, Y)
 {
+    if (this.WordControl.m_oMainContent)
+    {
+        X -= ((this.WordControl.m_oMainContent.Bounds.L * g_dKoef_mm_to_pix) >> 0);
+    }
     // TODO: Переделать на нормальный массив
     this.asc_fireCallback("asc_onShowComment", [ Id ], X, Y);
 }

Word/Drawing/HtmlPage.js

@@ -1953,7 +1953,7 @@ function CEditorPage(api)
         this.ReaderFontSizeCur++;
         this.ReaderModeDiv.style.fontSize = this.ReaderFontSizes[this.ReaderFontSizeCur] + "pt";
 
-        this.ReaderTouchManager.iScroll._changeMaxes();
+        this.ReaderTouchManager.ChangeFontSize();
     }
     this.DecreaseReaderFontSize = function()
     {
@@ -1968,7 +1968,7 @@ function CEditorPage(api)
         this.ReaderFontSizeCur--;
         this.ReaderModeDiv.style.fontSize = this.ReaderFontSizes[this.ReaderFontSizeCur] + "pt";
 
-        this.ReaderTouchManager.iScroll._changeMaxes();
+        this.ReaderTouchManager.ChangeFontSize();
     }
 
     this.EnableReaderMode = function()

Word/Drawing/WorkEvents.js

@@ -2694,6 +2694,16 @@ function CReaderTouchManager()
         }
     }
 
+    this.ChangeFontSize = function()
+    {
+        if (this.iScroll != null)
+        {
+            //this.ReaderTouchManager.iScroll._changeMaxes();
+            this.iScroll.refresh();
+            this.iScroll._pos(this.iScroll.x, this.iScroll.y, false);
+        }
+    }
+
     this.Destroy = function()
     {
         if (this.iScroll != null)

Word/Drawing/scrolls/iscroll.js

@@ -1039,17 +1039,17 @@ CTouchScroll.prototype = {
 			*/
             that.x = 0;
             that.y = 0;
-            if (that.maxScrollX < 0)
+            if (_oldMaxX < 0)
             {
-                that.x = (_oldX * _oldMaxX / that.maxScrollX) >> 0;
+                that.x = (_oldX * that.maxScrollX / _oldMaxX) >> 0;
                 if (that.x > 0)
                     that.x = 0;
                 if (that.x < that.maxScrollX)
                     that.x = that.maxScrollX;
             }
-            if (that.maxScrollY < 0)
+            if (_oldMaxY < 0)
             {
-                that.y = (_oldY * _oldMaxY / that.maxScrollY) >> 0;
+                that.y = (_oldY * that.maxScrollY / _oldMaxY) >> 0;
                 if (that.y > 0)
                     that.y = 0;
                 if (that.y < that.maxScrollY)