From 11a98f5bb553606d05d86a143a1e11b78a23f29f Mon Sep 17 00:00:00 2001 From: Mike Kaganski Date: Wed, 28 Jun 2017 10:50:28 +0300 Subject: tdf#108714 follow-up: handle deferred break in character group If an out-of-order break happens immediately after a table, then in following paragraph group (before character group start) the table level is > 0, and break is ignored. Since out-of-order break only happens at top level, the following character group necessarily designates a new paragraph group, so it's OK to handle that at the character group level, where table level is already updated. Change-Id: Ic1b1bb89e12407b050c2e880ad971794311845a5 Reviewed-on: https://gerrit.libreoffice.org/39347 Tested-by: Jenkins Reviewed-by: Mike Kaganski (cherry picked from commit 553204015f954d20db65e6adcda68b823a8ef235) Reviewed-on: https://gerrit.libreoffice.org/39352 Reviewed-by: Andras Timar Tested-by: Andras Timar --- sw/qa/extras/ooxmlimport/data/tdf108714.docx | Bin 1310 -> 1361 bytes sw/qa/extras/ooxmlimport/ooxmlimport.cxx | 19 +++++++++++++++---- .../source/ooxml/OOXMLFastContextHandler.cxx | 8 ++++---- 3 files changed, 19 insertions(+), 8 deletions(-) diff --git a/sw/qa/extras/ooxmlimport/data/tdf108714.docx b/sw/qa/extras/ooxmlimport/data/tdf108714.docx index e564d44a648b..cee4176aa8e0 100644 Binary files a/sw/qa/extras/ooxmlimport/data/tdf108714.docx and b/sw/qa/extras/ooxmlimport/data/tdf108714.docx differ diff --git a/sw/qa/extras/ooxmlimport/ooxmlimport.cxx b/sw/qa/extras/ooxmlimport/ooxmlimport.cxx index 260fabb4b690..ed0f0c926cf2 100644 --- a/sw/qa/extras/ooxmlimport/ooxmlimport.cxx +++ b/sw/qa/extras/ooxmlimport/ooxmlimport.cxx @@ -1409,8 +1409,8 @@ DECLARE_OOXMLIMPORT_TEST(testTdf108806, "tdf108806.docx") DECLARE_OOXMLIMPORT_TEST(testTdf108714, "tdf108714.docx") { - CPPUNIT_ASSERT_EQUAL(4, getParagraphs()); - CPPUNIT_ASSERT_EQUAL_MESSAGE("Page break is absent - we lost bug-to-bug compatibility with Word", 3, getPages()); + CPPUNIT_ASSERT_EQUAL(6, getParagraphs()); + CPPUNIT_ASSERT_EQUAL_MESSAGE("Page break is absent - we lost bug-to-bug compatibility with Word", 4, getPages()); // The second (empty) paragraph must be at first page, despite the element was before it. // That's because Word treats such break as first element in first run of following paragraph: @@ -1443,12 +1443,23 @@ DECLARE_OOXMLIMPORT_TEST(testTdf108714, "tdf108714.docx") CPPUNIT_ASSERT_EQUAL(style::BreakType_NONE, breakType); paragraph = getParagraph(3); - CPPUNIT_ASSERT_EQUAL(OUString("Paragraph 2"), paragraph->getString()); + CPPUNIT_ASSERT_EQUAL(OUString("Paragraph 3"), paragraph->getString()); breakType = getProperty(paragraph, "BreakType"); CPPUNIT_ASSERT_EQUAL(style::BreakType_PAGE_BEFORE, breakType); paragraph = getParagraph(4); - CPPUNIT_ASSERT_EQUAL(OUString("Paragraph 3"), paragraph->getString()); + CPPUNIT_ASSERT_EQUAL(OUString("Paragraph 4"), paragraph->getString()); + breakType = getProperty(paragraph, "BreakType"); + CPPUNIT_ASSERT_EQUAL(style::BreakType_PAGE_BEFORE, breakType); + + // A table with immediately following break + uno::Reference table = getParagraphOrTable(5); + getCell(table, "A1", "Paragraph 5 in table"); + breakType = getProperty(table, "BreakType"); + CPPUNIT_ASSERT_EQUAL(style::BreakType_NONE, breakType); + + paragraph = getParagraph(6); + CPPUNIT_ASSERT_EQUAL(OUString("Paragraph 6"), paragraph->getString()); breakType = getProperty(paragraph, "BreakType"); CPPUNIT_ASSERT_EQUAL(style::BreakType_PAGE_BEFORE, breakType); } diff --git a/writerfilter/source/ooxml/OOXMLFastContextHandler.cxx b/writerfilter/source/ooxml/OOXMLFastContextHandler.cxx index 042998559336..84d2a65ad6e0 100644 --- a/writerfilter/source/ooxml/OOXMLFastContextHandler.cxx +++ b/writerfilter/source/ooxml/OOXMLFastContextHandler.cxx @@ -371,6 +371,10 @@ void OOXMLFastContextHandler::startCharacterGroup() mpParserState->setInCharacterGroup(true); mpParserState->resolveCharacterProperties(*mpStream); } + + // tdf#108714 : if we have a postponed break information, + // then apply it now, before any other paragraph content. + mpParserState->resolvePostponedBreak(*mpStream); } } @@ -397,10 +401,6 @@ void OOXMLFastContextHandler::startParagraphGroup() { mpStream->startParagraphGroup(); mpParserState->setInParagraphGroup(true); - - // tdf#108714 : if we have a postponed break information, - // then apply it now, before any other paragraph content. - mpParserState->resolvePostponedBreak(*mpStream); } } } -- cgit