summaryrefslogtreecommitdiff
path: root/sw
diff options
context:
space:
mode:
authorMiklos Vajna <vmiklos@collabora.co.uk>2014-09-25 21:29:00 +0200
committerMiklos Vajna <vmiklos@collabora.co.uk>2014-09-25 21:29:00 +0200
commitc1f8437dbed0e8b989e41a345ef7e658a6e8a4cd (patch)
tree1be63ae37ca941c29b6da2f13e7c7f8cca04fa53 /sw
parentfd0a49bdd7cf7979d18feff003d1b5fbe53fdc14 (diff)
fdo#83465 RTF import: handle font of numbering
Change-Id: If0da6e0e34ce50bbe7dceda089b6bb81b4a63f36
Diffstat (limited to 'sw')
-rw-r--r--sw/qa/extras/rtfexport/data/numbering-font.rtf22
-rw-r--r--sw/qa/extras/rtfexport/rtfexport.cxx7
2 files changed, 29 insertions, 0 deletions
diff --git a/sw/qa/extras/rtfexport/data/numbering-font.rtf b/sw/qa/extras/rtfexport/data/numbering-font.rtf
new file mode 100644
index 000000000000..46fdb7ed4d1e
--- /dev/null
+++ b/sw/qa/extras/rtfexport/data/numbering-font.rtf
@@ -0,0 +1,22 @@
+{\rtf1\adeflang1025\ansi\ansicpg1252\uc1\deff0\deflang1033
+{\fonttbl
+{\f0\fbidi \froman\fcharset238\fprq2 Times New Roman;}
+{\f40\fbidi \fswiss\fcharset238\fprq2 Verdana;}
+}
+{\*\listtable
+{\list\listtemplateid645944990
+{\listlevel\levelnfc0\leveljc0
+\levelfollow0\levelstartat1
+{\leveltext\'02\'00.;}
+{\levelnumbers\'01;}
+\rtlch \af0\afs18 \ltrch \fs18 \fi-360\li720\lin720 }
+{\listname ;}
+\listid1421871093}
+}
+{\*\listoverridetable
+{\listoverride\listid1421871093\listoverridecount0\ls30}
+}
+\pard\plain Before.\par
+\pard\plain \ls30\f40\fs18 First line.\par
+\pard\plain After.\par
+}
diff --git a/sw/qa/extras/rtfexport/rtfexport.cxx b/sw/qa/extras/rtfexport/rtfexport.cxx
index bdcb26b56867..f0071cda9e07 100644
--- a/sw/qa/extras/rtfexport/rtfexport.cxx
+++ b/sw/qa/extras/rtfexport/rtfexport.cxx
@@ -691,6 +691,13 @@ DECLARE_RTFEXPORT_TEST(testAbi10076, "abi10076.odt")
// Just make sure that we don't crash after exporting a fully calculated layout.
}
+DECLARE_RTFEXPORT_TEST(testNumberingFont, "numbering-font.rtf")
+{
+ uno::Reference<beans::XPropertySet> xStyle(getStyles("CharacterStyles")->getByName("ListLabel 1"), uno::UNO_QUERY);
+ // This was Liberation Serif, i.e. custom font of the numbering itself ("1.\t") was lost on import.
+ CPPUNIT_ASSERT_EQUAL(OUString("Verdana"), getProperty<OUString>(xStyle, "CharFontName"));
+}
+
#endif
CPPUNIT_PLUGIN_IMPLEMENT();