Исправлен баг с расположением плавающих таблиц. Исправлен баг с расположением картинок. (баг 23961)

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

Word/Editor/Document.js

@@ -1153,7 +1153,7 @@ CDocument.prototype =
                     }
 
                     var TempRecalcResult = Element.Recalculate_Page( PageIndex );
-                    this.RecalcInfo.Set_FlowObject( Element, 0, Element.Recalculate_Page( PageIndex ) );
+                    this.RecalcInfo.Set_FlowObject( Element, 0, TempRecalcResult );
 
                     var FlowTable = new CFlowTable( Element, PageIndex );
                     this.DrawingObjects.addFloatTable( FlowTable );

Word/Editor/Paragraph.js

@@ -151,6 +151,9 @@ function Paragraph(DrawingDocument, Parent, PageNum, X, Y, XLimit, YLimit, bFrom
     }
 
     this.m_oPRSW = new CParagraphRecalculateStateWrap();
+    this.m_oPRSC = new CParagraphRecalculateStateCounter();
+    this.m_oPRSA = new CParagraphRecalculateStateAlign();
+    this.m_oPRSI = new CParagraphRecalculateStateInfo();
 
     // Добавляем данный класс в таблицу Id (обязательно в конце конструктора)
     g_oTableId.Add( this, this.Id );
@@ -4543,7 +4546,7 @@ Paragraph.prototype =
         var StartLine = this.Pages[CurPage].StartLine;
         var EndLine   = this.Pages[CurPage].EndLine;
 
-        var PRSC = g_oPRSC;
+        var PRSC = this.m_oPRSC;
 
         for ( var CurLine = StartLine; CurLine <= EndLine; CurLine++ )
         {
@@ -4599,7 +4602,7 @@ Paragraph.prototype =
         var EndLine   = this.Pages[CurPage].EndLine;
         var LinesCount = this.Lines.length;
 
-        var PRSA = g_oPRSA;
+        var PRSA = this.m_oPRSA;
         PRSA.Paragraph  = this;
         PRSA.LastW      = 0;
         PRSA.RecalcFast = Fast;
@@ -4741,7 +4744,7 @@ Paragraph.prototype =
     {
         var PrevInfo = ( 0 === CurPage ? this.Parent.Get_PrevElementEndInfo( this ) : this.Pages[CurPage - 1].EndInfo.Copy() );
 
-        var PRSI = g_oPRSI;
+        var PRSI = this.m_oPRSI;
 
         PRSI.Reset( PrevInfo );
 
@@ -5564,7 +5567,7 @@ Paragraph.prototype =
         }
 
         // Recalculate_Lines_Width
-        var PRSC = g_oPRSC;
+        var PRSC = this.m_oPRSC;
 
         var StartPos = Range.StartPos;
         var EndPos   = Range.EndPos;
@@ -22248,9 +22251,9 @@ CParagraphRecalculateStateInfo.prototype =
 
 
 //var g_oPRSW = new CParagraphRecalculateStateWrap();
-var g_oPRSC = new CParagraphRecalculateStateCounter();
-var g_oPRSA = new CParagraphRecalculateStateAlign();
-var g_oPRSI = new CParagraphRecalculateStateInfo();
+//var g_oPRSC = new CParagraphRecalculateStateCounter();
+//var g_oPRSA = new CParagraphRecalculateStateAlign();
+//var g_oPRSI = new CParagraphRecalculateStateInfo();
 
 function CParagraphDrawStateHightlights()
 {