diff options
-rw-r--r-- | sw/qa/extras/rtfexport/rtfexport.cxx | 2 | ||||
-rw-r--r-- | sw/source/filter/ww8/wrtww8.cxx | 4 |
2 files changed, 6 insertions, 0 deletions
diff --git a/sw/qa/extras/rtfexport/rtfexport.cxx b/sw/qa/extras/rtfexport/rtfexport.cxx index b59e0c6efc6e..fb5d261249a3 100644 --- a/sw/qa/extras/rtfexport/rtfexport.cxx +++ b/sw/qa/extras/rtfexport/rtfexport.cxx @@ -1124,6 +1124,8 @@ DECLARE_RTFEXPORT_TEST(testTdf94043, "tdf94043.rtf") // This was 0, the separator line was not visible due to 0 width. CPPUNIT_ASSERT_EQUAL(static_cast<sal_Int32>(2), getProperty<sal_Int32>(xTextColumns, "SeparatorLineWidth")); + + CPPUNIT_ASSERT_EQUAL(7, getParagraphs()); } DECLARE_RTFEXPORT_TEST(testTdf94377, "tdf94377.rtf") diff --git a/sw/source/filter/ww8/wrtww8.cxx b/sw/source/filter/ww8/wrtww8.cxx index 15e5506abfc4..64bf90dfdac5 100644 --- a/sw/source/filter/ww8/wrtww8.cxx +++ b/sw/source/filter/ww8/wrtww8.cxx @@ -2773,6 +2773,10 @@ void MSWordExportBase::WriteText() { bNeedExportBreakHere = false; } + // No need to create a "fake" section if this is the end of the document, + // except to emulate balanced columns. + else if ( nColumnCount < 2 && aIdx == m_pDoc->GetNodes().GetEndOfContent() ) + bNeedExportBreakHere = false; } if (bNeedExportBreakHere) //#120140# End of check |