summaryrefslogtreecommitdiff
path: root/sw
diff options
context:
space:
mode:
authorJustin Luth <justin_luth@sil.org>2017-05-22 16:42:35 +0300
committerMiklos Vajna <vmiklos@collabora.co.uk>2017-05-29 09:39:44 +0200
commite8714e3451282218e34d2ded472c9a5a44bd0bd2 (patch)
treea5d43c86dabc8815b0dca529d84e5a72da0732e8 /sw
parent5e49021b8ed260b97789e40c1e85eb61b3d5e1ed (diff)
related tdf#82173 writerfilter: ignore case when mapping style name
Depends on unit test modifications in commits 71229da3cb05fc8f3e94fe6a6a5d9ad43cdf8702 a9118665637dafddd41ca549d0f73948cf1d332c One known effect is that Word's "footnote reference" formatting in docx will now affect Writer's "Footnote anchor". Change-Id: I84f21dcff86f727869a49fa4b53727c24337f63f Reviewed-on: https://gerrit.libreoffice.org/37936 Reviewed-by: Justin Luth <justin_luth@sil.org> Tested-by: Jenkins <ci@libreoffice.org> Reviewed-by: Miklos Vajna <vmiklos@collabora.co.uk>
Diffstat (limited to 'sw')
-rw-r--r--sw/qa/extras/ooxmlexport/data/tdf82173_footnoteStyle.docxbin0 -> 14012 bytes
-rw-r--r--sw/qa/extras/ooxmlexport/ooxmlexport9.cxx7
2 files changed, 7 insertions, 0 deletions
diff --git a/sw/qa/extras/ooxmlexport/data/tdf82173_footnoteStyle.docx b/sw/qa/extras/ooxmlexport/data/tdf82173_footnoteStyle.docx
new file mode 100644
index 000000000000..4fa7b0a24d8d
--- /dev/null
+++ b/sw/qa/extras/ooxmlexport/data/tdf82173_footnoteStyle.docx
Binary files differ
diff --git a/sw/qa/extras/ooxmlexport/ooxmlexport9.cxx b/sw/qa/extras/ooxmlexport/ooxmlexport9.cxx
index 6ef5dd2db10b..038fb7a510bf 100644
--- a/sw/qa/extras/ooxmlexport/ooxmlexport9.cxx
+++ b/sw/qa/extras/ooxmlexport/ooxmlexport9.cxx
@@ -464,6 +464,13 @@ DECLARE_OOXMLEXPORT_TEST(testTdf99227, "tdf99227.docx")
assertXPath(pXmlDoc, "//w:footnote/w:p/w:r/w:drawing", 1);
}
+DECLARE_OOXMLIMPORT_TEST(testTdf82173_footnoteStyle, "tdf82173_footnoteStyle.docx")
+{
+ uno::Reference<beans::XPropertySet> xPageStyle(getStyles("CharacterStyles")->getByName("Footnote anchor"), uno::UNO_QUERY);
+ CPPUNIT_ASSERT_EQUAL( sal_Int32(58), getProperty< sal_Int32 >(xPageStyle, "CharEscapementHeight") );
+ CPPUNIT_ASSERT_EQUAL( sal_Int32(0x00FF00), getProperty< sal_Int32 >(xPageStyle, "CharColor") );
+}
+
DECLARE_OOXMLEXPORT_TEST(testTdf104162, "tdf104162.docx")
{
// This crashed: the comment field contained a table with a <w:hideMark/>.