diff options
| author | Tomaž Vajngerl <tomaz.vajngerl@collabora.co.uk> | 2023-06-08 01:36:27 +0900 |
|---|---|---|
| committer | Tomaž Vajngerl <quikee@gmail.com> | 2023-06-08 01:21:44 +0200 |
| commit | 5a2c6f4df7149f8c1f543f120fe19bd66abfc189 (patch) | |
| tree | 1441ce997c22e59b2f3ee7a9165e1118cc78a09b /svx/sdi | |
| parent | e995fc61cef8fad6076212a0d7e8e357e5db1793 (diff) | |
tdf#155404 handle ComplexColor as JSON for XLineColor and XFillColor
This adds support for MID_COMPLEX_COLOR_JSON attribute for
XLineColorItem and XFillColorItem, which makes it possible to set
a theme colors from the UI also for fills and lines.
In addition this resolved the issue tdf#155404 which had the effect
that unsupported "Color" attribute for the UNO call resulted that
the dialog was opened. This is now not the case anymore as the
"Color" argument for XLineColorItem and XFillColorItem was added
in addition to "ComplexColorJSON" argument.
Change-Id: I8876942b07aba453cbe1422b76a1608c78e42109
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/152713
Tested-by: Jenkins
Reviewed-by: Tomaž Vajngerl <quikee@gmail.com>
Diffstat (limited to 'svx/sdi')
| -rw-r--r-- | svx/sdi/xoitems.sdi | 16 |
1 files changed, 14 insertions, 2 deletions
diff --git a/svx/sdi/xoitems.sdi b/svx/sdi/xoitems.sdi index 015ead6e0d72..50db129a6434 100644 --- a/svx/sdi/xoitems.sdi +++ b/svx/sdi/xoitems.sdi @@ -24,7 +24,13 @@ struct XFillBitmap }; item XFillBitmap XFillBitmapItem; -item INT32 XFillColorItem; // XColorItem +struct XFillColor +{ + INT32 Color MID_COLOR_RGB; + String ComplexColorJSON MID_COMPLEX_COLOR_JSON; +}; + +item XFillColor XFillColorItem; // XColorItem enum SvxGradientStyle { @@ -84,7 +90,13 @@ item SvxFillStyle XFillStyleItem; //item String XLineAttrSetItem; SfxSetItem! -item INT32 XLineColorItem; +struct XLineColor +{ + INT32 Color MID_COLOR_RGB; + String ComplexColorJSON MID_COMPLEX_COLOR_JSON; +}; + +item XLineColor XLineColorItem; enum SvxDashStyle { |