diff options
| author | Miklos Vajna <vmiklos@collabora.co.uk> | 2014-06-20 12:52:03 +0200 |
|---|---|---|
| committer | Miklos Vajna <vmiklos@collabora.co.uk> | 2014-06-20 12:59:11 +0200 |
| commit | 3ea80a46860f7fe510b206845b56daad1e2d1c56 (patch) | |
| tree | 2665f833d176f7116ac5f474a59495543bdf0798 | |
| parent | 36b1c27b26e113651a6ac9000677920886786503 (diff) | |
RTF import: handle column break at the very start of the document
Change-Id: Ib7d166bf1b1e5d5216d822b2b0396aa4dc535c6f
| -rw-r--r-- | sw/qa/extras/rtfimport/data/column-break.rtf | 1 | ||||
| -rw-r--r-- | sw/qa/extras/rtfimport/rtfimport.cxx | 6 | ||||
| -rw-r--r-- | writerfilter/source/rtftok/rtfdocumentimpl.cxx | 1 |
3 files changed, 8 insertions, 0 deletions
diff --git a/sw/qa/extras/rtfimport/data/column-break.rtf b/sw/qa/extras/rtfimport/data/column-break.rtf new file mode 100644 index 000000000000..185fcd0a8205 --- /dev/null +++ b/sw/qa/extras/rtfimport/data/column-break.rtf @@ -0,0 +1 @@ +{\rtf1\cols2\column hello\par} diff --git a/sw/qa/extras/rtfimport/rtfimport.cxx b/sw/qa/extras/rtfimport/rtfimport.cxx index 3dec26ee08ae..d834fb878ef8 100644 --- a/sw/qa/extras/rtfimport/rtfimport.cxx +++ b/sw/qa/extras/rtfimport/rtfimport.cxx @@ -1759,6 +1759,12 @@ DECLARE_RTFIMPORT_TEST(testFontOverride, "font-override.rtf") CPPUNIT_ASSERT_EQUAL(OUString("Arial"), getProperty<OUString>(getRun(getParagraph(1), 1), "CharFontName")); } +DECLARE_RTFIMPORT_TEST(testColumnBreak, "column-break.rtf") +{ + // Column break at the very start of the document was ignored. + CPPUNIT_ASSERT_EQUAL(style::BreakType_COLUMN_BEFORE, getProperty<style::BreakType>(getParagraph(2), "BreakType")); +} + CPPUNIT_PLUGIN_IMPLEMENT(); /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/writerfilter/source/rtftok/rtfdocumentimpl.cxx b/writerfilter/source/rtftok/rtfdocumentimpl.cxx index 3a7ebfbe7cea..1be8c91c2edf 100644 --- a/writerfilter/source/rtftok/rtfdocumentimpl.cxx +++ b/writerfilter/source/rtftok/rtfdocumentimpl.cxx @@ -2243,6 +2243,7 @@ int RTFDocumentImpl::dispatchSymbol(RTFKeyword nKeyword) if (pNum.get() && pNum->getInt() > 1) bColumns = true; } + checkFirstRun(); if (bColumns) { sal_uInt8 sBreak[] = { 0xe }; |