diff options
| author | Szymon Kłos <szymon.klos@collabora.com> | 2017-08-21 16:06:43 +0200 |
|---|---|---|
| committer | Tamás Zolnai <tamas.zolnai@collabora.com> | 2017-08-23 17:53:40 +0200 |
| commit | 87f1f7fdb34fe452ac540524224e1e808ce5d3a2 (patch) | |
| tree | 35aa6700d95e2c298602b8fb8b5a328942ce6fd9 /sw/qa | |
| parent | 511ae02c6457e69cb6daab871acd9c3e7d64e2e3 (diff) | |
VML, Watermark: detect shapetype from other subdocuments
In some documents Watermark wasn't visible
because shapetype wasn't detected.
It was impossible to use shapetype defined in header1.xml
in shape placed in the header2.xml.
Change-Id: Ib406c8fc702968684ad46efd0857b768af2820f5
Reviewed-on: https://gerrit.libreoffice.org/41395
Reviewed-by: Tamás Zolnai <tamas.zolnai@collabora.com>
Tested-by: Tamás Zolnai <tamas.zolnai@collabora.com>
Diffstat (limited to 'sw/qa')
| -rwxr-xr-x | sw/qa/extras/ooxmlexport/data/watermark-shapetype.docx | bin | 0 -> 17830 bytes | |||
| -rw-r--r-- | sw/qa/extras/ooxmlexport/ooxmlexport9.cxx | 13 |
2 files changed, 13 insertions, 0 deletions
diff --git a/sw/qa/extras/ooxmlexport/data/watermark-shapetype.docx b/sw/qa/extras/ooxmlexport/data/watermark-shapetype.docx Binary files differnew file mode 100755 index 000000000000..423f3cf7184f --- /dev/null +++ b/sw/qa/extras/ooxmlexport/data/watermark-shapetype.docx diff --git a/sw/qa/extras/ooxmlexport/ooxmlexport9.cxx b/sw/qa/extras/ooxmlexport/ooxmlexport9.cxx index f9cb088d5068..0fac9847dd6e 100644 --- a/sw/qa/extras/ooxmlexport/ooxmlexport9.cxx +++ b/sw/qa/extras/ooxmlexport/ooxmlexport9.cxx @@ -946,6 +946,19 @@ DECLARE_OOXMLEXPORT_TEST(testTdf111964, "tdf111964.docx") assertXPathContent(pXmlDoc, "/w:document/w:body/w:p/w:r[4]/w:t", sWSReference); } +DECLARE_OOXMLEXPORT_TEST(testWatermark, "watermark-shapetype.docx") +{ + uno::Reference<drawing::XShape> xShape1(getShape(1), uno::UNO_QUERY); + uno::Reference<beans::XPropertySet> xPropertySet1(xShape1, uno::UNO_QUERY); + xShape1.is(); + + uno::Reference<drawing::XShape> xShape2(getShape(2), uno::UNO_QUERY); + uno::Reference<beans::XPropertySet> xPropertySet2(xShape2, uno::UNO_QUERY); + xShape2.is(); + + CPPUNIT_ASSERT_EQUAL(xPropertySet1->getPropertyValue("TextAutoGrowHeight"), xPropertySet2->getPropertyValue("TextAutoGrowHeight")); +} + CPPUNIT_PLUGIN_IMPLEMENT(); /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ |