Исправлен баг с расчетом автофигур в колонтитуле.

word/Editor/HeaderFooter.js

@@ -323,13 +323,7 @@ CHeaderFooter.prototype =
 
     Draw : function(nPageIndex, pGraphics)
     {
-        //var OldPage = this.RecalcInfo.CurPage;
-        //
-        //this.Set_Page( nPageIndex );
         this.Content.Draw( nPageIndex, pGraphics );
-        
-        //if ( -1 !== OldPage )
-        //    this.Set_Page( OldPage );
     },
 
     // Пришло сообщение о том, что контент изменился и пересчитался
@@ -1484,7 +1478,8 @@ CHeaderFooterController.prototype =
         this.private_UpdateDrawingVerticalPositions(HeaderDrawings, PageLimits.Y, PageLimits.YLimit);
         this.private_UpdateDrawingVerticalPositions(FooterDrawings, PageLimits.Y, PageLimits.YLimit);
 
-        this.LogicDocument.DrawingObjects.mergeDrawings(PageIndex, HeaderDrawings, HeaderTables, FooterDrawings, FooterTables);
+        this.private_MergeFlowObjectsFromHeaderAndFooter(PageIndex, HeaderDrawings, HeaderTables, FooterDrawings, FooterTables);
+
         if ( true === bRecalcHeader || true === bRecalcFooter )
             return true;
         
@@ -1503,31 +1498,72 @@ CHeaderFooterController.prototype =
         }
     },
 
+    private_MergeFlowObjectsFromHeaderAndFooter : function(nPageIndex, arrHeaderDrawings, arrHeaderTables, arrFooterDrawings, arrFooterTables)
+    {
+        var oHeader = this.Pages[nPageIndex].Header;
+        var oFooter = this.Pages[nPageIndex].Footer;
+
+        var nOldHeaderCurPage = null;
+        var nOldFooterCurPage = null;
+
+        if (oHeader)
+        {
+            oHeader.Set_Page(nPageIndex);
+            nOldHeaderCurPage = oHeader.RecalcInfo.CurPage;
+        }
+
+        if (oFooter)
+        {
+            oFooter.Set_Page(nPageIndex);
+            nOldFooterCurPage = oFooter.RecalcInfo.CurPage;
+        }
+
+        this.LogicDocument.DrawingObjects.mergeDrawings(nPageIndex, arrHeaderDrawings, arrHeaderTables, arrFooterDrawings, arrFooterTables);
+
+        if (null !== nOldHeaderCurPage)
+            oHeader.Set_Page(nOldHeaderCurPage);
+
+        if (null !== nOldFooterCurPage)
+            oFooter.Set_Page(nOldFooterCurPage);
+    },
+
     // Отрисовка колонтитулов на данной странице
     Draw : function(nPageIndex, pGraphics)
     {
+        var oHeader = this.Pages[nPageIndex].Header;
+        var oFooter = this.Pages[nPageIndex].Footer;
 
-        var Header = this.Pages[nPageIndex].Header;
-        var Footer = this.Pages[nPageIndex].Footer;
+        var nOldHeaderCurPage = null;
+        var nOldFooterCurPage = null;
 
-        var OldPageHdr = Header && Header.RecalcInfo.CurPage;
-        var OldPageFtr = Footer && Footer.RecalcInfo.CurPage;
+        if (oHeader)
+        {
+            oHeader.Set_Page(nPageIndex);
+            nOldHeaderCurPage = oHeader.RecalcInfo.CurPage;
+        }
 
-        Header &&  Header.Set_Page(nPageIndex);
-        Footer && Footer.Set_Page(nPageIndex);
-        this.LogicDocument.DrawingObjects.drawBehindDocHdrFtr( nPageIndex, pGraphics );
-        this.LogicDocument.DrawingObjects.drawWrappingObjectsHdrFtr( nPageIndex, pGraphics );
+        if (oFooter)
+        {
+            oFooter.Set_Page(nPageIndex);
+            nOldFooterCurPage = oFooter.RecalcInfo.CurPage;
+        }
 
-        if ( null !== Header )
-            Header.Draw( nPageIndex, pGraphics );
+        this.LogicDocument.DrawingObjects.drawBehindDocHdrFtr(nPageIndex, pGraphics);
+        this.LogicDocument.DrawingObjects.drawWrappingObjectsHdrFtr(nPageIndex, pGraphics);
 
-        if ( null !== Footer )
-            Footer.Draw( nPageIndex, pGraphics );
+        if (oHeader)
+            oHeader.Draw(nPageIndex, pGraphics);
+
+        if (oFooter)
+            oFooter.Draw(nPageIndex, pGraphics);
+
+        this.LogicDocument.DrawingObjects.drawBeforeObjectsHdrFtr(nPageIndex, pGraphics);
 
-        this.LogicDocument.DrawingObjects.drawBeforeObjectsHdrFtr( nPageIndex, pGraphics );
+        if (null !== nOldHeaderCurPage)
+            oHeader.Set_Page(nOldHeaderCurPage);
 
-        Header &&  Header.Set_Page(OldPageHdr);
-        Footer && Footer.Set_Page(OldPageFtr);
+        if (null !== nOldFooterCurPage)
+            oFooter.Set_Page(nOldFooterCurPage);
     },
 
     CheckRange : function(X0, Y0, X1, Y1, _Y0, _Y1, X_lf, X_rf, PageIndex, bMathWrap)