Commit 124176fd authored by Ilya.Kirillov's avatar Ilya.Kirillov Committed by Alexander.Trofimov

Исправлен баг с позиционированием "плавающих" объектов привязанных ко второй...

Исправлен баг с позиционированием "плавающих" объектов привязанных ко второй (или более) странице параграфа, разбитого на 2 и более страниц (баг 21033).

git-svn-id: svn://192.168.3.15/activex/AVS/Sources/TeamlabOffice/trunk/OfficeWeb@50620 954022d7-b5bf-4e40-9824-e11837661b57
parent bdf2a699
...@@ -9900,6 +9900,8 @@ Paragraph.prototype = ...@@ -9900,6 +9900,8 @@ Paragraph.prototype =
var RelH = Drawing.PositionH.RelativeFrom; var RelH = Drawing.PositionH.RelativeFrom;
var RelV = Drawing.PositionV.RelativeFrom; var RelV = Drawing.PositionV.RelativeFrom;
var ContentPos = 0;
if ( c_oAscRelativeFromH.Character != RelH || c_oAscRelativeFromV.Line != RelV ) if ( c_oAscRelativeFromH.Character != RelH || c_oAscRelativeFromV.Line != RelV )
{ {
var CurLine = Result.Internal.Line; var CurLine = Result.Internal.Line;
...@@ -9910,8 +9912,10 @@ Paragraph.prototype = ...@@ -9910,8 +9912,10 @@ Paragraph.prototype =
} }
var StartLinesPos = this.Lines[CurLine].StartPos; var StartLinesPos = this.Lines[CurLine].StartPos;
var EndLinesPos = this.Lines[CurLine].EndPos;
var CurRange = this.Internal_Get_ParaPos_By_Pos( StartLinesPos).Range; var CurRange = this.Internal_Get_ParaPos_By_Pos( StartLinesPos).Range;
Result.X = this.Lines[CurLine].Ranges[CurRange].X - 3.8; Result.X = this.Lines[CurLine].Ranges[CurRange].X - 3.8;
ContentPos = Math.min( StartLinesPos + 1, EndLinesPos );
} }
if ( c_oAscRelativeFromV.Line != RelV ) if ( c_oAscRelativeFromV.Line != RelV )
...@@ -9932,7 +9936,7 @@ Paragraph.prototype = ...@@ -9932,7 +9936,7 @@ Paragraph.prototype =
} }
else else
{ {
Result.ContentPos = 0; Result.ContentPos = ContentPos;
} }
}, },
......
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