diff options
| author | Miklos Vajna <vmiklos@collabora.com> | 2019-09-19 10:58:59 +0200 |
|---|---|---|
| committer | Miklos Vajna <vmiklos@collabora.com> | 2019-09-19 13:41:50 +0200 |
| commit | ab825c665c1ee509769bdaf0ae95fc111a357fc6 (patch) | |
| tree | dc27a2a066bcc93c878088f25da10eb01a27416c /sw/inc | |
| parent | 34daa253f323cb8b80d6d10a8cdac85e2fa9378d (diff) | |
Related: tdf#124600 sw anchored object allow overlap: add UNO API
And fix the pool item's operator==() that forgot to take allow-overlap
into account.
Change-Id: I34ec29eed95d821cfccebbb15675e0f576b6454d
Reviewed-on: https://gerrit.libreoffice.org/79115
Reviewed-by: Miklos Vajna <vmiklos@collabora.com>
Tested-by: Jenkins
Diffstat (limited to 'sw/inc')
| -rw-r--r-- | sw/inc/unomid.h | 1 | ||||
| -rw-r--r-- | sw/inc/unoprnms.hxx | 1 |
2 files changed, 2 insertions, 0 deletions
diff --git a/sw/inc/unomid.h b/sw/inc/unomid.h index 06e84c99acb1..0a312a70624a 100644 --- a/sw/inc/unomid.h +++ b/sw/inc/unomid.h @@ -146,6 +146,7 @@ // SwFormatWrapInfluenceOnObjPos #define MID_WRAP_INFLUENCE 0 +#define MID_ALLOW_OVERLAP 1 // SwFormatFollowTextFlow #define MID_FOLLOW_TEXT_FLOW 0 diff --git a/sw/inc/unoprnms.hxx b/sw/inc/unoprnms.hxx index 69fadbe60c5f..a6246f9d2d36 100644 --- a/sw/inc/unoprnms.hxx +++ b/sw/inc/unoprnms.hxx @@ -869,6 +869,7 @@ #define UNO_NAME_TABLE_LAST_ROW_START_COLUMN "LastRowStartColumn" #define UNO_NAME_RESOLVED "Resolved" +#define UNO_NAME_ALLOW_OVERLAP "AllowOverlap" #endif /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ |