summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMiklos Vajna <vmiklos@collabora.co.uk>2015-05-23 19:23:05 +0100
committerMichael Stahl <mstahl@redhat.com>2015-06-11 11:13:08 +0000
commit065a4d93287c0c3f16c516004c078fca948e3fc4 (patch)
tree278535daaf828e018dbc8897a9db9d3f49ed74c5
parentcbef9bda246c13dcad27bf8205930fc16b3e0265 (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) Reviewed-on: https://gerrit.libreoffice.org/16225 Reviewed-by: Michael Stahl <mstahl@redhat.com> Tested-by: Michael Stahl <mstahl@redhat.com>
-rw-r--r--sw/qa/extras/rtfimport/data/tdf90315.rtf4
-rw-r--r--sw/qa/extras/rtfimport/rtfimport.cxx9
-rw-r--r--writerfilter/source/dmapper/SectionColumnHandler.cxx2
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 66f04e7742c8..f7fa4de7bfaa 100644
--- a/sw/qa/extras/rtfimport/rtfimport.cxx
+++ b/sw/qa/extras/rtfimport/rtfimport.cxx
@@ -2300,6 +2300,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 dbc5ac9b1dec..c5d971d0db3f 100644
--- a/writerfilter/source/dmapper/SectionColumnHandler.cxx
+++ b/writerfilter/source/dmapper/SectionColumnHandler.cxx
@@ -33,7 +33,7 @@ using namespace ::com::sun::star;
SectionColumnHandler::SectionColumnHandler()
: LoggedProperties(dmapper_logger, "SectionColumnHandler")
, bEqualWidth(false)
- , nSpace(0)
+ , nSpace(1270) // 720 twips
, nNum(0)
, bSep(false)
{