From cad153e36297f0d1e8f70e702441baab054cfc88 Mon Sep 17 00:00:00 2001
From: Yousuf Philips <philipz85@hotmail.com>
Date: Sat, 29 Nov 2014 21:30:59 +0400
Subject: fdo#86035 removed uno:InsertDraw and added shapes submenu to writer

Change-Id: I66a762ac267f48b9866d6ccb0fec9542eec52aaa
Reviewed-on: https://gerrit.libreoffice.org/13188
Reviewed-by: Yousuf Philips <philipz85@hotmail.com>
Tested-by: Yousuf Philips <philipz85@hotmail.com>
(cherry picked from commit ffd18eed1fc5b56fecf83fbff3ce09face16bb7e)
Reviewed-on: https://gerrit.libreoffice.org/13190
---
 .../registry/data/org/openoffice/Office/UI/GenericCommands.xcu   | 8 ++++++++
 sc/uiconfig/scalc/menubar/menubar.xml                            | 1 -
 sd/uiconfig/sdraw/menubar/menubar.xml                            | 1 -
 sd/uiconfig/simpress/menubar/menubar.xml                         | 1 -
 sw/uiconfig/sglobal/menubar/menubar.xml                          | 1 -
 sw/uiconfig/swform/menubar/menubar.xml                           | 1 -
 sw/uiconfig/swriter/menubar/menubar.xml                          | 9 ++++++++-
 sw/uiconfig/swxform/menubar/menubar.xml                          | 1 -
 8 files changed, 16 insertions(+), 7 deletions(-)

diff --git a/officecfg/registry/data/org/openoffice/Office/UI/GenericCommands.xcu b/officecfg/registry/data/org/openoffice/Office/UI/GenericCommands.xcu
index 8b15921d2aa6..43f26afb7ab3 100644
--- a/officecfg/registry/data/org/openoffice/Office/UI/GenericCommands.xcu
+++ b/officecfg/registry/data/org/openoffice/Office/UI/GenericCommands.xcu
@@ -3124,6 +3124,14 @@
         </prop>
       </node>
       <node oor:name=".uno:InsertDraw" oor:op="replace">
+        <prop oor:name="Label" oor:type="xs:string">
+          <value xml:lang="en-US">Show Draw Functions</value>
+        </prop>
+        <prop oor:name="Properties" oor:type="xs:int">
+          <value>1</value>
+        </prop>
+      </node>
+      <node oor:name=".uno:ShapesMenu" oor:op="replace">
         <prop oor:name="Label" oor:type="xs:string">
           <value xml:lang="en-US">~Shapes</value>
         </prop>
diff --git a/sc/uiconfig/scalc/menubar/menubar.xml b/sc/uiconfig/scalc/menubar/menubar.xml
index 56377a49b59b..5a83aec8a74c 100644
--- a/sc/uiconfig/scalc/menubar/menubar.xml
+++ b/sc/uiconfig/scalc/menubar/menubar.xml
@@ -230,7 +230,6 @@
                     <menu:menuitem menu:id=".uno:InsertAVMedia"/>
                 </menu:menupopup>
             </menu:menu>
-            <menu:menuitem menu:id=".uno:InsertDraw"/>
             <menu:menuitem menu:id=".uno:InsertObjectChart"/>
             <menu:menu menu:id=".uno:ObjectMenu">
                 <menu:menupopup>
diff --git a/sd/uiconfig/sdraw/menubar/menubar.xml b/sd/uiconfig/sdraw/menubar/menubar.xml
index 6ecab9e6f0f5..6ec992b2e3ba 100644
--- a/sd/uiconfig/sdraw/menubar/menubar.xml
+++ b/sd/uiconfig/sdraw/menubar/menubar.xml
@@ -199,7 +199,6 @@
          <menu:menuitem menu:id=".uno:InsertAVMedia"/>
         </menu:menupopup>
       </menu:menu>
-      <menu:menuitem menu:id=".uno:InsertDraw"/>
       <menu:menuitem menu:id=".uno:InsertObjectChart"/>
       <menu:menu menu:id=".uno:ObjectMenu">
         <menu:menupopup>
diff --git a/sd/uiconfig/simpress/menubar/menubar.xml b/sd/uiconfig/simpress/menubar/menubar.xml
index a9667c53a80a..6bd58b74780d 100644
--- a/sd/uiconfig/simpress/menubar/menubar.xml
+++ b/sd/uiconfig/simpress/menubar/menubar.xml
@@ -217,7 +217,6 @@
                     <menu:menuitem menu:id=".uno:InsertAVMedia"/>
                 </menu:menupopup>
             </menu:menu>
-            <menu:menuitem menu:id=".uno:InsertDraw"/>
             <menu:menuitem menu:id=".uno:InsertObjectChart"/>
             <menu:menu menu:id=".uno:ObjectMenu">
                 <menu:menupopup>
diff --git a/sw/uiconfig/sglobal/menubar/menubar.xml b/sw/uiconfig/sglobal/menubar/menubar.xml
index be10398b12ea..3d6dcf06a411 100644
--- a/sw/uiconfig/sglobal/menubar/menubar.xml
+++ b/sw/uiconfig/sglobal/menubar/menubar.xml
@@ -227,7 +227,6 @@
           <menu:menuitem menu:id=".uno:InsertAVMedia"/>
         </menu:menupopup>
       </menu:menu>
-      <menu:menuitem menu:id=".uno:InsertDraw"/>
       <menu:menu menu:id=".uno:ObjectMenu">
         <menu:menupopup>
           <menu:menuitem menu:id=".uno:InsertObject"/>
diff --git a/sw/uiconfig/swform/menubar/menubar.xml b/sw/uiconfig/swform/menubar/menubar.xml
index d29a58afa9d6..2961d8c74279 100644
--- a/sw/uiconfig/swform/menubar/menubar.xml
+++ b/sw/uiconfig/swform/menubar/menubar.xml
@@ -226,7 +226,6 @@
           <menu:menuitem menu:id=".uno:InsertAVMedia"/>
        </menu:menupopup>
       </menu:menu>
-      <menu:menuitem menu:id=".uno:InsertDraw"/>
       <menu:menu menu:id=".uno:ObjectMenu">
         <menu:menupopup>
           <menu:menuitem menu:id=".uno:InsertObject"/>
diff --git a/sw/uiconfig/swriter/menubar/menubar.xml b/sw/uiconfig/swriter/menubar/menubar.xml
index 1495eb5448dd..6739a0bfa08d 100644
--- a/sw/uiconfig/swriter/menubar/menubar.xml
+++ b/sw/uiconfig/swriter/menubar/menubar.xml
@@ -234,7 +234,14 @@
           <menu:menuitem menu:id=".uno:InsertAVMedia"/>
         </menu:menupopup>
       </menu:menu>
-      <menu:menuitem menu:id=".uno:InsertDraw"/>
+      <menu:menu menu:id=".uno:ShapesMenu">
+       <menu:menupopup>
+        <menu:menuitem menu:id=".uno:Line"/>
+        <menu:menuitem menu:id=".uno:Rect"/>
+        <menu:menuitem menu:id=".uno:Ellipse"/>
+        <menu:menuitem menu:id=".uno:Polygon_Unfilled"/>
+       </menu:menupopup>
+      </menu:menu>
       <menu:menu menu:id=".uno:ObjectMenu">
         <menu:menupopup>
           <menu:menuitem menu:id=".uno:InsertObject"/>
diff --git a/sw/uiconfig/swxform/menubar/menubar.xml b/sw/uiconfig/swxform/menubar/menubar.xml
index bbba7b29eee9..1c80604269bd 100644
--- a/sw/uiconfig/swxform/menubar/menubar.xml
+++ b/sw/uiconfig/swxform/menubar/menubar.xml
@@ -228,7 +228,6 @@
           <menu:menuitem menu:id=".uno:InsertAVMedia"/>
         </menu:menupopup>
       </menu:menu>
-      <menu:menuitem menu:id=".uno:InsertDraw"/>
       <menu:menu menu:id=".uno:ObjectMenu">
         <menu:menupopup>
           <menu:menuitem menu:id=".uno:InsertObject"/>
-- 
cgit