From 072af1b01c783b4ee7c9005ac2c15355e8a2f74d Mon Sep 17 00:00:00 2001 From: Miklos Vajna Date: Wed, 8 Jan 2020 15:40:32 +0100 Subject: DOCX import: fix lost page break when footer ends with a table Regression from commit 7d3778e0ef9f54f3c8988f1b84d58e7002d6c625 (bnc#816593 DOCX import: ignore page breaks in tables, 2013-09-02), the page break was ignored because the preceding footer ended with a table (no empty paragraph at the end of the footer stream). Fix the problem by saving/loading the table state around header/footers, that way the page break is not ignored. Adjust testTdf102466 to test the page number from Word. (cherry picked from commit a86a2a1c1ceb7203857d4317913c5b1bb9feb4aa) Conflicts: writerfilter/CppunitTest_writerfilter_dmapper.mk writerfilter/qa/cppunittests/dmapper/DomainMapper_Impl.cxx Change-Id: Ia4c22452ee2c37f7f941dfd922db04c851644d0c --- .../qa/cppunittests/dmapper/DomainMapper_Impl.cxx | 27 +++++++++++++++++++++ .../dmapper/data/page-break-footer-table.docx | Bin 0 -> 15416 bytes writerfilter/source/dmapper/DomainMapper_Impl.cxx | 9 +++++-- writerfilter/source/dmapper/DomainMapper_Impl.hxx | 5 +++- 4 files changed, 38 insertions(+), 3 deletions(-) create mode 100644 writerfilter/qa/cppunittests/dmapper/data/page-break-footer-table.docx (limited to 'writerfilter') diff --git a/writerfilter/qa/cppunittests/dmapper/DomainMapper_Impl.cxx b/writerfilter/qa/cppunittests/dmapper/DomainMapper_Impl.cxx index a7274c653805..dff03f974a66 100644 --- a/writerfilter/qa/cppunittests/dmapper/DomainMapper_Impl.cxx +++ b/writerfilter/qa/cppunittests/dmapper/DomainMapper_Impl.cxx @@ -54,6 +54,33 @@ void Test::tearDown() char const DATA_DIRECTORY[] = "/writerfilter/qa/cppunittests/dmapper/data/"; +CPPUNIT_TEST_FIXTURE(Test, testPageBreakFooterTable) +{ + // Load a document which refers to a footer which ends with a table, and there is a page break + // in the body text right after the footer reference. + OUString aURL = m_directories.getURLFromSrc(DATA_DIRECTORY) + "page-break-footer-table.docx"; + getComponent() = loadFromDesktop(aURL); + + // Check the last paragraph. + uno::Reference xTextDocument(getComponent(), uno::UNO_QUERY); + uno::Reference xParaEnumAccess(xTextDocument->getText(), + uno::UNO_QUERY); + uno::Reference xParaEnum = xParaEnumAccess->createEnumeration(); + uno::Reference xPara; + while (xParaEnum->hasMoreElements()) + { + xPara.set(xParaEnum->nextElement(), uno::UNO_QUERY); + } + style::BreakType eType = style::BreakType_NONE; + xPara->getPropertyValue("BreakType") >>= eType; + + // Without the accompanying fix in place, this test would have failed with: + // - Expected: 4 + // - Actual : 0 + // i.e. there was no page break before the last paragraph. + CPPUNIT_ASSERT_EQUAL(style::BreakType_PAGE_BEFORE, eType); +} + CPPUNIT_TEST_FIXTURE(Test, testNumberingRestartStyleParent) { OUString aURL = m_directories.getURLFromSrc(DATA_DIRECTORY) + "num-restart-style-parent.docx"; diff --git a/writerfilter/qa/cppunittests/dmapper/data/page-break-footer-table.docx b/writerfilter/qa/cppunittests/dmapper/data/page-break-footer-table.docx new file mode 100644 index 000000000000..376a1fb1e483 Binary files /dev/null and b/writerfilter/qa/cppunittests/dmapper/data/page-break-footer-table.docx differ diff --git a/writerfilter/source/dmapper/DomainMapper_Impl.cxx b/writerfilter/source/dmapper/DomainMapper_Impl.cxx index a04af3c1c8aa..b04c69d27030 100644 --- a/writerfilter/source/dmapper/DomainMapper_Impl.cxx +++ b/writerfilter/source/dmapper/DomainMapper_Impl.cxx @@ -2188,8 +2188,9 @@ void DomainMapper_Impl::appendGlossaryEntry() void DomainMapper_Impl::PushPageHeaderFooter(bool bHeader, SectionPropertyMap::PageType eType) { - m_aHeaderFooterStack.push(HeaderFooterContext(m_bTextInserted)); + m_aHeaderFooterStack.push(HeaderFooterContext(m_bTextInserted, m_nTableDepth)); m_bTextInserted = false; + m_nTableDepth = 0; const PropertyIds ePropIsOn = bHeader? PROP_HEADER_IS_ON: PROP_FOOTER_IS_ON; const PropertyIds ePropShared = bHeader? PROP_HEADER_IS_SHARED: PROP_FOOTER_IS_SHARED; @@ -2278,6 +2279,7 @@ void DomainMapper_Impl::PopPageHeaderFooter() if (!m_aHeaderFooterStack.empty()) { m_bTextInserted = m_aHeaderFooterStack.top().getTextInserted(); + m_nTableDepth = m_aHeaderFooterStack.top().getTableDepth(); m_aHeaderFooterStack.pop(); } } @@ -3525,8 +3527,9 @@ void DomainMapper_Impl::SetFieldLocked() m_aFieldStack.back()->SetFieldLocked(); } -HeaderFooterContext::HeaderFooterContext(bool bTextInserted) +HeaderFooterContext::HeaderFooterContext(bool bTextInserted, sal_Int32 nTableDepth) : m_bTextInserted(bTextInserted) + , m_nTableDepth(nTableDepth) { } @@ -3535,6 +3538,8 @@ bool HeaderFooterContext::getTextInserted() const return m_bTextInserted; } +sal_Int32 HeaderFooterContext::getTableDepth() const { return m_nTableDepth; } + FieldContext::FieldContext(uno::Reference< text::XTextRange > const& xStart) : m_bFieldCommandCompleted(false) , m_xStartRange( xStart ) diff --git a/writerfilter/source/dmapper/DomainMapper_Impl.hxx b/writerfilter/source/dmapper/DomainMapper_Impl.hxx index 483f8f92715c..e783e9334deb 100644 --- a/writerfilter/source/dmapper/DomainMapper_Impl.hxx +++ b/writerfilter/source/dmapper/DomainMapper_Impl.hxx @@ -131,9 +131,12 @@ enum SkipFootnoteSeparator class HeaderFooterContext { bool const m_bTextInserted; + sal_Int32 m_nTableDepth; + public: - explicit HeaderFooterContext(bool bTextInserted); + explicit HeaderFooterContext(bool bTextInserted, sal_Int32 nTableDepth); bool getTextInserted() const; + sal_Int32 getTableDepth() const; }; /// Information about a paragraph to be finished after a field end. -- cgit