diff options
| author | Samuel Mehrbrodt <Samuel.Mehrbrodt@cib.de> | 2019-02-13 09:51:29 +0100 |
|---|---|---|
| committer | Xisco Faulí <xiscofauli@libreoffice.org> | 2019-02-13 12:45:26 +0100 |
| commit | 2ab2280f21fa491154e17c303dc70fcf059123b3 (patch) | |
| tree | 75ced01666f310f1a88f4f4fb71de85345fbe351 /sw/source | |
| parent | 4bf0e6d1b8a6d0f0dc0f7251cdfc047dc8433c89 (diff) | |
Revert "tdf#121962 Update fields after layout has been calculated"
See tdf#123378 for the problem caused by this.
I have a fix at https://gerrit.libreoffice.org/#/c/67754/
but I prefer to revert the fix on 6-1 branch since this is the last
release in this series and I'm not sure if the fix has other side effects.
This reverts commit d9f02548f29678b8b7fc3a6c714ab144bd728005.
Change-Id: If9298b9cafaf6984ce25ba78b2c7a79171567840
Reviewed-on: https://gerrit.libreoffice.org/67755
Tested-by: Xisco Faulí <xiscofauli@libreoffice.org>
Reviewed-by: Xisco Faulí <xiscofauli@libreoffice.org>
Diffstat (limited to 'sw/source')
| -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 6e9701c765eb..1db55d3c5831 100644 --- a/sw/source/uibase/uno/unotxdoc.cxx +++ b/sw/source/uibase/uno/unotxdoc.cxx @@ -2630,6 +2630,8 @@ sal_Int32 SAL_CALL SwXTextDocument::getRendererCount( bStateChanged = true; } + // #122919# Force field update before PDF export + pViewShell->SwViewShell::UpdateFields(true); if( bStateChanged ) pRenderDocShell->EnableSetModified(); @@ -2639,9 +2641,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 |