Commit 63d2c97a authored by Anna.Pavlova's avatar Anna.Pavlova Committed by Alexander.Trofimov

Поправлено вычисление номеров страниц в функциях Get_AlignToLine и private_UpdateXLimits

Не открывался файл "ALLFormulas.docx"

git-svn-id: svn://192.168.3.15/activex/AVS/Sources/TeamlabOffice/trunk/OfficeWeb@68636 954022d7-b5bf-4e40-9824-e11837661b57
parent 8c8084e5
...@@ -1299,7 +1299,8 @@ ParaMath.prototype.Get_AlignToLine = function(_CurLine, _CurRange, _Page, _X, _X ...@@ -1299,7 +1299,8 @@ ParaMath.prototype.Get_AlignToLine = function(_CurLine, _CurRange, _Page, _X, _X
XEnd = _XLimit; XEnd = _XLimit;
} }
var LineState = this.PageInfo.Get_LineState(_CurLine, _Page); var Page = this.Paragraph == null ? 0 : this.Paragraph.Get_AbsolutePage(_Page);
var LineState = this.PageInfo.Get_LineState(_CurLine, Page);
var StyleLine = LineState.StyleLine, var StyleLine = LineState.StyleLine,
WidthLine = LineState.Width, WidthLine = LineState.Width,
MaxWidth = LineState.MaxWidth, MaxWidth = LineState.MaxWidth,
...@@ -2221,9 +2222,10 @@ ParaMath.prototype.private_SetShiftY = function(PRS, RY) ...@@ -2221,9 +2222,10 @@ ParaMath.prototype.private_SetShiftY = function(PRS, RY)
ParaMath.prototype.private_UpdateXLimits = function(PRS) ParaMath.prototype.private_UpdateXLimits = function(PRS)
{ {
var MathSettings = Get_WordDocumentDefaultMathSettings(); var MathSettings = Get_WordDocumentDefaultMathSettings();
var WrapState = this.PageInfo.Get_CurrentWrapState(); var WrapState = this.PageInfo.Get_CurrentWrapState();
var Page = this.Paragraph == null ? 0 : this.Paragraph.Get_AbsolutePage(PRS.Page);
PRS.X += MathSettings.Get_LeftMargin(WrapState); PRS.X += MathSettings.Get_LeftMargin(WrapState);
PRS.XEnd -= MathSettings.Get_RightMargin(WrapState); PRS.XEnd -= MathSettings.Get_RightMargin(WrapState);
...@@ -2250,9 +2252,9 @@ ParaMath.prototype.private_UpdateXLimits = function(PRS) ...@@ -2250,9 +2252,9 @@ ParaMath.prototype.private_UpdateXLimits = function(PRS)
} }
} }
this.PageInfo.Add_Line(PRS.Line, PRS.Page, AlignAt); this.PageInfo.Add_Line(PRS.Line, Page, AlignAt);
PRS.X += this.PageInfo.Get_SpaceAlign(PRS.Line, PRS.Page); PRS.X += this.PageInfo.Get_SpaceAlign(PRS.Line, Page);
PRS.XRange = PRS.X; PRS.XRange = PRS.X;
}; };
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment