[Libreoffice-commits] core.git: Branch 'libreoffice-6-4' - sw/source

[Samuel Mehrbrodt (via logerrit)]

 sw/source/uibase/uno/unotxdoc.cxx |    4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

New commits:
commit 23f871ff12d3dbb37ac7a4cbe51bf6f15661afe4
Author:     Samuel Mehrbrodt <Samuel.Mehrbrodt at cib.de>
AuthorDate: Mon Jun 29 14:58:57 2020 +0200
Commit:     Xisco Fauli <xiscofauli at libreoffice.org>
CommitDate: Fri Jul 3 10:33:19 2020 +0200

    tdf#130151 Fix toc pointing to wrong page
    
    Change-Id: I26c1027722613f751bd39fde97f1e14d3238eefa
    Reviewed-on: https://gerrit.libreoffice.org/c/core/+/97413
    Reviewed-by: Ilmari Lauhakangas <ilmari.lauhakangas at libreoffice.org>
    Reviewed-by: Samuel Mehrbrodt <Samuel.Mehrbrodt at cib.de>
    Tested-by: Jenkins
    (cherry picked from commit 63f3485b57904de4e77c04f5759e6563fcce6748)
    Reviewed-on: https://gerrit.libreoffice.org/c/core/+/97504
    Reviewed-by: Xisco Fauli <xiscofauli at libreoffice.org>
    (cherry picked from commit 0e558c86a3d25764d44c14e28232ff4629af75ff)
    Reviewed-on: https://gerrit.libreoffice.org/c/core/+/97581
    Reviewed-by: Michael Stahl <michael.stahl at cib.de>

diff --git a/sw/source/uibase/uno/unotxdoc.cxx b/sw/source/uibase/uno/unotxdoc.cxx
index 2e172dbf6488..e3d80b664deb 100644
--- a/sw/source/uibase/uno/unotxdoc.cxx
+++ b/sw/source/uibase/uno/unotxdoc.cxx
@@ -2599,8 +2599,6 @@ sal_Int32 SAL_CALL SwXTextDocument::getRendererCount(
             // there is no time to sort this out.
             //TODO: check what exactly needs to be done and make just one function for that
             pViewShell->CalcLayout();
-            pViewShell->CalcPagesForPrint( pViewShell->GetPageCount() );
-
 
             // #122919# Force field update before PDF export, but after layout init (tdf#121962)
             bool bStateChanged = false;
@@ -2614,6 +2612,8 @@ sal_Int32 SAL_CALL SwXTextDocument::getRendererCount(
             if( bStateChanged )
                 pRenderDocShell->EnableSetModified();
 
+            pViewShell->CalcPagesForPrint( pViewShell->GetPageCount() );
+
             pViewShell->SetPDFExportOption( false );
 
             // enable view again