summaryrefslogtreecommitdiff
path: root/officecfg
diff options
context:
space:
mode:
authorHeiko Tietze <tietze.heiko@gmail.com>2021-05-19 13:21:00 +0200
committerHeiko Tietze <heiko.tietze@documentfoundation.org>2021-06-08 15:28:56 +0200
commit086fa727cabf46eacfec1a0fd4f6dfe916aa2f04 (patch)
treed17d263a3f2eef1b9c0d39ffd08e751c3f2fa105 /officecfg
parenta2d8a737f41cbb0ed8a51a99b1c233b25e433d1c (diff)
Resolves tdf#131817 - Option to globally switch toolbar locking on/off
Reverts 6993d5d0f1079fe720a7da004b70b57361c99fc6 and sets Locked in GlobalSettings to true New UNO command ToolbarLock to toggle the state added to the toolbars menu Change-Id: I246280b2b7930f2bf686e6fc26383da4799b5028 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/115797 Tested-by: Jenkins Reviewed-by: Heiko Tietze <heiko.tietze@documentfoundation.org>
Diffstat (limited to 'officecfg')
-rw-r--r--officecfg/registry/data/org/openoffice/Office/UI/GenericCommands.xcu11
-rw-r--r--officecfg/registry/schema/org/openoffice/Office/UI/GlobalSettings.xcs2
2 files changed, 13 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 3d9420e76587..e20e08b7f707 100644
--- a/officecfg/registry/data/org/openoffice/Office/UI/GenericCommands.xcu
+++ b/officecfg/registry/data/org/openoffice/Office/UI/GenericCommands.xcu
@@ -6548,6 +6548,17 @@ bit 3 (0x8): #define UICOMMANDDESCRIPTION_PROPERTIES_TOGGLEBUTTON 8
<value>1</value>
</prop>
</node>
+ <node oor:name=".uno:ToolbarLock" oor:op="replace">
+ <prop oor:name="Label" oor:type="xs:string">
+ <value xml:lang="en-US">Lock Toolbars</value>
+ </prop>
+ <prop oor:name="TooltipLabel" oor:type="xs:string">
+ <value xml:lang="en-US">Lock or unlock all toolbars</value>
+ </prop>
+ <prop oor:name="Properties" oor:type="xs:int">
+ <value>1</value>
+ </prop>
+ </node>
</node>
<node oor:name="Popups">
<node oor:name=".uno:PasteSpecialMenu" oor:op="replace">
diff --git a/officecfg/registry/schema/org/openoffice/Office/UI/GlobalSettings.xcs b/officecfg/registry/schema/org/openoffice/Office/UI/GlobalSettings.xcs
index 1cfa98041643..610b691c6bc6 100644
--- a/officecfg/registry/schema/org/openoffice/Office/UI/GlobalSettings.xcs
+++ b/officecfg/registry/schema/org/openoffice/Office/UI/GlobalSettings.xcs
@@ -35,6 +35,7 @@
TRUE = All toolbars should be locked by default.
FALSE = All toolbars should never be locked by default.
-->
+ <value>true</value>
</prop>
<prop oor:name="Docked" oor:type="xs:boolean">
<info>
@@ -57,6 +58,7 @@
<info>
<desc>Determines if the global states set should be used or not."</desc>
</info>
+ <value>true</value>
</prop>
<node-ref oor:name="States" oor:node-type="GlobalWindowState">
<info>