diff options
| author | Samuel Mehrbrodt <Samuel.Mehrbrodt@cib.de> | 2019-05-22 15:42:51 +0200 |
|---|---|---|
| committer | Samuel Mehrbrodt <Samuel.Mehrbrodt@cib.de> | 2019-05-23 10:39:07 +0200 |
| commit | 8d0949a0dd7fcd72a29a455598815ed2daa0724a (patch) | |
| tree | e22a904a508abbf5caa4df360a4300b7f66e622a | |
| parent | const fixes for python3-devel-3.7.0-1.fc29.x86_64 (diff) | |
| download | core-8d0949a0dd7fcd72a29a455598815ed2daa0724a.tar.gz core-8d0949a0dd7fcd72a29a455598815ed2daa0724a.zip | |
Revert "tdf#121962 Update fields after layout has been calculated"
This reverts commit a66e11492b847a53c84211d78da2c946adaaaf4e.
| -rw-r--r-- | sw/source/uibase/uno/unotxdoc.cxx | 5 |
1 files 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 |