sw/source/uibase/uno/unotxdoc.cxx | 5 ++---
1 file changed, 2 insertions(+), 3 deletions(-)
New commits:
commit 2ab2280f21fa491154e17c303dc70fcf059123b3
Author: Samuel Mehrbrodt <samuel.mehrbr...@cib.de>
AuthorDate: Wed Feb 13 09:51:29 2019 +0100
Commit: Xisco Faulí <xiscofa...@libreoffice.org>
CommitDate: Wed Feb 13 12:45:26 2019 +0100
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í <xiscofa...@libreoffice.org>
Reviewed-by: Xisco Faulí <xiscofa...@libreoffice.org>
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
_______________________________________________
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
