diff options
| author | Samuel Mehrbrodt <samuel.mehrbrodt@allotropia.de> | 2024-01-11 12:05:46 +0100 |
|---|---|---|
| committer | Samuel Mehrbrodt <samuel.mehrbrodt@allotropia.de> | 2024-01-11 12:05:46 +0100 |
| commit | 56012f32b0d59c59f30d4aef4832e04b26780af0 (patch) | |
| tree | a799062ee4b3ebe4650734684f773b1a9159ee91 /sw/source/core/layout/layact.cxx | |
| parent | 0daa0fa68e8eff8a85762c7dce080f7ccd549d6a (diff) | |
Revert "tdf#156724 tdf#156722 sw: layout: remove IsPaintLocked() check"
This reverts commit 70265179db368c1f3f5d4463bcb303be88c07e10.
Diffstat (limited to 'sw/source/core/layout/layact.cxx')
| -rw-r--r-- | sw/source/core/layout/layact.cxx | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/sw/source/core/layout/layact.cxx b/sw/source/core/layout/layact.cxx index 2de17673e0e2..88185c8de95a 100644 --- a/sw/source/core/layout/layact.cxx +++ b/sw/source/core/layout/layact.cxx @@ -1365,7 +1365,7 @@ bool SwLayAction::FormatLayout( OutputDevice *pRenderContext, SwLayoutFrame *pLa else if( !pLow->IsSctFrame() || static_cast<SwSectionFrame*>(pLow)->GetSection() ) bChanged |= FormatLayout( pRenderContext, static_cast<SwLayoutFrame*>(pLow), bAddRect ); } - else if (!pLay->IsColBodyFrame()) + else if (m_pImp->GetShell()->IsPaintLocked() || !pLay->IsColBodyFrame()) { // tdf#156724 unconditionally for frames in tables, so their footnotes exist before trying to split pLow->OptCalc(); } |