diff options
| author | Samuel Mehrbrodt <Samuel.Mehrbrodt@cib.de> | 2018-12-13 19:58:36 +0100 |
|---|---|---|
| committer | Thorsten Behrens <Thorsten.Behrens@CIB.de> | 2018-12-16 01:29:54 +0100 |
| commit | cc49b1ef721db5943d3d59c7a8018752a2e4abf9 (patch) | |
| tree | 4e58e0f2a644ee49055c4e322cfaa1e684e83670 /sw | |
| parent | c8a449f45c6d8d5223a721af74ff5888efffd8d7 (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/65200
Reviewed-by: Thorsten Behrens <Thorsten.Behrens@CIB.de>
Diffstat (limited to 'sw')
| -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 e7ae142d9bf1..ce64956f3996 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 |