diff options
| author | Miklos Vajna <vmiklos@collabora.co.uk> | 2015-05-23 19:23:05 +0100 |
|---|---|---|
| committer | Miklos Vajna <vmiklos@collabora.co.uk> | 2015-05-26 10:07:20 +0200 |
| commit | 5101c13a3e54256bd79c412484e71d6d0f269187 (patch) | |
| tree | 1aa13e8f005f6e62f5d6a2b1bab4f1d0324fce95 | |
| parent | 92a9c03e5100952dd364e38366ec0f80999cbc43 (diff) | |
tdf#90315 RTF import: fix \colsx default value
See SectPageInformation::mnColsx on the libreoffice-3-6 branch + the
spec agrees, too.
Change-Id: I6f70a125f8d962621f319e3e75e2865e5f126859
(cherry picked from commit e18adb7369d140f33b947668a69da2fa78738e7b)
| -rw-r--r-- | sw/qa/extras/rtfimport/data/tdf90315.rtf | 4 | ||||
| -rw-r--r-- | sw/qa/extras/rtfimport/rtfimport.cxx | 9 | ||||
| -rw-r--r-- | writerfilter/source/dmapper/SectionColumnHandler.cxx | 2 |
3 files changed, 14 insertions, 1 deletions
diff --git a/sw/qa/extras/rtfimport/data/tdf90315.rtf b/sw/qa/extras/rtfimport/data/tdf90315.rtf new file mode 100644 index 000000000000..df99754fe860 --- /dev/null +++ b/sw/qa/extras/rtfimport/data/tdf90315.rtf @@ -0,0 +1,4 @@ +{\rtf1\cols2 +foo\par +bar\par +} diff --git a/sw/qa/extras/rtfimport/rtfimport.cxx b/sw/qa/extras/rtfimport/rtfimport.cxx index e74d69401687..86dddfc339fa 100644 --- a/sw/qa/extras/rtfimport/rtfimport.cxx +++ b/sw/qa/extras/rtfimport/rtfimport.cxx @@ -2292,6 +2292,15 @@ DECLARE_RTFIMPORT_TEST(testTdf86814, "tdf86814.rtf") CPPUNIT_ASSERT_EQUAL(awt::FontWeight::BOLD, getProperty<float>(getRun(getParagraph(1), 1), "CharWeight")); } +DECLARE_RTFIMPORT_TEST(testTdf90315, "tdf90315.rtf") +{ + uno::Reference<text::XTextSectionsSupplier> xTextSectionsSupplier(mxComponent, uno::UNO_QUERY); + uno::Reference<container::XIndexAccess> xTextSections(xTextSectionsSupplier->getTextSections(), uno::UNO_QUERY); + uno::Reference<beans::XPropertySet> xTextSection(xTextSections->getByIndex(0), uno::UNO_QUERY); + // This was 0, but default should be 720 twips. + CPPUNIT_ASSERT_EQUAL(static_cast<sal_Int32>(1270), getProperty<sal_Int32>(xTextSection->getPropertyValue("TextColumns"), "AutomaticDistance")); +} + CPPUNIT_PLUGIN_IMPLEMENT(); /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/writerfilter/source/dmapper/SectionColumnHandler.cxx b/writerfilter/source/dmapper/SectionColumnHandler.cxx index 3a3575477f94..91dfc91fc663 100644 --- a/writerfilter/source/dmapper/SectionColumnHandler.cxx +++ b/writerfilter/source/dmapper/SectionColumnHandler.cxx @@ -31,7 +31,7 @@ using namespace ::com::sun::star; SectionColumnHandler::SectionColumnHandler() : LoggedProperties("SectionColumnHandler") , bEqualWidth(false) - , nSpace(0) + , nSpace(1270) // 720 twips , nNum(0) , bSep(false) { |