diff options
| author | Mike Kaganski <mike.kaganski@collabora.com> | 2017-07-07 08:38:37 +0300 |
|---|---|---|
| committer | Mike Kaganski <mike.kaganski@collabora.com> | 2017-07-07 08:52:50 +0200 |
| commit | 919b6958dbb1c17c060ba9a58fe245b825b271c2 (patch) | |
| tree | b35983093d6c7e0286cfa790dd489947c8c4102e /sw | |
| parent | e0002e1b3836820cb63f81fd724c8aaf0e1f209c (diff) | |
tdf#108714: Also support paragraph-level (line) breaks
Change-Id: Ida55015363cac3ae29b82a60a9b9a5f1b39086a2
Reviewed-on: https://gerrit.libreoffice.org/39675
Tested-by: Jenkins <ci@libreoffice.org>
Reviewed-by: Mike Kaganski <mike.kaganski@collabora.com>
(cherry picked from commit f95f0ce163743706a3670c6e33593023c22af2ff)
Reviewed-on: https://gerrit.libreoffice.org/39677
Tested-by: Mike Kaganski <mike.kaganski@collabora.com>
Diffstat (limited to 'sw')
| -rw-r--r-- | sw/qa/extras/ooxmlimport/data/tdf108714.docx | bin | 1361 -> 1376 bytes | |||
| -rw-r--r-- | sw/qa/extras/ooxmlimport/ooxmlimport.cxx | 4 |
2 files changed, 3 insertions, 1 deletions
diff --git a/sw/qa/extras/ooxmlimport/data/tdf108714.docx b/sw/qa/extras/ooxmlimport/data/tdf108714.docx Binary files differindex cee4176aa8e0..69c4547960a6 100644 --- a/sw/qa/extras/ooxmlimport/data/tdf108714.docx +++ b/sw/qa/extras/ooxmlimport/data/tdf108714.docx diff --git a/sw/qa/extras/ooxmlimport/ooxmlimport.cxx b/sw/qa/extras/ooxmlimport/ooxmlimport.cxx index ed0f0c926cf2..767f908ab6fb 100644 --- a/sw/qa/extras/ooxmlimport/ooxmlimport.cxx +++ b/sw/qa/extras/ooxmlimport/ooxmlimport.cxx @@ -1453,8 +1453,10 @@ DECLARE_OOXMLIMPORT_TEST(testTdf108714, "tdf108714.docx") CPPUNIT_ASSERT_EQUAL(style::BreakType_PAGE_BEFORE, breakType); // A table with immediately following break + // Line breaks in block and paragraph levels must be taken into account + // Several successive out-of-place w:br's must produce required amount of breaks uno::Reference<text::XTextContent> table = getParagraphOrTable(5); - getCell(table, "A1", "Paragraph 5 in table"); + getCell(table, "A1", "\n\n\n\nParagraph 5 in table"); breakType = getProperty<style::BreakType>(table, "BreakType"); CPPUNIT_ASSERT_EQUAL(style::BreakType_NONE, breakType); |