summaryrefslogtreecommitdiff
path: root/svx
diff options
context:
space:
mode:
authorTomaž Vajngerl <tomaz.vajngerl@collabora.co.uk>2023-08-18 22:31:51 +0200
committerTomaž Vajngerl <quikee@gmail.com>2023-08-28 18:09:50 +0200
commit43fe1db03512bccd0c36b7037172378c8965fda0 (patch)
tree7af2aaf909c5f9fe6a7032b547b7eb5d1f1ec4da /svx
parenta0001a031ebb8a4c57b5c4591482cdd946a5a20d (diff)
svx: remove theme related parameters for Color and FillColor
For SvxColorItem, XFillColorItem, XLineColorItem,... we set the ComplexColor via the JSON additional UNO Command argument, so we don't need the parameters to set the theme color and LumOff and LumMod color modifiers for the UNO Command. Actually this has broken the setting the colors in certain situations, so we must remove this. Change-Id: Ic28aa1e43559d3627703d93c7c1bd9310a149986 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/155864 Tested-by: Jenkins Reviewed-by: Tomaž Vajngerl <quikee@gmail.com> (cherry picked from commit 6471181b66ebe634e9ffbdc2b55dbf1da17a3acf) Reviewed-on: https://gerrit.libreoffice.org/c/core/+/156172 Tested-by: Jenkins CollaboraOffice <jenkinscollaboraoffice@gmail.com> Reviewed-by: Ashod Nakashian <ash@collabora.com>
Diffstat (limited to 'svx')
-rw-r--r--svx/sdi/svx.sdi4
1 files changed, 2 insertions, 2 deletions
diff --git a/svx/sdi/svx.sdi b/svx/sdi/svx.sdi
index 0b8ad75c00c5..2614660495e7 100644
--- a/svx/sdi/svx.sdi
+++ b/svx/sdi/svx.sdi
@@ -1506,7 +1506,7 @@ SfxVoidItem ClearOutline SID_OUTLINE_DELETEALL
SvxColorItem Color SID_ATTR_CHAR_COLOR
-(SfxStringItem Color SID_ATTR_COLOR_STR, SvxColorItem Color SID_ATTR_CHAR_COLOR, SfxInt16Item ColorThemeIndex SID_ATTR_COLOR_THEME_INDEX, SfxInt16Item ColorLumMod SID_ATTR_COLOR_LUM_MOD, SfxInt16Item ColorLumOff SID_ATTR_COLOR_LUM_OFF)
+(SfxStringItem Color SID_ATTR_COLOR_STR, SvxColorItem Color SID_ATTR_CHAR_COLOR)
[
AutoUpdate = TRUE,
FastCall = FALSE,
@@ -2798,7 +2798,7 @@ XFillBitmapItem FillPageBitmap SID_ATTR_PAGE_BITMAP
]
XFillColorItem FillColor SID_ATTR_FILL_COLOR
-(SfxStringItem Color SID_ATTR_COLOR_STR, XFillColorItem FillColor SID_ATTR_FILL_COLOR, SfxInt16Item ColorThemeIndex SID_ATTR_COLOR_THEME_INDEX, SfxInt16Item ColorLumMod SID_ATTR_COLOR_LUM_MOD, SfxInt16Item ColorLumOff SID_ATTR_COLOR_LUM_OFF)
+(SfxStringItem Color SID_ATTR_COLOR_STR, XFillColorItem FillColor SID_ATTR_FILL_COLOR)
[
AutoUpdate = TRUE,
FastCall = FALSE,