include/svx/tbcontrl.hxx | 2 -
officecfg/registry/data/org/openoffice/Office/UI/GenericCommands.xcu | 3 --
officecfg/registry/data/org/openoffice/Office/UI/WriterCommands.xcu | 3 ++
svx/source/sidebar/text/TextPropertyPanel.cxx | 2 -
svx/source/tbxctrls/tbcontrl.cxx | 3 +-
svx/uiconfig/ui/sidebartextpanel.ui | 11
----------
sw/sdi/_textsh.sdi | 8
++++++-
sw/sdi/swriter.sdi | 2 -
sw/source/uibase/docvw/edtwin.cxx | 1
sw/source/uibase/shells/textsh1.cxx | 9
++++++--
sw/source/uibase/uiview/view.cxx | 1
sw/uiconfig/sglobal/toolbar/textobjectbar.xml | 2 -
sw/uiconfig/sglobal/toolbar/textstylebar.xml | 2 -
sw/uiconfig/sweb/toolbar/textobjectbar.xml | 2 -
sw/uiconfig/swform/toolbar/textobjectbar.xml | 2 -
sw/uiconfig/swreport/toolbar/textobjectbar.xml | 2 -
sw/uiconfig/swriter/toolbar/singlemode-table.xml | 2 -
sw/uiconfig/swriter/toolbar/singlemode-text.xml | 2 -
sw/uiconfig/swriter/toolbar/textobjectbar.xml | 2 -
sw/uiconfig/swriter/toolbar/textstylebar.xml | 2 -
sw/uiconfig/swriter/ui/notebookbar.ui | 2 -
sw/uiconfig/swriter/ui/notebookbar_compact.ui | 2 -
sw/uiconfig/swriter/ui/notebookbar_groupedbar_compact.ui | 4 +--
sw/uiconfig/swriter/ui/notebookbar_groupedbar_full.ui | 6
++---
sw/uiconfig/swriter/ui/notebookbar_groups.ui | 2 -
sw/uiconfig/swriter/ui/notebookbar_single.ui | 4 +--
sw/uiconfig/swxform/toolbar/textobjectbar.xml | 2 -
27 files changed, 44 insertions(+), 41 deletions(-)
New commits:
commit be3d34b5d6b97c3eb12ab3f84ce2da2ef965a928
Author: Justin Luth <jl...@mail.com>
AuthorDate: Thu Jul 21 13:56:30 2022 -0400
Commit: Justin Luth <jl...@mail.com>
CommitDate: Mon Dec 19 17:57:10 2022 +0000
[API CHANGE] tdf#85592: deprecate .uno:BackColor, use .uno:CharBackColor
EditEngine stuff uses CharBackColor, while SW used BackColor.
Deprecate the SW-only SID.
What does this do?
It allows the toolbar "Character Highlighting Color"
to work with both body text (previously BackColor)
and comment text(CharBackColor).
Otherwise, the toolbar item was disabled when moving into
a comment. (Shapes/Textboxes got their own formatting toolbar,
so those are unaffected.)
AFAIK, after this commit, SID_ATTR_CHAR_COLOR_BACKGROUND
should still work fine for API calls, or for customized toolbars.
That's why I didn't try to remove it completely - just deprecate.
Do I know what I am doing here?
No, although I'm fairly confident nontheless,
and I've had some good help from reviewers.
Change-Id: I0afcbdb1b91c872f6d47f3c82c573f3b9fea6dfc
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/137334
Tested-by: Jenkins
Reviewed-by: Justin Luth <jl...@mail.com>
diff --git a/include/svx/tbcontrl.hxx b/include/svx/tbcontrl.hxx
index ff7d558e40d3..72acf5845a4a 100644
--- a/include/svx/tbcontrl.hxx
+++ b/include/svx/tbcontrl.hxx
@@ -56,7 +56,7 @@
Execute-Id SID_ATTR_CHAR_COLOR
for character background color (writer)
- Execute-Id SID_ATTR_CHAR_COLOR_BACKGROUND
+ Execute-Id SID_ATTR_CHAR_BACK_COLOR
for paragraph background color (writer)
and cell background color (calc)
diff --git
a/officecfg/registry/data/org/openoffice/Office/UI/GenericCommands.xcu
b/officecfg/registry/data/org/openoffice/Office/UI/GenericCommands.xcu
index c355eb776ad3..665956439098 100644
--- a/officecfg/registry/data/org/openoffice/Office/UI/GenericCommands.xcu
+++ b/officecfg/registry/data/org/openoffice/Office/UI/GenericCommands.xcu
@@ -3333,9 +3333,6 @@ bit 3 (0x8): #define
UICOMMANDDESCRIPTION_PROPERTIES_TOGGLEBUTTON 8
<prop oor:name="Label" oor:type="xs:string">
<value xml:lang="en-US">Character Highlighting Color</value>
</prop>
- <prop oor:name="TooltipLabel" oor:type="xs:string">
- <value xml:lang="en-US">Character Highlighting Color (in Text Box
and Shapes)</value>
- </prop>
<prop oor:name="Properties" oor:type="xs:int">
<value>1</value>
</prop>
diff --git
a/officecfg/registry/data/org/openoffice/Office/UI/WriterCommands.xcu
b/officecfg/registry/data/org/openoffice/Office/UI/WriterCommands.xcu
index 8e4ab81fa16d..2e234e51ecb3 100644
--- a/officecfg/registry/data/org/openoffice/Office/UI/WriterCommands.xcu
+++ b/officecfg/registry/data/org/openoffice/Office/UI/WriterCommands.xcu
@@ -2829,6 +2829,9 @@
<prop oor:name="Label" oor:type="xs:string">
<value xml:lang="en-US">Character Highlighting Color</value>
</prop>
+ <prop oor:name="TooltipLabel" oor:type="xs:string">
+ <value xml:lang="en-US">Character Highlighting Color (deprecated -
use CharBackColor)</value>
+ </prop>
<prop oor:name="Properties" oor:type="xs:int">
<value>1</value>
</prop>
diff --git a/svx/source/sidebar/text/TextPropertyPanel.cxx
b/svx/source/sidebar/text/TextPropertyPanel.cxx
index 1b59a79aa6ed..d5bfc2a480df 100644
--- a/svx/source/sidebar/text/TextPropertyPanel.cxx
+++ b/svx/source/sidebar/text/TextPropertyPanel.cxx
@@ -145,7 +145,7 @@ void TextPropertyPanel::HandleContextChange (
mxToolBoxFontColor->set_visible(!bWriterText);
mxToolBoxFontColorSw->set_visible(bWriterText);
- mxToolBoxBackgroundColor->set_visible(bDrawText);
+ mxToolBoxBackgroundColor->set_visible(bWriterText || bDrawText);
mxResetBar->set_visible(bWriterText || bCalcText);
mxDefaultBar->set_visible(bDrawText);
}
diff --git a/svx/source/tbxctrls/tbcontrl.cxx b/svx/source/tbxctrls/tbcontrl.cxx
index b1f54a303e13..4563010ac053 100644
--- a/svx/source/tbxctrls/tbcontrl.cxx
+++ b/svx/source/tbxctrls/tbcontrl.cxx
@@ -3512,7 +3512,7 @@ sal_uInt16 MapCommandToSlotId(const OUString& rCommand)
return SID_ATTR_CHAR_COLOR;
else if (rCommand == ".uno:FontColor")
return SID_ATTR_CHAR_COLOR2;
- else if (rCommand == ".uno:BackColor")
+ else if (rCommand == ".uno:BackColor") // deprecated - use CharBackColor
return SID_ATTR_CHAR_COLOR_BACKGROUND;
else if (rCommand == ".uno:CharBackColor")
return SID_ATTR_CHAR_BACK_COLOR;
@@ -3580,6 +3580,7 @@ void SvxColorToolBoxControl::update()
addStatusListener( ".uno:CharColorExt");
break;
+ case SID_ATTR_CHAR_BACK_COLOR:
case SID_ATTR_CHAR_COLOR_BACKGROUND:
addStatusListener( ".uno:CharBackgroundExt");
break;
diff --git a/svx/uiconfig/ui/sidebartextpanel.ui
b/svx/uiconfig/ui/sidebartextpanel.ui
index c088b891e912..f0c31358c70c 100644
--- a/svx/uiconfig/ui/sidebartextpanel.ui
+++ b/svx/uiconfig/ui/sidebartextpanel.ui
@@ -183,17 +183,6 @@
<property name="homogeneous">False</property>
</packing>
</child>
- <child>
- <object class="GtkMenuToolButton" id=".uno:BackColor">
- <property name="visible">True</property>
- <property name="can-focus">False</property>
- <property name="use-underline">True</property>
- </object>
- <packing>
- <property name="expand">False</property>
- <property name="homogeneous">False</property>
- </packing>
- </child>
</object>
<packing>
<property name="expand">False</property>
diff --git a/sw/sdi/_textsh.sdi b/sw/sdi/_textsh.sdi
index 17eb4e9671f4..4537c6e96428 100644
--- a/sw/sdi/_textsh.sdi
+++ b/sw/sdi/_textsh.sdi
@@ -1411,7 +1411,13 @@ interface BaseText
StateMethod = GetTextFontCtrlState ;
DisableFlags="SfxDisableFlags::SwOnProtectedCursor";
]
- SID_ATTR_CHAR_COLOR_BACKGROUND // status()
+ SID_ATTR_CHAR_BACK_COLOR // status()
+ [
+ ExecMethod = Execute ;
+ StateMethod = GetState ;
+ DisableFlags="SfxDisableFlags::SwOnProtectedCursor";
+ ]
+ SID_ATTR_CHAR_COLOR_BACKGROUND // status() deprecated - use CHAR_BACK_COLOR
[
ExecMethod = Execute ;
StateMethod = GetState ;
diff --git a/sw/sdi/swriter.sdi b/sw/sdi/swriter.sdi
index 8cff1d26be35..55678973acd1 100644
--- a/sw/sdi/swriter.sdi
+++ b/sw/sdi/swriter.sdi
@@ -377,7 +377,7 @@ SfxVoidItem AutoSum FN_TABLE_AUTOSUM
GroupId = SfxGroupId::Table;
]
-SvxColorItem BackColor SID_ATTR_CHAR_COLOR_BACKGROUND
+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)
[
diff --git a/sw/source/uibase/docvw/edtwin.cxx
b/sw/source/uibase/docvw/edtwin.cxx
index a52f6a15dd1e..1d3a740126cd 100644
--- a/sw/source/uibase/docvw/edtwin.cxx
+++ b/sw/source/uibase/docvw/edtwin.cxx
@@ -5117,6 +5117,7 @@ void SwEditWin::MouseButtonUp(const MouseEvent& rMEvt)
case SID_ATTR_CHAR_COLOR_EXT:
nId = RES_CHRATR_COLOR;
break;
+ case SID_ATTR_CHAR_BACK_COLOR:
case SID_ATTR_CHAR_COLOR_BACKGROUND:
nId = RES_CHRATR_BACKGROUND;
break;
diff --git a/sw/source/uibase/shells/textsh1.cxx
b/sw/source/uibase/shells/textsh1.cxx
index eb60aaa839f6..3501ef777167 100644
--- a/sw/source/uibase/shells/textsh1.cxx
+++ b/sw/source/uibase/shells/textsh1.cxx
@@ -1376,7 +1376,8 @@ void SwTextShell::Execute(SfxRequest &rReq)
}
}
break;
- case SID_ATTR_CHAR_COLOR_BACKGROUND:
+ case SID_ATTR_CHAR_BACK_COLOR:
+ case SID_ATTR_CHAR_COLOR_BACKGROUND: // deprecated
case SID_ATTR_CHAR_COLOR_EXT:
{
Color aSet;
@@ -2016,6 +2017,7 @@ void SwTextShell::GetState( SfxItemSet &rSet )
rSet.Put( aColorItem.CloneSetWhich(SID_ATTR_CHAR_COLOR2) );
}
break;
+ case SID_ATTR_CHAR_BACK_COLOR:
case SID_ATTR_CHAR_COLOR_BACKGROUND:
{
// Always use the visible background
@@ -2037,7 +2039,10 @@ void SwTextShell::GetState( SfxItemSet &rSet )
{
SwEditWin& rEdtWin = GetView().GetEditWin();
SwApplyTemplate* pApply = rEdtWin.GetApplyTemplate();
- rSet.Put(SfxBoolItem(nWhich, pApply && pApply->nColor ==
SID_ATTR_CHAR_COLOR_BACKGROUND));
+ const sal_uInt32 nColWhich = pApply ? pApply->nColor : 0;
+ const bool bUseTemplate = nColWhich == SID_ATTR_CHAR_BACK_COLOR
+ || nColWhich ==
SID_ATTR_CHAR_COLOR_BACKGROUND;
+ rSet.Put(SfxBoolItem(nWhich, bUseTemplate));
}
break;
case SID_ATTR_CHAR_COLOR_EXT:
diff --git a/sw/source/uibase/uiview/view.cxx b/sw/source/uibase/uiview/view.cxx
index 8ed0e97301dc..89e58454f2c0 100644
--- a/sw/source/uibase/uiview/view.cxx
+++ b/sw/source/uibase/uiview/view.cxx
@@ -631,6 +631,7 @@ void SwView::CheckReadonlyState()
SID_ATTR_PARA_ADJUST_RIGHT,
SID_ATTR_PARA_ADJUST_CENTER,SID_ATTR_PARA_ADJUST_BLOCK,
SID_ATTR_PARA_LINESPACE_10, SID_ATTR_PARA_LINESPACE_15,
SID_ATTR_PARA_LINESPACE_20,
SID_ATTR_CHAR_FONT, SID_ATTR_CHAR_FONTHEIGHT,
SID_ATTR_CHAR_COLOR_BACKGROUND,
+ SID_ATTR_CHAR_BACK_COLOR,
SID_ATTR_CHAR_COLOR_BACKGROUND_EXT,
SID_ATTR_CHAR_COLOR_EXT,
SID_ATTR_CHAR_COLOR, SID_ATTR_CHAR_WEIGHT,
SID_ATTR_CHAR_POSTURE,
SID_ATTR_CHAR_OVERLINE,
diff --git a/sw/uiconfig/sglobal/toolbar/textobjectbar.xml
b/sw/uiconfig/sglobal/toolbar/textobjectbar.xml
index aac0785fd003..9c4c45fd682b 100644
--- a/sw/uiconfig/sglobal/toolbar/textobjectbar.xml
+++ b/sw/uiconfig/sglobal/toolbar/textobjectbar.xml
@@ -50,7 +50,7 @@
<toolbar:toolbaritem xlink:href=".uno:SmallCaps" toolbar:visible="false"/>
<toolbar:toolbarseparator/>
<toolbar:toolbaritem xlink:href=".uno:Color"/>
- <toolbar:toolbaritem xlink:href=".uno:BackColor"/>
+ <toolbar:toolbaritem xlink:href=".uno:CharBackColor"/>
<toolbar:toolbaritem xlink:href=".uno:BackgroundColor"
toolbar:visible="false"/>
<toolbar:toolbarseparator/>
<toolbar:toolbaritem xlink:href=".uno:LeftPara"/>
diff --git a/sw/uiconfig/sglobal/toolbar/textstylebar.xml
b/sw/uiconfig/sglobal/toolbar/textstylebar.xml
index f0b48b061e72..ce4093f0583e 100644
--- a/sw/uiconfig/sglobal/toolbar/textstylebar.xml
+++ b/sw/uiconfig/sglobal/toolbar/textstylebar.xml
@@ -66,7 +66,7 @@
<toolbar:toolbaritem xlink:href=".uno:SubScript" toolbar:visible="false"/>
<toolbar:toolbarseparator/>
<toolbar:toolbaritem xlink:href=".uno:FontColor"/>
- <toolbar:toolbaritem xlink:href=".uno:BackColor"/>
+ <toolbar:toolbaritem xlink:href=".uno:CharBackColor"/>
<toolbar:toolbarseparator/>
<toolbar:toolbaritem xlink:href=".uno:ResetAttributes"/>
<toolbar:toolbarseparator/>
diff --git a/sw/uiconfig/sweb/toolbar/textobjectbar.xml
b/sw/uiconfig/sweb/toolbar/textobjectbar.xml
index aac0785fd003..9c4c45fd682b 100644
--- a/sw/uiconfig/sweb/toolbar/textobjectbar.xml
+++ b/sw/uiconfig/sweb/toolbar/textobjectbar.xml
@@ -50,7 +50,7 @@
<toolbar:toolbaritem xlink:href=".uno:SmallCaps" toolbar:visible="false"/>
<toolbar:toolbarseparator/>
<toolbar:toolbaritem xlink:href=".uno:Color"/>
- <toolbar:toolbaritem xlink:href=".uno:BackColor"/>
+ <toolbar:toolbaritem xlink:href=".uno:CharBackColor"/>
<toolbar:toolbaritem xlink:href=".uno:BackgroundColor"
toolbar:visible="false"/>
<toolbar:toolbarseparator/>
<toolbar:toolbaritem xlink:href=".uno:LeftPara"/>
diff --git a/sw/uiconfig/swform/toolbar/textobjectbar.xml
b/sw/uiconfig/swform/toolbar/textobjectbar.xml
index aac0785fd003..9c4c45fd682b 100644
--- a/sw/uiconfig/swform/toolbar/textobjectbar.xml
+++ b/sw/uiconfig/swform/toolbar/textobjectbar.xml
@@ -50,7 +50,7 @@
<toolbar:toolbaritem xlink:href=".uno:SmallCaps" toolbar:visible="false"/>
<toolbar:toolbarseparator/>
<toolbar:toolbaritem xlink:href=".uno:Color"/>
- <toolbar:toolbaritem xlink:href=".uno:BackColor"/>
+ <toolbar:toolbaritem xlink:href=".uno:CharBackColor"/>
<toolbar:toolbaritem xlink:href=".uno:BackgroundColor"
toolbar:visible="false"/>
<toolbar:toolbarseparator/>
<toolbar:toolbaritem xlink:href=".uno:LeftPara"/>
diff --git a/sw/uiconfig/swreport/toolbar/textobjectbar.xml
b/sw/uiconfig/swreport/toolbar/textobjectbar.xml
index aac0785fd003..9c4c45fd682b 100644
--- a/sw/uiconfig/swreport/toolbar/textobjectbar.xml
+++ b/sw/uiconfig/swreport/toolbar/textobjectbar.xml
@@ -50,7 +50,7 @@
<toolbar:toolbaritem xlink:href=".uno:SmallCaps" toolbar:visible="false"/>
<toolbar:toolbarseparator/>
<toolbar:toolbaritem xlink:href=".uno:Color"/>
- <toolbar:toolbaritem xlink:href=".uno:BackColor"/>
+ <toolbar:toolbaritem xlink:href=".uno:CharBackColor"/>
<toolbar:toolbaritem xlink:href=".uno:BackgroundColor"
toolbar:visible="false"/>
<toolbar:toolbarseparator/>
<toolbar:toolbaritem xlink:href=".uno:LeftPara"/>
diff --git a/sw/uiconfig/swriter/toolbar/singlemode-table.xml
b/sw/uiconfig/swriter/toolbar/singlemode-table.xml
index 354affa94589..b8c41d75cc84 100644
--- a/sw/uiconfig/swriter/toolbar/singlemode-table.xml
+++ b/sw/uiconfig/swriter/toolbar/singlemode-table.xml
@@ -30,7 +30,7 @@
<toolbar:toolbaritem xlink:href=".uno:SuperScript" toolbar:visible="false"/>
<toolbar:toolbarseparator/>
<toolbar:toolbaritem xlink:href=".uno:Color"/>
- <toolbar:toolbaritem xlink:href=".uno:BackColor"/>
+ <toolbar:toolbaritem xlink:href=".uno:CharBackColor"/>
<toolbar:toolbaritem xlink:href=".uno:FontDialog-more"/>
<toolbar:toolbarseparator/>
<toolbar:toolbaritem xlink:href=".uno:DefaultBullet"/>
diff --git a/sw/uiconfig/swriter/toolbar/singlemode-text.xml
b/sw/uiconfig/swriter/toolbar/singlemode-text.xml
index 6d8195c406da..99aac24f3ad1 100644
--- a/sw/uiconfig/swriter/toolbar/singlemode-text.xml
+++ b/sw/uiconfig/swriter/toolbar/singlemode-text.xml
@@ -45,7 +45,7 @@
<toolbar:toolbaritem xlink:href=".uno:SuperScript" toolbar:visible="false"/>
<toolbar:toolbarseparator/>
<toolbar:toolbaritem xlink:href=".uno:Color"/>
- <toolbar:toolbaritem xlink:href=".uno:BackColor"/>
+ <toolbar:toolbaritem xlink:href=".uno:CharBackColor"/>
<toolbar:toolbaritem xlink:href=".uno:FontDialog-more"/>
<toolbar:toolbarseparator/>
<toolbar:toolbaritem xlink:href=".uno:DefaultBullet"/>
diff --git a/sw/uiconfig/swriter/toolbar/textobjectbar.xml
b/sw/uiconfig/swriter/toolbar/textobjectbar.xml
index c4944b9337d2..cf6589a9ce5f 100644
--- a/sw/uiconfig/swriter/toolbar/textobjectbar.xml
+++ b/sw/uiconfig/swriter/toolbar/textobjectbar.xml
@@ -50,7 +50,7 @@
<toolbar:toolbaritem xlink:href=".uno:SmallCaps" toolbar:visible="false"/>
<toolbar:toolbarseparator/>
<toolbar:toolbaritem xlink:href=".uno:Color"/>
- <toolbar:toolbaritem xlink:href=".uno:BackColor"/>
+ <toolbar:toolbaritem xlink:href=".uno:CharBackColor"/>
<toolbar:toolbaritem xlink:href=".uno:BackgroundColor"
toolbar:visible="false"/>
<toolbar:toolbarseparator/>
<toolbar:toolbaritem xlink:href=".uno:LeftPara"/>
diff --git a/sw/uiconfig/swriter/toolbar/textstylebar.xml
b/sw/uiconfig/swriter/toolbar/textstylebar.xml
index 4c28f4a1fa3d..878e242cd99a 100644
--- a/sw/uiconfig/swriter/toolbar/textstylebar.xml
+++ b/sw/uiconfig/swriter/toolbar/textstylebar.xml
@@ -66,7 +66,7 @@
<toolbar:toolbaritem xlink:href=".uno:SubScript" toolbar:visible="false"/>
<toolbar:toolbarseparator/>
<toolbar:toolbaritem xlink:href=".uno:FontColor" toolbar:visible="false"/>
- <toolbar:toolbaritem xlink:href=".uno:BackColor" toolbar:visible="false"/>
+ <toolbar:toolbaritem xlink:href=".uno:CharBackColor" toolbar:visible="false"/>
<toolbar:toolbarseparator/>
<toolbar:toolbaritem xlink:href=".uno:ResetAttributes"/>
<toolbar:toolbarseparator/>
diff --git a/sw/uiconfig/swriter/ui/notebookbar.ui
b/sw/uiconfig/swriter/ui/notebookbar.ui
index 6cdec543af43..c1947e131530 100644
--- a/sw/uiconfig/swriter/ui/notebookbar.ui
+++ b/sw/uiconfig/swriter/ui/notebookbar.ui
@@ -3707,7 +3707,7 @@
<child>
<object class="GtkMenuToolButton"
id="Home-BackColor">
<property
name="visible">True</property>
- <property
name="action_name">.uno:BackColor</property>
+ <property
name="action_name">.uno:CharBackColor</property>
</object>
<packing>
<property
name="expand">False</property>
diff --git a/sw/uiconfig/swriter/ui/notebookbar_compact.ui
b/sw/uiconfig/swriter/ui/notebookbar_compact.ui
index 93fbc25d6a73..c24b2a9b3abd 100644
--- a/sw/uiconfig/swriter/ui/notebookbar_compact.ui
+++ b/sw/uiconfig/swriter/ui/notebookbar_compact.ui
@@ -3658,7 +3658,7 @@
<child>
<object class="GtkMenuToolButton"
id="Home-BackColor">
<property name="visible">True</property>
- <property
name="action_name">.uno:BackColor</property>
+ <property
name="action_name">.uno:CharBackColor</property>
</object>
<packing>
<property name="expand">False</property>
diff --git a/sw/uiconfig/swriter/ui/notebookbar_groupedbar_compact.ui
b/sw/uiconfig/swriter/ui/notebookbar_groupedbar_compact.ui
index d4384f5c4cba..b54a1642e54e 100644
--- a/sw/uiconfig/swriter/ui/notebookbar_groupedbar_compact.ui
+++ b/sw/uiconfig/swriter/ui/notebookbar_groupedbar_compact.ui
@@ -4130,7 +4130,7 @@
<child>
<object class="GtkMenuToolButton"
id="Default-BackColor">
<property
name="visible">True</property>
- <property
name="action_name">.uno:BackColor</property>
+ <property
name="action_name">.uno:CharBackColor</property>
</object>
<packing>
<property
name="expand">False</property>
@@ -5437,7 +5437,7 @@
<child>
<object class="GtkMenuToolButton"
id="Table-BackColor">
<property
name="visible">True</property>
- <property
name="action_name">.uno:BackColor</property>
+ <property
name="action_name">.uno:CharBackColor</property>
</object>
<packing>
<property
name="expand">False</property>
diff --git a/sw/uiconfig/swriter/ui/notebookbar_groupedbar_full.ui
b/sw/uiconfig/swriter/ui/notebookbar_groupedbar_full.ui
index 0ce17b57cd59..b281c407de68 100644
--- a/sw/uiconfig/swriter/ui/notebookbar_groupedbar_full.ui
+++ b/sw/uiconfig/swriter/ui/notebookbar_groupedbar_full.ui
@@ -4767,7 +4767,7 @@
<child>
<object
class="GtkMenuToolButton" id="BackColor">
<property
name="visible">True</property>
- <property
name="action_name">.uno:BackColor</property>
+ <property
name="action_name">.uno:CharBackColor</property>
</object>
<packing>
<property
name="expand">False</property>
@@ -6517,7 +6517,7 @@
<child>
<object
class="GtkMenuToolButton" id="BackColor1">
<property
name="visible">True</property>
- <property
name="action_name">.uno:BackColor</property>
+ <property
name="action_name">.uno:CharBackColor</property>
</object>
<packing>
<property
name="expand">False</property>
@@ -9323,7 +9323,7 @@
<child>
<object
class="GtkMenuToolButton" id="BackColor2">
<property
name="visible">True</property>
- <property
name="action_name">.uno:BackColor</property>
+ <property
name="action_name">.uno:CharBackColor</property>
</object>
<packing>
<property
name="expand">False</property>
diff --git a/sw/uiconfig/swriter/ui/notebookbar_groups.ui
b/sw/uiconfig/swriter/ui/notebookbar_groups.ui
index 0cfd5cfd3e1f..92bb55394f7a 100644
--- a/sw/uiconfig/swriter/ui/notebookbar_groups.ui
+++ b/sw/uiconfig/swriter/ui/notebookbar_groups.ui
@@ -1317,7 +1317,7 @@
<object class="GtkMenuToolButton" id="highlight">
<property name="visible">True</property>
<property name="is_important">True</property>
- <property
name="action_name">.uno:BackColor</property>
+ <property
name="action_name">.uno:CharBackColor</property>
<property name="use_underline">True</property>
</object>
<packing>
diff --git a/sw/uiconfig/swriter/ui/notebookbar_single.ui
b/sw/uiconfig/swriter/ui/notebookbar_single.ui
index 5303c76de018..fd1adc6a481c 100644
--- a/sw/uiconfig/swriter/ui/notebookbar_single.ui
+++ b/sw/uiconfig/swriter/ui/notebookbar_single.ui
@@ -752,7 +752,7 @@
<child>
<object class="GtkMenuToolButton"
id="Default-BackColor">
<property name="visible">True</property>
- <property
name="action_name">.uno:BackColor</property>
+ <property
name="action_name">.uno:CharBackColor</property>
</object>
<packing>
<property name="expand">False</property>
@@ -2022,7 +2022,7 @@
<child>
<object class="GtkMenuToolButton"
id="Table-BackColor1">
<property name="visible">True</property>
- <property
name="action_name">.uno:BackColor</property>
+ <property
name="action_name">.uno:CharBackColor</property>
</object>
<packing>
<property name="expand">False</property>
diff --git a/sw/uiconfig/swxform/toolbar/textobjectbar.xml
b/sw/uiconfig/swxform/toolbar/textobjectbar.xml
index aac0785fd003..9c4c45fd682b 100644
--- a/sw/uiconfig/swxform/toolbar/textobjectbar.xml
+++ b/sw/uiconfig/swxform/toolbar/textobjectbar.xml
@@ -50,7 +50,7 @@
<toolbar:toolbaritem xlink:href=".uno:SmallCaps" toolbar:visible="false"/>
<toolbar:toolbarseparator/>
<toolbar:toolbaritem xlink:href=".uno:Color"/>
- <toolbar:toolbaritem xlink:href=".uno:BackColor"/>
+ <toolbar:toolbaritem xlink:href=".uno:CharBackColor"/>
<toolbar:toolbaritem xlink:href=".uno:BackgroundColor"
toolbar:visible="false"/>
<toolbar:toolbarseparator/>
<toolbar:toolbaritem xlink:href=".uno:LeftPara"/>
