[Libreoffice-commits] core.git: sc/uiconfig sd/uiconfig sw/uiconfig

[Yousuf Philips]

 sc/uiconfig/scalc/menubar/menubar.xml    |    4 ++--
 sc/uiconfig/scalc/toolbar/drawbar.xml    |    2 --
 sd/uiconfig/simpress/menubar/menubar.xml |    4 ++--
 sw/uiconfig/swriter/menubar/menubar.xml  |    4 ++--
 sw/uiconfig/swriter/toolbar/drawbar.xml  |    2 --
 5 files changed, 6 insertions(+), 10 deletions(-)

New commits:
commit 3080e4c09b7c4894d4f0f52c9beed4298f3fd23f
Author: Yousuf Philips <philipz85 at hotmail.com>
Date:   Sun Oct 4 21:14:00 2015 +0400

    tdf#91097 Substitute rectangle and ellipse uno commands
    
    Change-Id: Ib6578ddd7897d9c5d63b5dc8d8465f6107cc24a6
    Reviewed-on: https://gerrit.libreoffice.org/19130
    Reviewed-by: Maxim Monastirsky <momonasmon at gmail.com>
    Tested-by: Maxim Monastirsky <momonasmon at gmail.com>

diff --git a/sc/uiconfig/scalc/menubar/menubar.xml b/sc/uiconfig/scalc/menubar/menubar.xml
index 09e63ec..cff033e 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 4dc2424..f4bf9a7 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 42b81b2..0c7e96e 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 598f46e..657ef31 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 df7353b..b025ff5 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"/>