diff options
| author | Caolán McNamara <caolanm@redhat.com> | 2022-12-29 19:37:57 +0000 |
|---|---|---|
| committer | Caolán McNamara <caolanm@redhat.com> | 2023-01-02 19:04:31 +0000 |
| commit | cc4ead451cb3b6ce6994370b3a9263756ea284d1 (patch) | |
| tree | 9cb001da4f62d1a2a5db6d56c726990864f9f8a9 /sw/sdi | |
| parent | a178a2ac6df8dc63a7ab8d4a19b90ae8a17baca4 (diff) | |
Resolves: tdf#150339 two arguments called "Color"
from around:
commit 780d83771af89e6b27b3618d9c033c3fb29ba803
Date: Mon Nov 4 17:17:58 2019 +0100
jsdialogs: .uno:Color with string argument
and:
commit 1144712bb99cfb699e73b473ee44351c50a35613
Date: Mon Oct 28 10:19:50 2019 +0100
jsdialogs: make possible to set .uno:BackgroundColor in Writer
SvxColorItem Color SID_ATTR_CHAR_COLOR
(SfxStringItem Color SID_ATTR_COLOR_STR, SvxColorItem Color SID_ATTR_CHAR_COLOR,...
^^^^^ ^^^^^
rename the most recently added to "ColorString"
Change-Id: I9e00be60c768af124be7df800df4b26df83b5267
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/144866
Tested-by: Jenkins
Reviewed-by: Caolán McNamara <caolanm@redhat.com>
Diffstat (limited to 'sw/sdi')
| -rw-r--r-- | sw/sdi/swriter.sdi | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/sw/sdi/swriter.sdi b/sw/sdi/swriter.sdi index 6da22965af0b..e14b52cba879 100644 --- a/sw/sdi/swriter.sdi +++ b/sw/sdi/swriter.sdi @@ -378,7 +378,7 @@ SfxVoidItem AutoSum FN_TABLE_AUTOSUM ] SvxColorItem BackColor SID_ATTR_CHAR_COLOR_BACKGROUND // deprecated - use CHAR_BACK_COLOR -(SfxStringItem Color SID_ATTR_COLOR_STR, SvxColorItem BackColor SID_ATTR_CHAR_COLOR_BACKGROUND) +(SfxStringItem ColorString SID_ATTR_COLOR_STR, SvxColorItem BackColor SID_ATTR_CHAR_COLOR_BACKGROUND) [ AutoUpdate = TRUE, @@ -1281,7 +1281,7 @@ SfxBoolItem Fields FN_VIEW_FIELDS ] SvxColorItem FontColor SID_ATTR_CHAR_COLOR2 -(SfxStringItem Color SID_ATTR_COLOR_STR, SvxColorItem FontColor SID_ATTR_CHAR_COLOR2) +(SfxStringItem ColorString SID_ATTR_COLOR_STR, SvxColorItem FontColor SID_ATTR_CHAR_COLOR2) [ AutoUpdate = TRUE, |