Revert "tdf#156724 tdf#156722 tdf#156745 sw: layout: partially remove IsPaintLocked()"

This reverts commit 46274983c3ac31a0580a4baeb26e3b5d79ed3c91.

3 files changed, 3 insertions, 34 deletions

diff --git a/sw/qa/extras/layout/data/fdo56797-2-min.odt b/sw/qa/extras/layout/data/fdo56797-2-min.odt
deleted file mode 100644
index 624149ec0248..000000000000
--- a/sw/qa/extras/layout/data/fdo56797-2-min.odt
+++ /dev/null
diff --git a/sw/qa/extras/layout/layout.cxx b/sw/qa/extras/layout/layout.cxx
index f72715fcba43..11c502d4c09d 100644
--- a/sw/qa/extras/layout/layout.cxx
+++ b/sw/qa/extras/layout/layout.cxx
@@ -3641,37 +3641,6 @@ CPPUNIT_TEST_FIXTURE(SwLayoutWriter, testTdf155324)
     assertXPath(pXmlDoc, "/root/page[5]/ftncont/ftn", 5);
 }
 
-CPPUNIT_TEST_FIXTURE(SwLayoutWriter, testTdf156724)
-{
-    discardDumpedLayout();
-    if (mxComponent.is())
-        mxComponent->dispose();
-
-    OUString const url(m_directories.getURLFromSrc(DATA_DIRECTORY) + "/fdo56797-2-min.odt");
-
-    // note: must set Hidden property, so that SfxFrameViewWindow_Impl::Resize()
-    // does *not* forward initial VCL Window Resize and thereby triggers a
-    // layout which does not happen on soffice --convert-to pdf.
-    std::vector<beans::PropertyValue> aFilterOptions = {
-        { beans::PropertyValue("Hidden", -1, uno::Any(true), beans::PropertyState_DIRECT_VALUE) },
-    };
-
-    // inline the loading because currently properties can't be passed...
-    mxComponent = loadFromDesktop(url, "com.sun.star.text.TextDocument",
-                                  comphelper::containerToSequence(aFilterOptions));
-    save("writer_pdf_Export", maTempFile);
-
-    xmlDocPtr pXmlDoc = parseLayoutDump();
-    // both pages have a tab frame and one footnote
-    assertXPath(pXmlDoc, "/root/page[1]/body/tab", 1);
-    assertXPath(pXmlDoc, "/root/page[1]/ftncont", 1);
-    assertXPath(pXmlDoc, "/root/page[1]/ftncont/ftn", 1);
-    assertXPath(pXmlDoc, "/root/page[2]/body/tab", 1);
-    assertXPath(pXmlDoc, "/root/page[2]/ftncont", 1);
-    assertXPath(pXmlDoc, "/root/page[2]/ftncont/ftn", 1);
-    assertXPath(pXmlDoc, "/root/page", 2);
-}
-
 CPPUNIT_PLUGIN_IMPLEMENT();
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/sw/source/core/layout/layact.cxx b/sw/source/core/layout/layact.cxx
index 88185c8de95a..6a2fd2046ffb 100644
--- a/sw/source/core/layout/layact.cxx
+++ b/sw/source/core/layout/layact.cxx
@@ -1365,10 +1365,10 @@ 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 (m_pImp->GetShell()->IsPaintLocked() || !pLay->IsColBodyFrame())
-        {   // tdf#156724 unconditionally for frames in tables, so their footnotes exist before trying to split
+        else if ( m_pImp->GetShell()->IsPaintLocked() )
+            // Shortcut to minimize the cycles. With Lock, the
+            // paint is coming either way (primarily for browse)
             pLow->OptCalc();
-        }
 
         if ( IsAgain() )
             return false;