к ревизии 63452

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

Word/Editor/Math.js

@@ -1356,7 +1356,6 @@ ParaMath.prototype.private_RecalculateRangeWrap = function(PRS, ParaPr, Depth)
         {
             PRS.X = this.ParaMathRPI.XStart;
             PRS.XEnd = this.ParaMathRPI.XEnd;
-
         }
 
         this.private_UpdateXLimits(PRS);
@@ -1674,7 +1673,7 @@ ParaMath.prototype.Shift_Range = function(Dx, Dy, _CurLine, _CurRange)
 
     if(this.Paragraph !== null && this.AbsolutePage !== CurrentAbsolutePage)
     {
-        this.Root.ChangePage(CurrentAbsolutePage - this.AbsolutePage);
+        this.Root.ShiftPage(CurrentAbsolutePage - this.AbsolutePage);
         this.AbsolutePage = CurrentAbsolutePage;
     }
 };

Word/Math/base.js

@@ -359,9 +359,9 @@ CMathBase.prototype.setPosition = function(pos, PRSA, Line, Range, Page)
 
     }
 };
-CMathBase.prototype.ChangePage = function(Dx)
+CMathBase.prototype.ShiftPage = function(Dx)
 {
-    this.Bounds.ChangePage(Dx);
+    this.Bounds.ShiftPage(Dx);
 
     for(var i=0; i < this.nRow; i++)
     {
@@ -369,7 +369,7 @@ CMathBase.prototype.ChangePage = function(Dx)
         {
             var Item = this.elements[i][j];
             if(false == Item.IsJustDraw())
-                Item.ChangePage(Dx);
+                Item.ShiftPage(Dx);
         }
     }
 };
@@ -2163,11 +2163,6 @@ CMathBase.prototype.UpdateOperators = function(_CurLine, _CurRange, bEmptyGapLef
     }
 
 };
-/*CMathBase.prototype.Is_EmptyRange = function()
-{
-
-    return false;
-};*/
 CMathBase.prototype.IsShade = function()
 {
     var oShd = this.Get_CompiledCtrPrp().Shd;
@@ -2289,14 +2284,21 @@ CMathBounds.prototype.GetWidth = function(Line, Range)
 {
     return this.Bounds[Line][Range].W;
 };
-/*CMathBounds.prototype.GetAscent = function(Line, Range)
+CMathBounds.prototype.ShiftPage = function(Dx)
 {
-    return this.Bounds[Line][Range].Asc;
+    var CountLines = this.Bounds.length;
+
+    for(var CurLine = 0; CurLine < CountLines; CurLine++)
+    {
+        var CountRanges = this.Bounds[CurLine].length;
+
+        for(var CurRange = 0; CurRange < CountRanges; CurRange++)
+        {
+            this.Bounds[CurLine][CurRange].ShiftPage(Dx);
+        }
+    }
+
 };
-CMathBounds.prototype.GetHeight = function(Line, Range)
-{
-    return this.Bounds[Line][Range].H;
-};*/
 CMathBounds.prototype.Get_Bounds = function()
 {
     return this.Bounds;
@@ -2368,10 +2370,6 @@ CMathBoundsMeasures.prototype.SetWidth = function(Width)
 {
     this.W = Width;
 };
-CMathBoundsMeasures.prototype.SetPage = function(Page)
-{
-    this.Page = Page;
-};
 CMathBoundsMeasures.prototype.SetPos = function(Pos, PRSA)
 {
     this.X = PRSA.X + Pos.x;
@@ -2390,6 +2388,14 @@ CMathBoundsMeasures.prototype.GetY = function()
 {
     return this.Y + this.Asc;
 };
+CMathBoundsMeasures.prototype.SetPage = function(Page)
+{
+    this.Page = Page;
+};
+CMathBoundsMeasures.prototype.ShiftPage = function(Dx)
+{
+    this.Page +=Dx;
+};
 
 
 function CEmptyRunRecalculateObject(StartLine, StartRange)

Word/Math/mathContent.js

@@ -835,14 +835,14 @@ CMathContent.prototype.GetWidthLine = function(_CurLine, _CurRange)
 
     return W;
 };
-CMathContent.prototype.ChangePage = function(Dx)
+CMathContent.prototype.ShiftPage = function(Dx)
 {
-    this.Bounds.ChangePage(Dx);
+    this.Bounds.ShiftPage(Dx);
 
     for(var Pos = 0; Pos < this.Content.length; Pos++)
     {
         if(this.Content[Pos].Type === para_Math_Composition)
-            this.Content[Pos].ChangePage(Dx);
+            this.Content[Pos].ShiftPage(Dx);
     }
 };
 CMathContent.prototype.Get_CompiledArgSize = function()