diff options
| author | Yousuf Philips <philipz85@hotmail.com> | 2015-10-04 21:14:00 +0400 |
|---|---|---|
| committer | Caolán McNamara <caolanm@redhat.com> | 2015-10-14 08:03:23 +0000 |
| commit | be6440f4624be4da84ac8b71e66297d3e43ca249 (patch) | |
| tree | 5b72d0cced80d99644137f25f789988108f56d7f /sw | |
| parent | 15195fb801b354a2f2356aa3cea0a06b9eb1e066 (diff) | |
tdf#91097 Substitute rectangle and ellipse uno commands
(cherry picked from commit 3080e4c09b7c4894d4f0f52c9beed4298f3fd23f)
(cherry picked from commit fedf965c51a9f57e5cde203a3d15a6c244558002)
(cherry picked from commit 4c2339d8177d610cc23619e787c1517ce8e8afd7)
(cherry picked from commit 1bc911eca173131fdc6e7e3889d128fa03adbf72)
Conflicts:
framework/source/uielement/menubarmanager.cxx
sc/uiconfig/scalc/menubar/menubar.xml
sd/uiconfig/simpress/menubar/menubar.xml
sw/uiconfig/swriter/menubar/menubar.xml
Change-Id: Ib6578ddd7897d9c5d63b5dc8d8465f6107cc24a6
Reviewed-on: https://gerrit.libreoffice.org/19345
Tested-by: Jenkins <ci@libreoffice.org>
Reviewed-by: Caolán McNamara <caolanm@redhat.com>
Tested-by: Caolán McNamara <caolanm@redhat.com>
Diffstat (limited to 'sw')
| -rw-r--r-- | sw/uiconfig/swriter/menubar/menubar.xml | 4 | ||||
| -rw-r--r-- | sw/uiconfig/swriter/toolbar/drawbar.xml | 2 |
2 files changed, 2 insertions, 4 deletions
diff --git a/sw/uiconfig/swriter/menubar/menubar.xml b/sw/uiconfig/swriter/menubar/menubar.xml index e290530e4831..a7184c387160 100644 --- a/sw/uiconfig/swriter/menubar/menubar.xml +++ b/sw/uiconfig/swriter/menubar/menubar.xml @@ -239,8 +239,8 @@ <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: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"/> |