From f8c7a2284b88c149addc8a30abb0cad8a10dad77 Mon Sep 17 00:00:00 2001 From: Miklos Vajna Date: Fri, 20 Sep 2019 11:55:21 +0200 Subject: Related: tdf#124600 sw anchored object allow overlap: add DOCX filter Which also made it necessary to support allow-overlap=no for not only shapes, but for shapes-with-text in the layout. Change-Id: Ibd229d21995c0a1053db6bbab0a6ccbbf75f36d3 Reviewed-on: https://gerrit.libreoffice.org/79277 Reviewed-by: Miklos Vajna Tested-by: Jenkins --- sw/inc/fmtwrapinfluenceonobjpos.hxx | 5 +++++ 1 file changed, 5 insertions(+) (limited to 'sw/inc') diff --git a/sw/inc/fmtwrapinfluenceonobjpos.hxx b/sw/inc/fmtwrapinfluenceonobjpos.hxx index 8e56be1ed653..897e825b14ff 100644 --- a/sw/inc/fmtwrapinfluenceonobjpos.hxx +++ b/sw/inc/fmtwrapinfluenceonobjpos.hxx @@ -21,6 +21,7 @@ #include "hintids.hxx" #include "format.hxx" +#include "swtypes.hxx" #include #include @@ -30,6 +31,8 @@ private: sal_Int16 mnWrapInfluenceOnPosition; /// Allow objects to overlap, permitted by default. bool mbAllowOverlap = true; + /// Vertical offset added during positioning to avoid an overlap. + SwTwips mnOverlapVertOffset = 0; public: @@ -59,6 +62,8 @@ public: void SetAllowOverlap(bool bAllowOverlap); bool GetAllowOverlap() const; + void SetOverlapVertOffset(SwTwips nOverlapVertOffset); + SwTwips GetOverlapVertOffset() const; void dumpAsXml(xmlTextWriterPtr pWriter) const override; }; -- cgit