summaryrefslogtreecommitdiff
path: root/sw/source
diff options
context:
space:
mode:
authorSamuel Mehrbrodt <Samuel.Mehrbrodt@cib.de>2018-12-13 19:58:36 +0100
committerThorsten Behrens <Thorsten.Behrens@CIB.de>2018-12-16 01:30:09 +0100
commitd9f02548f29678b8b7fc3a6c714ab144bd728005 (patch)
tree1bf1909591ce2debd64d95575f8d7064185f0ab9 /sw/source
parent73c3c3deff69ccd6a2f55952a911738496fb3c32 (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> (cherry picked from commit 2bc1d00af6863d5c92389f1f4a99d2ab9bb73f81) Reviewed-on: https://gerrit.libreoffice.org/65201 Reviewed-by: Thorsten Behrens <Thorsten.Behrens@CIB.de>
Diffstat (limited to 'sw/source')
-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 1db55d3c5831..6e9701c765eb 100644
--- a/sw/source/uibase/uno/unotxdoc.cxx
+++ b/sw/source/uibase/uno/unotxdoc.cxx
@@ -2630,8 +2630,6 @@ sal_Int32 SAL_CALL SwXTextDocument::getRendererCount(
bStateChanged = true;
}
- // #122919# Force field update before PDF export
- pViewShell->SwViewShell::UpdateFields(true);
if( bStateChanged )
pRenderDocShell->EnableSetModified();
@@ -2641,6 +2639,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