summaryrefslogtreecommitdiff
path: root/officecfg/registry/data/org/openoffice/Office
diff options
context:
space:
mode:
authorAndre Fischer <af@apache.org>2013-04-19 08:51:45 +0000
committerMichael Meeks <michael.meeks@suse.com>2013-05-20 11:33:16 +0100
commit0b2c09a180f076230a1f1ac3ecf4725e82aada4c (patch)
treecd61de0a554320ae3c6c7c5ef9ef4c412e0dd3ac /officecfg/registry/data/org/openoffice/Office
parentc991fb49aa174f300be0b978d89bc63e01e0aa2b (diff)
Resolves: #i121960# Extend the sidebar::ControllerItem to check Disabled state
Converted TextPropertyPanel to use this new functionality. (cherry picked from commit 5e32abe48b0833e4e370507a1e74fbb1ba98b5e3) Conflicts: officecfg/registry/data/org/openoffice/Office/UI/GenericCommands.xcu sfx2/inc/sfx2/sidebar/ControllerItem.hxx sfx2/source/sidebar/ControllerItem.cxx sfx2/source/sidebar/FocusManager.cxx sfx2/source/sidebar/SidebarChildWindow.cxx svx/Library_svx.mk svx/source/sidebar/text/TextPropertyPanel.cxx svx/source/sidebar/text/TextPropertyPanel.hrc svx/source/sidebar/text/TextPropertyPanel.hxx svx/source/sidebar/text/TextPropertyPanel.src svx/source/sidebar/text/TextUnderlineControl.hxx Change-Id: I3a25bb0a02e6165ceeb6dbd9e6ecd3e94051f594
Diffstat (limited to 'officecfg/registry/data/org/openoffice/Office')
-rw-r--r--officecfg/registry/data/org/openoffice/Office/UI/GenericCommands.xcu16
1 files changed, 16 insertions, 0 deletions
diff --git a/officecfg/registry/data/org/openoffice/Office/UI/GenericCommands.xcu b/officecfg/registry/data/org/openoffice/Office/UI/GenericCommands.xcu
index 517d601208e1..7b01925f58a3 100644
--- a/officecfg/registry/data/org/openoffice/Office/UI/GenericCommands.xcu
+++ b/officecfg/registry/data/org/openoffice/Office/UI/GenericCommands.xcu
@@ -1340,6 +1340,14 @@
<value>1</value>
</prop>
</node>
+ <node oor:name=".uno:CharacterBackgroundPattern" oor:op="replace">
+ <prop oor:name="Label" oor:type="xs:string">
+ <value xml:lang="en-US">Highlight Color</value>
+ </prop>
+ <prop oor:name="Properties" oor:type="xs:int">
+ <value>1</value>
+ </prop>
+ </node>
<node oor:name=".uno:CharFontName" oor:op="replace">
<prop oor:name="Label" oor:type="xs:string">
<value xml:lang="en-US">Font Name</value>
@@ -3072,6 +3080,14 @@
<value>1</value>
</prop>
</node>
+ <node oor:name=".uno:Spacing" oor:op="replace">
+ <prop oor:name="Label" oor:type="xs:string">
+ <value xml:lang="en-US">Character Spacing</value>
+ </prop>
+ <prop oor:name="Properties" oor:type="xs:int">
+ <value>1</value>
+ </prop>
+ </node>
<node oor:name=".uno:SpellDialog" oor:op="replace">
<prop oor:name="Label" oor:type="xs:string">
<value xml:lang="en-US">~Spelling...</value>