From d9f02548f29678b8b7fc3a6c714ab144bd728005 Mon Sep 17 00:00:00 2001 From: Samuel Mehrbrodt Date: Thu, 13 Dec 2018 19:58:36 +0100 Subject: 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 (cherry picked from commit 2bc1d00af6863d5c92389f1f4a99d2ab9bb73f81) Reviewed-on: https://gerrit.libreoffice.org/65201 Reviewed-by: Thorsten Behrens --- sw/source/uibase/uno/unotxdoc.cxx | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) (limited to 'sw/source/uibase') 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 -- cgit v1.2.3