diff options
| author | Szymon Kłos <szymon.klos@collabora.com> | 2017-05-31 00:03:06 +0200 |
|---|---|---|
| committer | Szymon Kłos <szymon.klos@collabora.com> | 2017-06-10 20:02:52 +0200 |
| commit | e3426d9a628fe3ba1cd2cb3d765c3199f9db4de7 (patch) | |
| tree | 3c71d4873f95010bf600f3a6b62cd0a917fb0cf0 /sw | |
| parent | fdc9bdb8a7b4e432022079b593023b0e28746cae (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.docx | bin | 10705 -> 18824 bytes | |||
| -rw-r--r-- | sw/qa/extras/ooxmlexport/ooxmlexport2.cxx | 5 |
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 Binary files differindex 82d7ec8a83fc..5a09dc9f788d 100644 --- a/sw/qa/extras/ooxmlexport/data/watermark-font.docx +++ b/sw/qa/extras/ooxmlexport/data/watermark-font.docx diff --git a/sw/qa/extras/ooxmlexport/ooxmlexport2.cxx b/sw/qa/extras/ooxmlexport/ooxmlexport2.cxx index 636dd76643e6..db99b277daf4 100644 --- a/sw/qa/extras/ooxmlexport/ooxmlexport2.cxx +++ b/sw/qa/extras/ooxmlexport/ooxmlexport2.cxx @@ -734,10 +734,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") |