[Libreoffice-commits] core.git: Branch 'feature/cib_contract57c' - sw/source

[Libreoffice Gerrit user]

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

New commits:
commit 03edd43627157749b38c2ee44b14169d56987408
Author:     Samuel Mehrbrodt <Samuel.Mehrbrodt at cib.de>
AuthorDate: Thu Jan 24 15:52:47 2019 +0100
Commit:     Samuel Mehrbrodt <Samuel.Mehrbrodt at cib.de>
CommitDate: Fri Jan 25 08:27:19 2019 +0100

    tdf#122607 Don't unnecessarily redo the layout
    
    Brings weird issues like out of place textboxes as described in the bug.
    
    Change-Id: I19341efc48188f0b52069401dc39ba05f4fcc7f6
    Reviewed-on: https://gerrit.libreoffice.org/66874
    Tested-by: Jenkins
    Reviewed-by: Samuel Mehrbrodt <Samuel.Mehrbrodt at cib.de>
    (cherry picked from commit 1ecca673b40fedc53db125e332b087d1c120a254)
    Reviewed-on: https://gerrit.libreoffice.org/66897
    Tested-by: Samuel Mehrbrodt <Samuel.Mehrbrodt at cib.de>

diff --git a/sw/source/uibase/uno/unotxdoc.cxx b/sw/source/uibase/uno/unotxdoc.cxx
index 6e9701c765eb..066907bea12e 100644
--- a/sw/source/uibase/uno/unotxdoc.cxx
+++ b/sw/source/uibase/uno/unotxdoc.cxx
@@ -2633,10 +2633,6 @@ sal_Int32 SAL_CALL SwXTextDocument::getRendererCount(
             if( bStateChanged )
                 pRenderDocShell->EnableSetModified();
 
-            // there is some redundancy between those two function calls, but right now
-            // 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)