diff --git a/sw/qa/extras/ooxmlexport/data/tdf153613_textboxAfterPgBreak3.docx b/sw/qa/extras/ooxmlexport/data/tdf153613_textboxAfterPgBreak3.docx deleted file mode 100644 index a282deaa0ad7..000000000000 Binary files a/sw/qa/extras/ooxmlexport/data/tdf153613_textboxAfterPgBreak3.docx and /dev/null differ diff --git a/sw/qa/extras/ooxmlexport/ooxmlexport18.cxx b/sw/qa/extras/ooxmlexport/ooxmlexport18.cxx index 066eb3647cb5..bbcc40dde073 100644 --- a/sw/qa/extras/ooxmlexport/ooxmlexport18.cxx +++ b/sw/qa/extras/ooxmlexport/ooxmlexport18.cxx @@ -193,11 +193,6 @@ DECLARE_OOXMLEXPORT_TEST(testTdf146984_anchorInShape, "tdf146984_anchorInShape.d { // This was only one page b/c the page break was missing. CPPUNIT_ASSERT_EQUAL(2, getPages()); - - const auto& pLayout = parseLayoutDump(); - // There are shapes on both pages - these should be non-zero numbers - assertXPath(pLayout, "//page[1]//anchored", 3); - assertXPath(pLayout, "//page[2]//anchored", 2); } DECLARE_OOXMLEXPORT_TEST(testTdf127622_framePr, "tdf127622_framePr.docx") @@ -379,16 +374,6 @@ DECLARE_OOXMLEXPORT_TEST(testTdf153613_textboxAfterPgBreak2, "tdf153613_textboxA assertXPathContent(pLayout, "//page[2]/body/txt", "There should be no prior carriage return."); } -DECLARE_OOXMLEXPORT_TEST(testTdf153613_textboxAfterPgBreak3, "tdf153613_textboxAfterPgBreak3.docx") -{ - // All anchored TO-character shapes stay on the first page, before the page break. - CPPUNIT_ASSERT_EQUAL(2, getPages()); - CPPUNIT_ASSERT_EQUAL(3, getParagraphs()); - - const auto& pLayout = parseLayoutDump(); - assertXPath(pLayout, "//page[2]//anchored", 0); -} - DECLARE_OOXMLEXPORT_TEST(testTdf153613_sdtAfterPgBreak, "tdf153613_sdtAfterPgBreak.docx") { CPPUNIT_ASSERT_EQUAL(2, getPages()); diff --git a/writerfilter/source/dmapper/DomainMapper.cxx b/writerfilter/source/dmapper/DomainMapper.cxx index 5b5647be8bae..726730ad3076 100644 --- a/writerfilter/source/dmapper/DomainMapper.cxx +++ b/writerfilter/source/dmapper/DomainMapper.cxx @@ -3741,7 +3741,7 @@ void DomainMapper::lcl_startShape(uno::Reference const& xShape) { // If there is a deferred page break, handle it now, so that the // started shape will be on the correct page. - if (m_pImpl->isBreakDeferred(PAGE_BREAK) && !m_pImpl->IsBreakDeferredByAnchor()) + if (m_pImpl->isBreakDeferred(PAGE_BREAK)) { // RTF doesn't properly report IsFirstRun, so in order to prevent regressions // always split the paragraph for RTF since that is the way it has been done lately. @@ -3751,9 +3751,6 @@ void DomainMapper::lcl_startShape(uno::Reference const& xShape) finishParagraph(); lcl_startParagraphGroup(); } - else - m_pImpl->SetIsBreakDeferredByAnchor(); - } m_pImpl->PushShapeContext( xShape ); lcl_startParagraphGroup(); diff --git a/writerfilter/source/dmapper/DomainMapper_Impl.cxx b/writerfilter/source/dmapper/DomainMapper_Impl.cxx index 36a0f6c178f9..4d91790ade4c 100644 --- a/writerfilter/source/dmapper/DomainMapper_Impl.cxx +++ b/writerfilter/source/dmapper/DomainMapper_Impl.cxx @@ -334,7 +334,6 @@ DomainMapper_Impl::DomainMapper_Impl( m_bIsColumnBreakDeferred( false ), m_bIsPageBreakDeferred( false ), m_nLineBreaksDeferred( 0 ), - m_bIsBreakDeferredByAnchor(false), m_bSdtEndDeferred(false), m_bParaSdtEndDeferred(false), m_bStartTOC(false), @@ -1592,7 +1591,6 @@ void DomainMapper_Impl::clearDeferredBreak(BreakType deferredBreakType) break; case PAGE_BREAK: m_bIsPageBreakDeferred = false; - m_bIsBreakDeferredByAnchor = false; break; default: break; @@ -1604,17 +1602,6 @@ void DomainMapper_Impl::clearDeferredBreaks() m_nLineBreaksDeferred = 0; m_bIsColumnBreakDeferred = false; m_bIsPageBreakDeferred = false; - m_bIsBreakDeferredByAnchor = false; -} - -bool DomainMapper_Impl::IsBreakDeferredByAnchor() -{ - return m_bIsBreakDeferredByAnchor; -} - -void DomainMapper_Impl::SetIsBreakDeferredByAnchor() -{ - m_bIsBreakDeferredByAnchor = true; } void DomainMapper_Impl::setSdtEndDeferred(bool bSdtEndDeferred) diff --git a/writerfilter/source/dmapper/DomainMapper_Impl.hxx b/writerfilter/source/dmapper/DomainMapper_Impl.hxx index 676a0d3196d9..82d7ca06824e 100644 --- a/writerfilter/source/dmapper/DomainMapper_Impl.hxx +++ b/writerfilter/source/dmapper/DomainMapper_Impl.hxx @@ -472,7 +472,6 @@ private: bool m_bIsColumnBreakDeferred; bool m_bIsPageBreakDeferred; sal_Int32 m_nLineBreaksDeferred; - bool m_bIsBreakDeferredByAnchor; /// If we want to set "sdt end" on the next character context. bool m_bSdtEndDeferred; /// If we want to set "paragraph sdt end" on the next paragraph context. @@ -743,8 +742,6 @@ public: bool isBreakDeferred( BreakType deferredBreakType ); void clearDeferredBreaks(); void clearDeferredBreak(BreakType deferredBreakType); - bool IsBreakDeferredByAnchor(); - void SetIsBreakDeferredByAnchor(); void setSdtEndDeferred(bool bSdtEndDeferred); bool isSdtEndDeferred() const;