Bug #31705 Теперь все автофигуры с обтеканием отрисовываются после основной части документа.

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

Word/Editor/Document.js

@@ -3144,7 +3144,6 @@ CDocument.prototype =
             pGraphics.End_GlobalAlpha();
 
         this.DrawingObjects.drawBehindDoc( nPageIndex, pGraphics );
-        this.DrawingObjects.drawWrappingObjects( nPageIndex, pGraphics );
 
         var Page = this.Pages[nPageIndex];
         for (var SectionIndex = 0, SectionsCount = Page.Sections.length; SectionIndex < SectionsCount; ++SectionIndex)
@@ -3194,7 +3193,8 @@ CDocument.prototype =
                 }
             }
         }
-        
+
+        this.DrawingObjects.drawWrappingObjects( nPageIndex, pGraphics );
         this.DrawingObjects.drawBeforeObjects( nPageIndex, pGraphics );
 
         // Рисуем границы вокруг страницы (если границы надо рисовать перед текстом)

Word/Editor/DocumentContent.js

@@ -1185,9 +1185,6 @@ CDocumentContent.prototype =
             pGraphics.AddClipRect(ClipInfo.X0, Bounds.Top - Correction, Math.abs(ClipInfo.X1 - ClipInfo.X0), Bounds.Bottom - Bounds.Top + Correction);
         }
 
-        if (this.LogicDocument)
-            this.LogicDocument.DrawingObjects.drawWrappingObjectsInContent(this.Get_AbsolutePage(CurPage), pGraphics, this);
-
         var Page_StartPos = this.Pages[CurPage].Pos;
         var Page_EndPos   = this.Pages[CurPage].EndPos;
         for (var Index = Page_StartPos; Index <= Page_EndPos; Index++)
@@ -1196,6 +1193,9 @@ CDocumentContent.prototype =
             this.Content[Index].Draw(ElementPageIndex, pGraphics);
         }
 
+        if (this.LogicDocument)
+            this.LogicDocument.DrawingObjects.drawWrappingObjectsInContent(this.Get_AbsolutePage(CurPage), pGraphics, this);
+
         if (ClipInfo)
         {
             pGraphics.RestoreGrState();