diff options
author | Miklos Vajna <vmiklos@collabora.com> | 2019-09-24 17:04:21 +0200 |
---|---|---|
committer | Miklos Vajna <vmiklos@collabora.com> | 2019-09-24 18:45:40 +0200 |
commit | a5698f1a0fb8bf8775f1a098ae9ee09de968d632 (patch) | |
tree | f9577d72b0e91bb7bf63c2d05ea4e24937db7411 /sw | |
parent | 75923e132479b64320f78c6913e5d7241c69ad26 (diff) |
Related: tdf#124600 sw anchored object allow overlap: add ODT filter
Expose the AllowOverlap shape property as <style:graphic-properties
loext:allow-overlap="..."/>.
Change-Id: I6b6e08c67224ac7d4fb87046ea8accf94cdb583f
Reviewed-on: https://gerrit.libreoffice.org/79462
Reviewed-by: Miklos Vajna <vmiklos@collabora.com>
Tested-by: Jenkins
Diffstat (limited to 'sw')
-rw-r--r-- | sw/qa/extras/odfexport/data/allow-overlap.odt | bin | 0 -> 9853 bytes | |||
-rw-r--r-- | sw/qa/extras/odfexport/odfexport.cxx | 11 |
2 files changed, 11 insertions, 0 deletions
diff --git a/sw/qa/extras/odfexport/data/allow-overlap.odt b/sw/qa/extras/odfexport/data/allow-overlap.odt Binary files differnew file mode 100644 index 000000000000..b23f5b360b85 --- /dev/null +++ b/sw/qa/extras/odfexport/data/allow-overlap.odt diff --git a/sw/qa/extras/odfexport/odfexport.cxx b/sw/qa/extras/odfexport/odfexport.cxx index 3d4d0e245451..93f38ca440c1 100644 --- a/sw/qa/extras/odfexport/odfexport.cxx +++ b/sw/qa/extras/odfexport/odfexport.cxx @@ -2093,6 +2093,17 @@ DECLARE_ODFEXPORT_TEST(testRubyPosition, "ruby-position.odt") } } +DECLARE_ODFEXPORT_TEST(testAllowOverlap, "allow-overlap.odt") +{ + uno::Reference<drawing::XShape> xShape = getShape(1); + // Without the accompanying fix in place, this test would have failed with: + // - Expression: !getProperty<bool>(xShape, "AllowOverlap") + // i.e. the custom AllowOverlap=false shape property was lost on import/export. + CPPUNIT_ASSERT(!getProperty<bool>(xShape, "AllowOverlap")); + xShape = getShape(2); + CPPUNIT_ASSERT(!getProperty<bool>(xShape, "AllowOverlap")); +} + DECLARE_ODFEXPORT_TEST(testSignatureLineProperties, "signatureline-properties.fodt") { uno::Reference<drawing::XShape> xShape = getShape(1); |