From 8d0949a0dd7fcd72a29a455598815ed2daa0724a Mon Sep 17 00:00:00 2001 From: Samuel Mehrbrodt Date: Wed, 22 May 2019 15:42:51 +0200 Subject: Revert "tdf#121962 Update fields after layout has been calculated" This reverts commit a66e11492b847a53c84211d78da2c946adaaaf4e. --- sw/source/uibase/uno/unotxdoc.cxx | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/sw/source/uibase/uno/unotxdoc.cxx b/sw/source/uibase/uno/unotxdoc.cxx index 6095b8801cbe..3a8a7ada5119 100644 --- a/sw/source/uibase/uno/unotxdoc.cxx +++ b/sw/source/uibase/uno/unotxdoc.cxx @@ -2594,6 +2594,8 @@ sal_Int32 SAL_CALL SwXTextDocument::getRendererCount( bStateChanged = true; } + // #122919# Force field update before PDF export + pViewShell->SwViewShell::UpdateFields(true); if( bStateChanged ) pRenderDocShell->EnableSetModified(); @@ -2603,9 +2605,6 @@ 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