Commit c13fc8b2 authored by Sergey Luzyanin's avatar Sergey Luzyanin

addition for previous commit

parent f48305a4
...@@ -3255,6 +3255,7 @@ CShape.prototype.CheckNeedRecalcAutoFit = function(oSectPr) ...@@ -3255,6 +3255,7 @@ CShape.prototype.CheckNeedRecalcAutoFit = function(oSectPr)
CShape.prototype.recalculateDocContent = function(oDocContent, oBodyPr) CShape.prototype.recalculateDocContent = function(oDocContent, oBodyPr)
{ {
var nStartPage = this.Get_AbsolutePage ? this.Get_AbsolutePage() : 0;
var oRet = {w: 0, h: 0, contentH: 0}; var oRet = {w: 0, h: 0, contentH: 0};
var l_ins, t_ins, r_ins, b_ins; var l_ins, t_ins, r_ins, b_ins;
if(oBodyPr) if(oBodyPr)
...@@ -3309,14 +3310,14 @@ CShape.prototype.recalculateDocContent = function(oDocContent, oBodyPr) ...@@ -3309,14 +3310,14 @@ CShape.prototype.recalculateDocContent = function(oDocContent, oBodyPr)
{ {
if(dMaxWidthRec < w && (!this.bWordShape && !this.bCheckAutoFitFlag)) if(dMaxWidthRec < w && (!this.bWordShape && !this.bCheckAutoFitFlag))
{ {
oDocContent.RecalculateContent(w, h, 0); oDocContent.RecalculateContent(w, h, nStartPage);
oRet.w = w + 0.001; oRet.w = w + 0.001;
oRet.contentH = oDocContent.Get_SummaryHeight(); oRet.contentH = oDocContent.Get_SummaryHeight();
oRet.h = oRet.contentH; oRet.h = oRet.contentH;
} }
else else
{ {
oDocContent.RecalculateContent(dMaxWidthRec, h, 0); oDocContent.RecalculateContent(dMaxWidthRec, h, nStartPage);
oRet.w = dMaxWidthRec + 0.001; oRet.w = dMaxWidthRec + 0.001;
oRet.contentH = oDocContent.Get_SummaryHeight(); oRet.contentH = oDocContent.Get_SummaryHeight();
oRet.h = oRet.contentH; oRet.h = oRet.contentH;
...@@ -3330,14 +3331,14 @@ CShape.prototype.recalculateDocContent = function(oDocContent, oBodyPr) ...@@ -3330,14 +3331,14 @@ CShape.prototype.recalculateDocContent = function(oDocContent, oBodyPr)
{ {
if(dMaxWidthRec < h && !this.bWordShape) if(dMaxWidthRec < h && !this.bWordShape)
{ {
oDocContent.RecalculateContent( h, h, 0); oDocContent.RecalculateContent( h, h, nStartPage);
oRet.w = h + 0.001; oRet.w = h + 0.001;
oRet.contentH = oDocContent.Get_SummaryHeight(); oRet.contentH = oDocContent.Get_SummaryHeight();
oRet.h = oRet.contentH; oRet.h = oRet.contentH;
} }
else else
{ {
oDocContent.RecalculateContent(dMaxWidthRec, h, 0); oDocContent.RecalculateContent(dMaxWidthRec, h, nStartPage);
oRet.w = dMaxWidthRec + 0.001; oRet.w = dMaxWidthRec + 0.001;
oRet.contentH = oDocContent.Get_SummaryHeight(); oRet.contentH = oDocContent.Get_SummaryHeight();
oRet.h = oRet.contentH; oRet.h = oRet.contentH;
...@@ -3415,7 +3416,7 @@ CShape.prototype.recalculateDocContent = function(oDocContent, oBodyPr) ...@@ -3415,7 +3416,7 @@ CShape.prototype.recalculateDocContent = function(oDocContent, oBodyPr)
while ( recalcresult2_End !== RecalcResult ) while ( recalcresult2_End !== RecalcResult )
RecalcResult = oDocContent.Recalculate_Page( CurPage++, true );*/ RecalcResult = oDocContent.Recalculate_Page( CurPage++, true );*/
oDocContent.RecalculateContent(oRet.w, oRet.h, 0); oDocContent.RecalculateContent(oRet.w, oRet.h, nStartPage);
oRet.contentH = oDocContent.Get_SummaryHeight(); oRet.contentH = oDocContent.Get_SummaryHeight();
......
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