diff options
| author | Regina Henschel <rb.henschel@t-online.de> | 2022-04-15 15:04:16 +0200 |
|---|---|---|
| committer | Andras Timar <andras.timar@collabora.com> | 2022-04-19 13:23:15 +0200 |
| commit | 9d0a4e213c6c6201f141316d1e7b76143729f6ce (patch) | |
| tree | 774ca660af1ed6cf2e36823b767f51cbe6d71d1f /oox | |
| parent | b998b8dbb4894c33441051c06a47a27388cfc758 (diff) | |
tdf#109169 use custGeom for Octagon Bevel shape
The shapes 'Octagon Bevel', type col_60da8460, and 'Diamond Bevel',
type col-502ad400, are LO specific preset shapes. They have neither a
counterpart in MS binary nor in OOXML. So they need to be exported
with custGeom. To force custGeom these shape types are moved from
vDenylist to vAllowlist.
These shapes were exported as prst='rect' before.
Change-Id: I9619345812b6dba8f14ec2cc6a92ae808a56b595
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/133069
Tested-by: Jenkins
Reviewed-by: Regina Henschel <rb.henschel@t-online.de>
Signed-off-by: Xisco Fauli <xiscofauli@libreoffice.org>
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/133113
Diffstat (limited to 'oox')
| -rw-r--r-- | oox/source/export/shapes.cxx | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/oox/source/export/shapes.cxx b/oox/source/export/shapes.cxx index 97d09ca1be2e..5f0f04bf6bda 100644 --- a/oox/source/export/shapes.cxx +++ b/oox/source/export/shapes.cxx @@ -551,8 +551,6 @@ static bool lcl_IsOnDenylist(OUString const & rShapeType) u"flower", u"bracket-pair", u"brace-pair", - u"col-60da8460", - u"col-502ad400", u"quad-bevel", u"round-rectangular-callout", u"rectangular-callout", @@ -605,7 +603,9 @@ static bool lcl_IsOnAllowlist(OUString const & rShapeType) { static const std::initializer_list<std::u16string_view> vAllowlist = { u"heart", - u"puzzle" + u"puzzle", + u"col-60da8460", + u"col-502ad400" }; return std::find(vAllowlist.begin(), vAllowlist.end(), rShapeType) != vAllowlist.end(); |