diff options
| author | Samuel Mehrbrodt <Samuel.Mehrbrodt@cib.de> | 2018-12-13 19:58:36 +0100 |
|---|---|---|
| committer | Samuel Mehrbrodt <Samuel.Mehrbrodt@cib.de> | 2018-12-17 12:07:30 +0100 |
| commit | a66e11492b847a53c84211d78da2c946adaaaf4e (patch) | |
| tree | 87bd5a4e8a214a808fe12aa6c8f12f5f9f0855f6 | |
| parent | Allow setting some MediaDescriptor properties during runtime (diff) | |
| download | core-a66e11492b847a53c84211d78da2c946adaaaf4e.tar.gz core-a66e11492b847a53c84211d78da2c946adaaaf4e.zip | |
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)
| -rw-r--r-- | sw/source/uibase/uno/unotxdoc.cxx | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/sw/source/uibase/uno/unotxdoc.cxx b/sw/source/uibase/uno/unotxdoc.cxx index 3a8a7ada5119..6095b8801cbe 100644 --- a/sw/source/uibase/uno/unotxdoc.cxx +++ b/sw/source/uibase/uno/unotxdoc.cxx @@ -2594,8 +2594,6 @@ sal_Int32 SAL_CALL SwXTextDocument::getRendererCount( bStateChanged = true; } - // #122919# Force field update before PDF export - pViewShell->SwViewShell::UpdateFields(true); if( bStateChanged ) pRenderDocShell->EnableSetModified(); @@ -2605,6 +2603,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 |