Kaydet (Commit) 055480aa authored tarafından Samuel Mehrbrodt's avatar Samuel Mehrbrodt

tdf#124025 Update formula before printing

Reintroduce the UpdateFields call, but guard it so that
it does not modify the doc (as it was before)

Change-Id: I23e814f0b5d900d145dc82272034f03e66c079ed
Reviewed-on: https://gerrit.libreoffice.org/69696
Tested-by: Jenkins
Reviewed-by: 's avatarSamuel Mehrbrodt <Samuel.Mehrbrodt@cib.de>
üst 9ce8f1ea
......@@ -2614,23 +2614,25 @@ sal_Int32 SAL_CALL SwXTextDocument::getRendererCount(
// since printing now also use the API for PDF export this option
// should be set for printing as well ...
pViewShell->SetPDFExportOption( true );
bool bOrigStatus = pRenderDocShell->IsEnableSetModified();
// check configuration: shall update of printing information in DocInfo set the document to "modified"?
// tdf#122607 Re-layout the doc. Calling CalcLayout here is not enough, as it depends
// on the currently visible area which is 0 when doing headless conversion.
pViewShell->Reformat();
pViewShell->CalcPagesForPrint( pViewShell->GetPageCount() );
// #122919# Force field update before PDF export, but after layout init (tdf#121962)
bool bStateChanged = false;
if ( bOrigStatus && !SvtPrintWarningOptions().IsModifyDocumentOnPrintingAllowed() )
// check configuration: shall update of printing information in DocInfo set the document to "modified"?
if ( pRenderDocShell->IsEnableSetModified() && !SvtPrintWarningOptions().IsModifyDocumentOnPrintingAllowed() )
{
pRenderDocShell->EnableSetModified( false );
bStateChanged = true;
}
pViewShell->SwViewShell::UpdateFields(true);
if( bStateChanged )
pRenderDocShell->EnableSetModified();
// tdf#122607 Re-layout the doc. Calling CalcLayout here is not enough, as it depends
// on the currently visible area which is 0 when doing headless conversion.
pViewShell->Reformat();
pViewShell->CalcPagesForPrint( pViewShell->GetPageCount() );
pViewShell->SetPDFExportOption( false );
// enable view again
......
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