From 5e502cf754e7c08e098ba401610aef76b4244f1f Mon Sep 17 00:00:00 2001 From: Miklos Vajna Date: Mon, 2 Sep 2013 10:27:49 +0200 Subject: bnc#816593 DOCX import: ignore page breaks in tables (cherry picked from commit 7d3778e0ef9f54f3c8988f1b84d58e7002d6c625) Conflicts: writerfilter/source/dmapper/DomainMapper.cxx Change-Id: Ibb250148d41d1929fa17dd993bb71c93c0e09dcf Conflicts: writerfilter/source/dmapper/DomainMapper_Impl.cxx --- sw/qa/extras/ooxmlimport/data/table-pagebreak.docx | Bin 0 -> 10148 bytes sw/qa/extras/ooxmlimport/ooxmlimport.cxx | 11 +++++++++++ writerfilter/source/dmapper/DomainMapper.cxx | 6 ++++++ writerfilter/source/dmapper/DomainMapper_Impl.cxx | 9 ++++++++- writerfilter/source/dmapper/DomainMapper_Impl.hxx | 9 +++++++++ writerfilter/source/ooxml/OOXMLFastContextHandler.cxx | 10 ++++++++++ writerfilter/source/ooxml/model.xml | 1 + 7 files changed, 45 insertions(+), 1 deletion(-) create mode 100755 sw/qa/extras/ooxmlimport/data/table-pagebreak.docx diff --git a/sw/qa/extras/ooxmlimport/data/table-pagebreak.docx b/sw/qa/extras/ooxmlimport/data/table-pagebreak.docx new file mode 100755 index 000000000000..06ecf9535af1 Binary files /dev/null and b/sw/qa/extras/ooxmlimport/data/table-pagebreak.docx differ diff --git a/sw/qa/extras/ooxmlimport/ooxmlimport.cxx b/sw/qa/extras/ooxmlimport/ooxmlimport.cxx index e85a2286b735..4da8664e649f 100644 --- a/sw/qa/extras/ooxmlimport/ooxmlimport.cxx +++ b/sw/qa/extras/ooxmlimport/ooxmlimport.cxx @@ -133,6 +133,7 @@ public: void testTableFloating(); void testTableAutoNested(); void testTableStyleParprop(); + void testTablePagebreak(); CPPUNIT_TEST_SUITE(Test); #if !defined(MACOSX) && !defined(WNT) @@ -215,6 +216,7 @@ void Test::run() {"table-floating.docx", &Test::testTableFloating}, {"table-auto-nested.docx", &Test::testTableAutoNested}, {"table-style-parprop.docx", &Test::testTableStyleParprop}, + {"table-pagebreak.docx", &Test::testTablePagebreak}, }; for (unsigned int i = 0; i < SAL_N_ELEMENTS(aMethods); ++i) { @@ -1349,6 +1351,15 @@ void Test::testTableStyleParprop() CPPUNIT_ASSERT_EQUAL(sal_Int32(0), getProperty(getParagraphOfText(1, xCell->getText()), "ParaBottomMargin")); } +void Test::testTablePagebreak() +{ + // Page break inside table: should be ignored (was style::BreakType_PAGE_BEFORE before). + CPPUNIT_ASSERT_EQUAL(style::BreakType_NONE, getProperty(getParagraphOrTable(2), "BreakType")); + + // This one is outside the table: should not be ignored. + CPPUNIT_ASSERT_EQUAL(style::BreakType_PAGE_BEFORE, getProperty(getParagraph(3), "BreakType")); +} + CPPUNIT_TEST_SUITE_REGISTRATION(Test); CPPUNIT_PLUGIN_IMPLEMENT(); diff --git a/writerfilter/source/dmapper/DomainMapper.cxx b/writerfilter/source/dmapper/DomainMapper.cxx index 4d0d7217cb2a..03d1c852f92a 100644 --- a/writerfilter/source/dmapper/DomainMapper.cxx +++ b/writerfilter/source/dmapper/DomainMapper.cxx @@ -3332,6 +3332,12 @@ void DomainMapper::sprmWithProps( Sprm& rSprm, PropertyMapPtr rContext, SprmType } } break; + case NS_ooxml::LN_tblStart: + m_pImpl->m_nTableDepth++; + break; + case NS_ooxml::LN_tblEnd: + m_pImpl->m_nTableDepth--; + break; default: { #ifdef DEBUG_DOMAINMAPPER diff --git a/writerfilter/source/dmapper/DomainMapper_Impl.cxx b/writerfilter/source/dmapper/DomainMapper_Impl.cxx index 8f1af5aff78d..07654c6f80a1 100644 --- a/writerfilter/source/dmapper/DomainMapper_Impl.cxx +++ b/writerfilter/source/dmapper/DomainMapper_Impl.cxx @@ -193,7 +193,9 @@ DomainMapper_Impl::DomainMapper_Impl( m_bSdt(false), m_xInsertTextRange(xInsertTextRange), m_bIsNewDoc(bIsNewDoc), - m_pSdtHelper(0) + m_pSdtHelper(0), + m_nTableDepth(0) + { appendTableManager( ); GetBodyText(); @@ -632,6 +634,11 @@ void DomainMapper_Impl::deferBreak( BreakType deferredBreakType) m_bIsColumnBreakDeferred = true; break; case PAGE_BREAK: + // See SwWW8ImplReader::HandlePageBreakChar(), page break should be + // ignored inside tables. + if (m_nTableDepth > 0) + return; + m_bIsPageBreakDeferred = true; break; default: diff --git a/writerfilter/source/dmapper/DomainMapper_Impl.hxx b/writerfilter/source/dmapper/DomainMapper_Impl.hxx index e2a43b631f31..ccca0dcdd58d 100644 --- a/writerfilter/source/dmapper/DomainMapper_Impl.hxx +++ b/writerfilter/source/dmapper/DomainMapper_Impl.hxx @@ -683,6 +683,15 @@ public: /// Document background color, applied to every page style. boost::optional m_oBackgroundColor; + + /** + * This contains the raw table depth. m_nTableDepth > 0 is the same as + * getTableManager().isInTable(), unless we're in the first paragraph of a + * table, or first paragraph after a table, as the table manager is only + * updated once we ended the paragraph (and know if the para has the + * PFInTable SPRM or not). + */ + sal_Int32 m_nTableDepth; }; } //namespace dmapper } //namespace writerfilter diff --git a/writerfilter/source/ooxml/OOXMLFastContextHandler.cxx b/writerfilter/source/ooxml/OOXMLFastContextHandler.cxx index d4068560a9f9..4d4ac65e2632 100644 --- a/writerfilter/source/ooxml/OOXMLFastContextHandler.cxx +++ b/writerfilter/source/ooxml/OOXMLFastContextHandler.cxx @@ -1943,6 +1943,16 @@ void OOXMLFastContextHandlerTextTable::lcl_endFastElement { endAction(Element); + boost::shared_ptr pProps( new OOXMLPropertySetImpl ); + { + OOXMLValue::Pointer_t pVal + (new OOXMLIntegerValue(mnTableDepth)); + OOXMLProperty::Pointer_t pProp + (new OOXMLPropertyImpl(NS_ooxml::LN_tblEnd, pVal, OOXMLPropertyImpl::SPRM)); + pProps->add(pProp); + } + mpParserState->setCharacterProperties(pProps); + mnTableDepth--; mpParserState->endTable(); } diff --git a/writerfilter/source/ooxml/model.xml b/writerfilter/source/ooxml/model.xml index 6f27ef66e844..ff1d618fa5ee 100644 --- a/writerfilter/source/ooxml/model.xml +++ b/writerfilter/source/ooxml/model.xml @@ -38,6 +38,7 @@ + -- cgit v1.2.3