[Libreoffice-commits] core.git: sw/source

[Michael Stahl (via logerrit)]

 sw/source/core/layout/layact.cxx |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

New commits:
commit 61a78a523a6131ff98b5d846368e5626fe58d99c
Author:     Michael Stahl <michael.st...@allotropia.de>
AuthorDate: Mon Aug 14 17:27:52 2023 +0200
Commit:     Michael Stahl <michael.st...@allotropia.de>
CommitDate: Tue Aug 15 09:44:33 2023 +0200

    tdf#156724 tdf#156722 sw: layout: remove IsPaintLocked() check
    
    Get rid of the problematic IsPaintLocked() and only check for a column
    parent; effectively this prevents formatting frames in columns even when
    loaded from the UI, so the layout will hopefully be the same regardless
    of how it is invoked.
    
    Change-Id: Ib4cc2efdb68ef4db73dcad01c7e1bd4be35de071
    Reviewed-on: https://gerrit.libreoffice.org/c/core/+/155673
    Tested-by: Jenkins
    Reviewed-by: Michael Stahl <michael.st...@allotropia.de>

diff --git a/sw/source/core/layout/layact.cxx b/sw/source/core/layout/layact.cxx
index af93ab796ff6..c20fa4e3a1ea 100644
--- a/sw/source/core/layout/layact.cxx
+++ b/sw/source/core/layout/layact.cxx
@@ -1431,7 +1431,7 @@ bool SwLayAction::FormatLayout( OutputDevice 
*pRenderContext, SwLayoutFrame *pLa
                 PopFormatLayout();
             }
         }
-        else if (m_pImp->GetShell()->IsPaintLocked() || 
!pLay->IsColBodyFrame())
+        else if (!pLay->IsColBodyFrame())
         {   // tdf#156724 unconditionally for frames in tables, so their 
footnotes exist before trying to split
             pLow->OptCalc();
         }