Commit 54ae5cb8 authored by Ilya Kirillov's avatar Ilya Kirillov

Fixed bugs #33219, #33221. Fixed bug with names of header/footer for odd/even/first pages.

parent 36d2f169
...@@ -3667,10 +3667,10 @@ CDocument.prototype.Draw = function(nPageInd ...@@ -3667,10 +3667,10 @@ CDocument.prototype.Draw = function(nPageInd
var RepF = ( null === Footer || null !== SectPr.Get_HdrFtrInfo(Footer) ? false : true ); var RepF = ( null === Footer || null !== SectPr.Get_HdrFtrInfo(Footer) ? false : true );
var HeaderInfo = undefined; var HeaderInfo = undefined;
if (null !== Header && undefined !== Header.RecalcInfo.NeedRecalc[nPageIndex]) if (null !== Header && undefined !== Header.RecalcInfo.PageNumInfo[nPageIndex])
{ {
var bFirst = Header.RecalcInfo.NeedRecalc[nPageIndex].bFirst; var bFirst = Header.RecalcInfo.PageNumInfo[nPageIndex].bFirst;
var bEven = Header.RecalcInfo.NeedRecalc[nPageIndex].bEven; var bEven = Header.RecalcInfo.PageNumInfo[nPageIndex].bEven;
var HeaderSectPr = Header.RecalcInfo.SectPr[nPageIndex]; var HeaderSectPr = Header.RecalcInfo.SectPr[nPageIndex];
...@@ -3681,10 +3681,10 @@ CDocument.prototype.Draw = function(nPageInd ...@@ -3681,10 +3681,10 @@ CDocument.prototype.Draw = function(nPageInd
} }
var FooterInfo = undefined; var FooterInfo = undefined;
if (null !== Footer && undefined !== Footer.RecalcInfo.NeedRecalc[nPageIndex]) if (null !== Footer && undefined !== Footer.RecalcInfo.PageNumInfo[nPageIndex])
{ {
var bFirst = Footer.RecalcInfo.NeedRecalc[nPageIndex].bFirst; var bFirst = Footer.RecalcInfo.PageNumInfo[nPageIndex].bFirst;
var bEven = Footer.RecalcInfo.NeedRecalc[nPageIndex].bEven; var bEven = Footer.RecalcInfo.PageNumInfo[nPageIndex].bEven;
var FooterSectPr = Footer.RecalcInfo.SectPr[nPageIndex]; var FooterSectPr = Footer.RecalcInfo.SectPr[nPageIndex];
......
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