summaryrefslogtreecommitdiff
path: root/officecfg
diff options
context:
space:
mode:
authorJustin Luth <jluth@mail.com>2022-07-21 13:56:30 -0400
committerJustin Luth <jluth@mail.com>2022-12-19 17:57:10 +0000
commitbe3d34b5d6b97c3eb12ab3f84ce2da2ef965a928 (patch)
tree54d4c4eafeffc090c9726007fde307e103421c0d /officecfg
parent97e93861dd5ed52d742355f043e9cd628c1bc8f8 (diff)
[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 <jluth@mail.com>
Diffstat (limited to 'officecfg')
-rw-r--r--officecfg/registry/data/org/openoffice/Office/UI/GenericCommands.xcu3
-rw-r--r--officecfg/registry/data/org/openoffice/Office/UI/WriterCommands.xcu3
2 files changed, 3 insertions, 3 deletions
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>