summaryrefslogtreecommitdiff
path: root/sw
diff options
context:
space:
mode:
authorSzymon Kłos <szymon.klos@collabora.com>2017-05-31 00:03:06 +0200
committerMiklos Vajna <vmiklos@collabora.co.uk>2017-06-08 09:22:19 +0200
commitf6f52c526cda640dd7595abd45727cb615c2b167 (patch)
tree345ba8f5105add1f0bf7d275a18d1be415168c55 /sw
parentd72d2a7c981066b795bb7679583b8b6665597c2c (diff)
Watermark: VML export/import font size
Change-Id: I11409dfc621018a761c70a640938e18ae679d3f5 Reviewed-on: https://gerrit.libreoffice.org/38254 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/watermark-font.docxbin10705 -> 18824 bytes
-rw-r--r--sw/qa/extras/ooxmlexport/ooxmlexport2.cxx5
2 files changed, 5 insertions, 0 deletions
diff --git a/sw/qa/extras/ooxmlexport/data/watermark-font.docx b/sw/qa/extras/ooxmlexport/data/watermark-font.docx
index 82d7ec8a83fc..5a09dc9f788d 100644
--- a/sw/qa/extras/ooxmlexport/data/watermark-font.docx
+++ b/sw/qa/extras/ooxmlexport/data/watermark-font.docx
Binary files differ
diff --git a/sw/qa/extras/ooxmlexport/ooxmlexport2.cxx b/sw/qa/extras/ooxmlexport/ooxmlexport2.cxx
index d4fa7a410701..3b5e7a11d996 100644
--- a/sw/qa/extras/ooxmlexport/ooxmlexport2.cxx
+++ b/sw/qa/extras/ooxmlexport/ooxmlexport2.cxx
@@ -698,10 +698,15 @@ DECLARE_OOXMLEXPORT_TEST(testWatermarkFont, "watermark-font.docx")
uno::Reference<beans::XPropertySet> xPropertySet(xShape, uno::UNO_QUERY);
OUString aFont;
+ float nFontSize;
// Check font family
CPPUNIT_ASSERT(xPropertySet->getPropertyValue("CharFontName") >>= aFont);
CPPUNIT_ASSERT_EQUAL(OUString("DejaVu Serif"), aFont);
+
+ // Check font size
+ CPPUNIT_ASSERT(xPropertySet->getPropertyValue("CharHeight") >>= nFontSize);
+ CPPUNIT_ASSERT_EQUAL((float)72, nFontSize);
}
DECLARE_OOXMLEXPORT_TEST(testFdo43093, "fdo43093.docx")