summaryrefslogtreecommitdiff
path: root/sw/qa
diff options
context:
space:
mode:
authorSzymon Kłos <szymon.klos@collabora.com>2017-12-08 19:31:02 +0100
committerSzymon Kłos <szymon.klos@collabora.com>2017-12-09 11:57:58 +0100
commit521d92b39b64f503876ca194d009b29f7188cc87 (patch)
treee2811f16560da1af313f48fed62fe5bbf895a747 /sw/qa
parentd4a54ec92674773bc0f9358a3d9090915a3c8fb0 (diff)
tdf#114308 DOC import correctly watermark without padding
Change-Id: If44eb4d1354386f66c697206db9ab4d7f2be374d Reviewed-on: https://gerrit.libreoffice.org/46110 Tested-by: Jenkins <ci@libreoffice.org> Reviewed-by: Szymon Kłos <szymon.klos@collabora.com>
Diffstat (limited to 'sw/qa')
-rwxr-xr-xsw/qa/extras/ww8export/data/tdf114308.docbin0 -> 27136 bytes
-rw-r--r--sw/qa/extras/ww8export/ww8export2.cxx8
2 files changed, 8 insertions, 0 deletions
diff --git a/sw/qa/extras/ww8export/data/tdf114308.doc b/sw/qa/extras/ww8export/data/tdf114308.doc
new file mode 100755
index 000000000000..36e6c7ec6999
--- /dev/null
+++ b/sw/qa/extras/ww8export/data/tdf114308.doc
Binary files differ
diff --git a/sw/qa/extras/ww8export/ww8export2.cxx b/sw/qa/extras/ww8export/ww8export2.cxx
index 480511334c76..0695c309951b 100644
--- a/sw/qa/extras/ww8export/ww8export2.cxx
+++ b/sw/qa/extras/ww8export/ww8export2.cxx
@@ -274,6 +274,14 @@ DECLARE_WW8EXPORT_TEST(testTdf91687, "tdf91687.doc")
CPPUNIT_ASSERT_EQUAL((sal_Int32)18105, xWatermark->getSize().Width);
}
+DECLARE_WW8EXPORT_TEST(testTdf114308, "tdf114308.doc")
+{
+ // Watermark with no additional padding
+ uno::Reference<drawing::XShape> xWatermark = getShape(1);
+
+ CPPUNIT_ASSERT_EQUAL((sal_Int32)8729, xWatermark->getSize().Height);
+}
+
DECLARE_WW8EXPORT_TEST(testTdf111480, "tdf111480.doc")
{
// Circular text was imported horizontally