summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorSamuel Mehrbrodt <Samuel.Mehrbrodt@cib.de>2018-12-13 19:58:36 +0100
committerSamuel Mehrbrodt <Samuel.Mehrbrodt@cib.de>2018-12-15 15:00:51 +0100
commit2bc1d00af6863d5c92389f1f4a99d2ab9bb73f81 (patch)
tree9e870b5415a691d9faefbb943164595c35783c1f
parent21b81b07b01e4482a80ced8dcdf48c480031c3c8 (diff)
tdf#121962 Update fields after layout has been calculated
Change-Id: Ic4a49494652dab416ddb1545da02eb8a7f533828 Reviewed-on: https://gerrit.libreoffice.org/65126 Tested-by: Jenkins Reviewed-by: Samuel Mehrbrodt <Samuel.Mehrbrodt@cib.de>
-rw-r--r--sw/source/uibase/uno/unotxdoc.cxx5
1 files changed, 3 insertions, 2 deletions
diff --git a/sw/source/uibase/uno/unotxdoc.cxx b/sw/source/uibase/uno/unotxdoc.cxx
index 901cea6930a1..41f44162bfcf 100644
--- a/sw/source/uibase/uno/unotxdoc.cxx
+++ b/sw/source/uibase/uno/unotxdoc.cxx
@@ -2663,8 +2663,6 @@ sal_Int32 SAL_CALL SwXTextDocument::getRendererCount(
bStateChanged = true;
}
- // #122919# Force field update before PDF export
- pViewShell->SwViewShell::UpdateFields(true);
if( bStateChanged )
pRenderDocShell->EnableSetModified();
@@ -2674,6 +2672,9 @@ sal_Int32 SAL_CALL SwXTextDocument::getRendererCount(
pViewShell->CalcLayout();
pViewShell->CalcPagesForPrint( pViewShell->GetPageCount() );
+ // #122919# Force field update before PDF export, but after layout init (tdf#121962)
+ pViewShell->SwViewShell::UpdateFields(true);
+
pViewShell->SetPDFExportOption( false );
// enable view again