summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorYousuf Philips <philipz85@hotmail.com>2015-10-04 21:14:00 +0400
committerMaxim Monastirsky <momonasmon@gmail.com>2015-10-06 18:58:31 +0000
commit3080e4c09b7c4894d4f0f52c9beed4298f3fd23f (patch)
tree002245f9d0ac664e2178876704d37eb86b81d9b6
parent884606e74bee007c0286a16fb8aa8fc8af9a8779 (diff)
tdf#91097 Substitute rectangle and ellipse uno commands
Change-Id: Ib6578ddd7897d9c5d63b5dc8d8465f6107cc24a6 Reviewed-on: https://gerrit.libreoffice.org/19130 Reviewed-by: Maxim Monastirsky <momonasmon@gmail.com> Tested-by: Maxim Monastirsky <momonasmon@gmail.com>
-rw-r--r--sc/uiconfig/scalc/menubar/menubar.xml4
-rw-r--r--sc/uiconfig/scalc/toolbar/drawbar.xml2
-rw-r--r--sd/uiconfig/simpress/menubar/menubar.xml4
-rw-r--r--sw/uiconfig/swriter/menubar/menubar.xml4
-rw-r--r--sw/uiconfig/swriter/toolbar/drawbar.xml2
5 files changed, 6 insertions, 10 deletions
diff --git a/sc/uiconfig/scalc/menubar/menubar.xml b/sc/uiconfig/scalc/menubar/menubar.xml
index 09e63ec70646..cff033eb7964 100644
--- a/sc/uiconfig/scalc/menubar/menubar.xml
+++ b/sc/uiconfig/scalc/menubar/menubar.xml
@@ -155,8 +155,8 @@
<menu:menupopup>
<menu:menuitem menu:id=".uno:Line"/>
<menu:menuitem menu:id=".uno:Freeline_Unfilled"/>
- <menu:menuitem menu:id=".uno:Rect"/>
- <menu:menuitem menu:id=".uno:Ellipse"/>
+ <menu:menuitem menu:id=".uno:BasicShapes.rectangle"/>
+ <menu:menuitem menu:id=".uno:BasicShapes.ellipse"/>
<menu:menuitem menu:id=".uno:Polygon_Unfilled"/>
</menu:menupopup>
</menu:menu>
diff --git a/sc/uiconfig/scalc/toolbar/drawbar.xml b/sc/uiconfig/scalc/toolbar/drawbar.xml
index 4dc24243cffc..f4bf9a711a4c 100644
--- a/sc/uiconfig/scalc/toolbar/drawbar.xml
+++ b/sc/uiconfig/scalc/toolbar/drawbar.xml
@@ -25,11 +25,9 @@
<toolbar:toolbaritem xlink:href=".uno:Polygon_Unfilled" toolbar:helpid="10395"/>
<toolbar:toolbarseparator/>
<toolbar:toolbaritem xlink:href=".uno:Line" toolbar:helpid="10102"/>
- <toolbar:toolbaritem xlink:href=".uno:Rect" toolbar:helpid="10104" toolbar:visible="false"/>
<toolbar:toolbaritem xlink:href=".uno:BasicShapes.rectangle"/>
<toolbar:toolbaritem xlink:href=".uno:BasicShapes.round-rectangle" toolbar:visible="false"/>
<toolbar:toolbaritem xlink:href=".uno:BasicShapes.quadrat" toolbar:visible="false"/>
- <toolbar:toolbaritem xlink:href=".uno:Ellipse" toolbar:helpid="10110" toolbar:visible="false"/>
<toolbar:toolbaritem xlink:href=".uno:BasicShapes.ellipse" toolbar:helpid="10110"/>
<toolbar:toolbaritem xlink:href=".uno:BasicShapes.circle" toolbar:visible="false"/>
<toolbar:toolbaritem xlink:href=".uno:Arc" toolbar:visible="false" toolbar:helpid="10114"/>
diff --git a/sd/uiconfig/simpress/menubar/menubar.xml b/sd/uiconfig/simpress/menubar/menubar.xml
index 42b81b2a06cf..0c7e96e47aff 100644
--- a/sd/uiconfig/simpress/menubar/menubar.xml
+++ b/sd/uiconfig/simpress/menubar/menubar.xml
@@ -171,8 +171,8 @@
<menu:menupopup>
<menu:menuitem menu:id=".uno:Line"/>
<menu:menuitem menu:id=".uno:Freeline_Unfilled"/>
- <menu:menuitem menu:id=".uno:Rect"/>
- <menu:menuitem menu:id=".uno:Ellipse"/>
+ <menu:menuitem menu:id=".uno:BasicShapes.rectangle"/>
+ <menu:menuitem menu:id=".uno:BasicShapes.ellipse"/>
<menu:menuitem menu:id=".uno:Polygon_Unfilled"/>
</menu:menupopup>
</menu:menu>
diff --git a/sw/uiconfig/swriter/menubar/menubar.xml b/sw/uiconfig/swriter/menubar/menubar.xml
index 598f46e8f98a..657ef31bcc49 100644
--- a/sw/uiconfig/swriter/menubar/menubar.xml
+++ b/sw/uiconfig/swriter/menubar/menubar.xml
@@ -210,8 +210,8 @@
<menu:menupopup>
<menu:menuitem menu:id=".uno:Line"/>
<menu:menuitem menu:id=".uno:Freeline_Unfilled"/>
- <menu:menuitem menu:id=".uno:Rect"/>
- <menu:menuitem menu:id=".uno:Ellipse"/>
+ <menu:menuitem menu:id=".uno:BasicShapes.rectangle"/>
+ <menu:menuitem menu:id=".uno:BasicShapes.ellipse"/>
<menu:menuitem menu:id=".uno:Polygon_Unfilled"/>
</menu:menupopup>
</menu:menu>
diff --git a/sw/uiconfig/swriter/toolbar/drawbar.xml b/sw/uiconfig/swriter/toolbar/drawbar.xml
index df7353b5a4dc..b025ff567d44 100644
--- a/sw/uiconfig/swriter/toolbar/drawbar.xml
+++ b/sw/uiconfig/swriter/toolbar/drawbar.xml
@@ -29,11 +29,9 @@
<toolbar:toolbaritem xlink:href=".uno:Polygon_Diagonal_Unfilled" toolbar:visible="false"/>
<toolbar:toolbaritem xlink:href=".uno:Polygon_Diagonal" toolbar:visible="false"/>
<toolbar:toolbarseparator/>
- <toolbar:toolbaritem xlink:href=".uno:Rect" toolbar:helpid="10104" toolbar:visible="false"/>
<toolbar:toolbaritem xlink:href=".uno:BasicShapes.rectangle" toolbar:helpid="10104"/>
<toolbar:toolbaritem xlink:href=".uno:BasicShapes.round-rectangle"/>
<toolbar:toolbaritem xlink:href=".uno:BasicShapes.quadrat"/>
- <toolbar:toolbaritem xlink:href=".uno:Ellipse" toolbar:helpid="10110" toolbar:visible="false"/>
<toolbar:toolbaritem xlink:href=".uno:BasicShapes.ellipse" toolbar:helpid="10110"/>
<toolbar:toolbaritem xlink:href=".uno:BasicShapes.circle"/>
<toolbar:toolbaritem xlink:href=".uno:Arc" toolbar:helpid="10114" toolbar:visible="false"/>