diff options
Diffstat (limited to 'sw/source/uibase/uno/unotxdoc.cxx')
-rw-r--r-- | sw/source/uibase/uno/unotxdoc.cxx | 20 |
1 files changed, 11 insertions, 9 deletions
diff --git a/sw/source/uibase/uno/unotxdoc.cxx b/sw/source/uibase/uno/unotxdoc.cxx index b5d224209275..d2d512fd8c6f 100644 --- a/sw/source/uibase/uno/unotxdoc.cxx +++ b/sw/source/uibase/uno/unotxdoc.cxx @@ -2621,23 +2621,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 |