sd/qa/unit/uiimpress.cxx | 2 +-
svx/sdi/svx.sdi | 16 ++++++++--------
sw/sdi/swriter.sdi | 4 ++--
3 files changed, 11 insertions(+), 11 deletions(-)
New commits:
commit cc4ead451cb3b6ce6994370b3a9263756ea284d1
Author: Caolán McNamara <caol...@redhat.com>
AuthorDate: Thu Dec 29 19:37:57 2022 +0000
Commit: Caolán McNamara <caol...@redhat.com>
CommitDate: Mon Jan 2 19:04:31 2023 +0000
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 <caol...@redhat.com>
diff --git a/sd/qa/unit/uiimpress.cxx b/sd/qa/unit/uiimpress.cxx
index 13f072cf2488..0235cada8194 100644
--- a/sd/qa/unit/uiimpress.cxx
+++ b/sd/qa/unit/uiimpress.cxx
@@ -757,7 +757,7 @@ CPPUNIT_TEST_FIXTURE(SdUiImpressTest, testPageFillColor)
// Set FillPageColor
uno::Sequence<beans::PropertyValue>
aPropertyValues(comphelper::InitPropertySequence({
- { "Color", uno::Any(OUString("ff0000")) },
+ { "ColorString", uno::Any(OUString("ff0000")) },
}));
dispatchCommand(mxComponent, ".uno:FillPageColor", aPropertyValues);
diff --git a/svx/sdi/svx.sdi b/svx/sdi/svx.sdi
index d1f02f5b1d3b..f2e040712566 100644
--- a/svx/sdi/svx.sdi
+++ b/svx/sdi/svx.sdi
@@ -408,7 +408,7 @@ SfxVoidItem TableDesign SID_TABLEDESIGN
]
SvxColorItem BackgroundColor SID_BACKGROUND_COLOR
-(SfxStringItem Color SID_ATTR_COLOR_STR, SvxColorItem BackgroundColor
SID_BACKGROUND_COLOR)
+(SfxStringItem ColorString SID_ATTR_COLOR_STR, SvxColorItem BackgroundColor
SID_BACKGROUND_COLOR)
[
AutoUpdate = TRUE,
@@ -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 ColorString 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)
[
AutoUpdate = TRUE,
FastCall = FALSE,
@@ -1524,7 +1524,7 @@ SvxColorItem Color SID_ATTR_CHAR_COLOR
]
SvxColorItem CharBackColor SID_ATTR_CHAR_BACK_COLOR
-(SfxStringItem Color SID_ATTR_COLOR_STR, SvxColorItem CharBackColor
SID_ATTR_CHAR_BACK_COLOR)
+(SfxStringItem ColorString SID_ATTR_COLOR_STR, SvxColorItem CharBackColor
SID_ATTR_CHAR_BACK_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 ColorString 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)
[
AutoUpdate = TRUE,
FastCall = FALSE,
@@ -2816,7 +2816,7 @@ XFillColorItem FillColor SID_ATTR_FILL_COLOR
]
XFillColorItem FillPageColor SID_ATTR_PAGE_COLOR
-(SfxStringItem Color SID_ATTR_COLOR_STR)
+(SfxStringItem ColorString SID_ATTR_COLOR_STR)
[
/* flags: */
AutoUpdate = TRUE,
@@ -5677,7 +5677,7 @@ SfxVoidItem ArrowsToolbox SID_DRAWTBX_ARROWS
]
SvxColorItem FrameLineColor SID_FRAME_LINECOLOR
-(SfxStringItem Color SID_ATTR_COLOR_STR, SvxColorItem FrameLineColor
SID_FRAME_LINECOLOR)
+(SfxStringItem ColorString SID_ATTR_COLOR_STR, SvxColorItem FrameLineColor
SID_FRAME_LINECOLOR)
[
AutoUpdate = TRUE,
FastCall = FALSE,
@@ -7874,7 +7874,7 @@ SdrOnOffItem FillShadow SID_ATTR_FILL_SHADOW
]
XColorItem FillShadowColor SID_ATTR_SHADOW_COLOR
-(SfxStringItem Color SID_ATTR_COLOR_STR)
+(SfxStringItem ColorString SID_ATTR_COLOR_STR)
[
AutoUpdate = TRUE,
@@ -9118,7 +9118,7 @@ SvxWordLineModeItem WordMode SID_ATTR_CHAR_WORDLINEMODE
XLineColorItem XLineColor SID_ATTR_LINE_COLOR
-(SfxStringItem Color SID_ATTR_COLOR_STR, XLineColorItem XLineColor
SID_ATTR_LINE_COLOR)
+(SfxStringItem ColorString SID_ATTR_COLOR_STR, XLineColorItem XLineColor
SID_ATTR_LINE_COLOR)
[
AutoUpdate = TRUE,
FastCall = FALSE,
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,
