From 50468779725c9eaccae17e4e39a6651f12e49340 Mon Sep 17 00:00:00 2001
From: Szymon Kłos <eszkadev@gmail.com>
Date: Sun, 19 Feb 2017 16:36:08 +0100
Subject: tdf#103323 Single Toolbar without experimental mode

Only Notebookbar mode should be marked as experimental.
This patch allows to enable Single Toolbar or Sidebar
mode without experimental mode activation.

Change-Id: I9dcf1602b2f560aaa9ea29c07c4a7ed473be0352
Reviewed-on: https://gerrit.libreoffice.org/34431
Reviewed-by: Samuel Mehrbrodt <Samuel.Mehrbrodt@cib.de>
Tested-by: Samuel Mehrbrodt <Samuel.Mehrbrodt@cib.de>
---
 .../registry/data/org/openoffice/Office/UI/GenericCommands.xcu   | 3 ---
 officecfg/registry/data/org/openoffice/Office/UI/ToolbarMode.xcu | 9 +++++++++
 .../registry/schema/org/openoffice/Office/UI/ToolbarMode.xcs     | 5 +++++
 3 files changed, 14 insertions(+), 3 deletions(-)

(limited to 'officecfg/registry')

diff --git a/officecfg/registry/data/org/openoffice/Office/UI/GenericCommands.xcu b/officecfg/registry/data/org/openoffice/Office/UI/GenericCommands.xcu
index 7b78273f394a..0b860f7263ee 100644
--- a/officecfg/registry/data/org/openoffice/Office/UI/GenericCommands.xcu
+++ b/officecfg/registry/data/org/openoffice/Office/UI/GenericCommands.xcu
@@ -5893,9 +5893,6 @@
         <prop oor:name="Label" oor:type="xs:string">
           <value xml:lang="en-US">Toolbar Layout</value>
         </prop>
-        <prop oor:name="IsExperimental" oor:type="xs:boolean">
-          <value>true</value>
-        </prop>
       </node>
       <node oor:name=".uno:AvailableToolbars" oor:op="replace">
         <prop oor:name="Label" oor:type="xs:string">
diff --git a/officecfg/registry/data/org/openoffice/Office/UI/ToolbarMode.xcu b/officecfg/registry/data/org/openoffice/Office/UI/ToolbarMode.xcu
index a78d90e009f6..4ee4b4fbcb44 100644
--- a/officecfg/registry/data/org/openoffice/Office/UI/ToolbarMode.xcu
+++ b/officecfg/registry/data/org/openoffice/Office/UI/ToolbarMode.xcu
@@ -93,6 +93,9 @@
           <prop oor:name="HasNotebookbar">
             <value>true</value>
           </prop>
+          <prop oor:name="IsExperimental">
+            <value>true</value>
+          </prop>
           <prop oor:name="MenuPosition">
             <value>3</value>
           </prop>
@@ -204,6 +207,9 @@
           <prop oor:name="HasNotebookbar">
             <value>true</value>
           </prop>
+          <prop oor:name="IsExperimental">
+            <value>true</value>
+          </prop>
           <prop oor:name="MenuPosition">
             <value>3</value>
           </prop>
@@ -290,6 +296,9 @@
           <prop oor:name="HasNotebookbar">
             <value>true</value>
           </prop>
+          <prop oor:name="IsExperimental">
+            <value>true</value>
+          </prop>
           <prop oor:name="MenuPosition">
             <value>3</value>
           </prop>
diff --git a/officecfg/registry/schema/org/openoffice/Office/UI/ToolbarMode.xcs b/officecfg/registry/schema/org/openoffice/Office/UI/ToolbarMode.xcs
index 4a2a5adc6282..50759f83d8ed 100644
--- a/officecfg/registry/schema/org/openoffice/Office/UI/ToolbarMode.xcs
+++ b/officecfg/registry/schema/org/openoffice/Office/UI/ToolbarMode.xcs
@@ -41,6 +41,11 @@
           <desc>Position in the menu.</desc>
         </info>
       </prop>
+      <prop oor:name="IsExperimental" oor:type="xs:boolean" oor:nillable="true">
+        <info>
+          <desc>Enables entry only in the experimental mode.</desc>
+        </info>
+      </prop>
       <prop oor:name="HasNotebookbar" oor:type="xs:boolean" oor:nillable="false">
         <info>
           <desc>Determines if Notebookbar is visible.</desc>
-- 
cgit