officecfg/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(-)
New commits:
commit ffd18eed1fc5b56fecf83fbff3ce09face16bb7e
Author: Yousuf Philips <philip...@hotmail.com>
Date: Sat Nov 29 21:30:59 2014 +0400
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 <philip...@hotmail.com>
Tested-by: Yousuf Philips <philip...@hotmail.com>
diff --git
a/officecfg/registry/data/org/openoffice/Office/UI/GenericCommands.xcu
b/officecfg/registry/data/org/openoffice/Office/UI/GenericCommands.xcu
index 5bfc495..30ff7a5 100644
--- a/officecfg/registry/data/org/openoffice/Office/UI/GenericCommands.xcu
+++ b/officecfg/registry/data/org/openoffice/Office/UI/GenericCommands.xcu
@@ -3125,6 +3125,14 @@
</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>
<prop oor:name="Properties" oor:type="xs:int">
diff --git a/sc/uiconfig/scalc/menubar/menubar.xml
b/sc/uiconfig/scalc/menubar/menubar.xml
index 56377a4..5a83aec 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 6ecab9e..6ec992b 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 a9667c5..6bd58b7 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 be10398..3d6dcf0 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 d29a58a..2961d8c 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 1495eb5..6739a0b 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 bbba7b2..1c80604 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"/>
_______________________________________________
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
