[Libreoffice-commits] core.git: Branch 'libreoffice-6-3' - officecfg/registry sd/uiconfig

[Maxim Monastirsky (via logerrit)]

 officecfg/registry/data/org/openoffice/Office/UI/Controller.xcu |   14 ++++++++++
 sd/uiconfig/sdraw/menubar/menubar.xml                           |   14 ----------
 2 files changed, 15 insertions(+), 13 deletions(-)

New commits:
commit 85a98a5f755eb4fa8051d7ce3adcd445b303c656
Author:     Maxim Monastirsky <momonasmon at gmail.com>
AuthorDate: Fri May 3 17:58:46 2019 +0300
Commit:     Maxim Monastirsky <momonasmon at gmail.com>
CommitDate: Fri Jun 14 00:38:33 2019 +0200

    Make .uno:Objects3DToolbox item work in menus
    
    Similar to the other insert shape group commands.
    
    Change-Id: I67524c1d521246b76d953ed9a8aff506535bf550
    Reviewed-on: https://gerrit.libreoffice.org/73970
    Tested-by: Jenkins
    Reviewed-by: Maxim Monastirsky <momonasmon at gmail.com>
    (cherry picked from commit 7fb6f10c92d21681e9b0fa722ac9329cf3b8e5a2)
    Reviewed-on: https://gerrit.libreoffice.org/73990

diff --git a/officecfg/registry/data/org/openoffice/Office/UI/Controller.xcu b/officecfg/registry/data/org/openoffice/Office/UI/Controller.xcu
index 0370cfb8bb9e..722df647ce3b 100644
--- a/officecfg/registry/data/org/openoffice/Office/UI/Controller.xcu
+++ b/officecfg/registry/data/org/openoffice/Office/UI/Controller.xcu
@@ -495,6 +495,20 @@
           <value>choosemodebar</value>
         </prop>
       </node>
+      <node oor:name="c40" oor:op="replace">
+        <prop oor:name="Command">
+          <value>.uno:Objects3DToolbox</value>
+        </prop>
+        <prop oor:name="Module">
+          <value/>
+        </prop>
+        <prop oor:name="Controller">
+          <value>com.sun.star.comp.framework.ToolbarAsMenuController</value>
+        </prop>
+        <prop oor:name="Value">
+          <value>3dobjectsbar</value>
+        </prop>
+      </node>
     </node>
     <node oor:name="ToolBar">
       <node oor:name="lo.writer.ScrollToPrevious" oor:op="replace">
diff --git a/sd/uiconfig/sdraw/menubar/menubar.xml b/sd/uiconfig/sdraw/menubar/menubar.xml
index 0815d8595b28..f59c6d510849 100644
--- a/sd/uiconfig/sdraw/menubar/menubar.xml
+++ b/sd/uiconfig/sdraw/menubar/menubar.xml
@@ -482,19 +482,7 @@
           <menu:menuitem menu:id=".uno:CalloutShapes"/>
           <menu:menuitem menu:id=".uno:StarShapes"/>
           <menu:menuseparator/>
-          <menu:menu menu:id=".uno:Objects3DToolbox">
-            <menu:menupopup>
-              <menu:menuitem menu:id=".uno:Cube"/>
-              <menu:menuitem menu:id=".uno:Sphere"/>
-              <menu:menuitem menu:id=".uno:Cylinder"/>
-              <menu:menuitem menu:id=".uno:Cone"/>
-              <menu:menuseparator/>
-              <menu:menuitem menu:id=".uno:Cyramid"/>
-              <menu:menuitem menu:id=".uno:Torus"/>
-              <menu:menuitem menu:id=".uno:Shell3D"/>
-              <menu:menuitem menu:id=".uno:HalfSphere"/>
-            </menu:menupopup>
-          </menu:menu>
+          <menu:menuitem menu:id=".uno:Objects3DToolbox"/>
         </menu:menupopup>
       </menu:menu>
       <menu:menuseparator/>