summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorYousuf Philips <philipz85@hotmail.com>2016-06-04 20:35:30 +0400
committerCaolán McNamara <caolanm@redhat.com>2016-06-07 08:08:46 +0000
commit8971055bb1010ebfce38b1d0cb5a740f2ee9cc84 (patch)
tree7f51a5dbb6451098d427ccb90672ee8e52682af7
parent0006c15d8a496b7544beb09ba4de6bde866c13b0 (diff)
tdf#85594 Unify Calc drawing toolbar with Writer
Change-Id: Iac74d5d8f8b20cd771ce67c713ef53eccaa6f1f0 Reviewed-on: https://gerrit.libreoffice.org/25895 Tested-by: Jenkins <ci@libreoffice.org> Reviewed-by: Yousuf Philips <philipz85@hotmail.com> (cherry picked from commit 3eb15d6119ff36d79aed3b8a42bac42c25afea4e) Reviewed-on: https://gerrit.libreoffice.org/25954 Reviewed-by: Caolán McNamara <caolanm@redhat.com> Tested-by: Caolán McNamara <caolanm@redhat.com>
-rw-r--r--sc/uiconfig/scalc/toolbar/drawbar.xml16
-rw-r--r--sc/uiconfig/scalc/toolbar/formatobjectbar.xml2
-rw-r--r--sc/uiconfig/scalc/toolbar/standardbar.xml1
3 files changed, 14 insertions, 5 deletions
diff --git a/sc/uiconfig/scalc/toolbar/drawbar.xml b/sc/uiconfig/scalc/toolbar/drawbar.xml
index e724e75f2798..fef6c7efe85b 100644
--- a/sc/uiconfig/scalc/toolbar/drawbar.xml
+++ b/sc/uiconfig/scalc/toolbar/drawbar.xml
@@ -20,19 +20,25 @@
<toolbar:toolbar xmlns:toolbar="http://openoffice.org/2001/toolbar" xmlns:xlink="http://www.w3.org/1999/xlink">
<toolbar:toolbaritem xlink:href=".uno:SelectObject" toolbar:helpid="10128"/>
<toolbar:toolbarseparator/>
+ <toolbar:toolbaritem xlink:href=".uno:Line" toolbar:helpid="10102"/>
<toolbar:toolbaritem xlink:href=".uno:LineToolbox"/>
+ <toolbar:toolbaritem xlink:href=".uno:Freeline" toolbar:visible="false"/>
+ <toolbar:toolbaritem xlink:href=".uno:Bezier_Unfilled" toolbar:helpid="10397" toolbar:visible="false"/>
+ <toolbar:toolbaritem xlink:href=".uno:BezierFill" toolbar:visible="false"/>
+ <toolbar:toolbaritem xlink:href=".uno:Polygon_Unfilled" toolbar:helpid="10395" toolbar:visible="false"/>
+ <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:Line" toolbar:helpid="10102"/>
<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:BasicShapes.round-rectangle"/>
+ <toolbar:toolbaritem xlink:href=".uno:BasicShapes.quadrat"/>
<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:BasicShapes.circle"/>
<toolbar:toolbaritem xlink:href=".uno:Arc" toolbar:visible="false" toolbar:helpid="10114"/>
<toolbar:toolbaritem xlink:href=".uno:Pie" toolbar:visible="false" toolbar:helpid="10112"/>
<toolbar:toolbaritem xlink:href=".uno:CircleCut" toolbar:visible="false" toolbar:helpid="10115"/>
<toolbar:toolbaritem xlink:href=".uno:BasicShapes.isosceles-triangle"/>
- <toolbar:toolbaritem xlink:href=".uno:BasicShapes.right-triangle" toolbar:visible="false"/>
+ <toolbar:toolbaritem xlink:href=".uno:BasicShapes.right-triangle"/>
<toolbar:toolbarseparator/>
<toolbar:toolbaritem xlink:href=".uno:BasicShapes" toolbar:helpid="11002"/>
<toolbar:toolbaritem xlink:href=".uno:SymbolShapes" toolbar:helpid="11003"/>
diff --git a/sc/uiconfig/scalc/toolbar/formatobjectbar.xml b/sc/uiconfig/scalc/toolbar/formatobjectbar.xml
index 6c2deea4b218..800db8db56cf 100644
--- a/sc/uiconfig/scalc/toolbar/formatobjectbar.xml
+++ b/sc/uiconfig/scalc/toolbar/formatobjectbar.xml
@@ -24,6 +24,8 @@
<toolbar:toolbaritem xlink:href=".uno:CharFontName"/>
<toolbar:toolbarseparator/>
<toolbar:toolbaritem xlink:href=".uno:FontHeight"/>
+ <toolbar:toolbaritem xlink:href=".uno:Grow" toolbar:visible="false"/>
+ <toolbar:toolbaritem xlink:href=".uno:Shrink" toolbar:visible="false"/>
<toolbar:toolbarseparator/>
<toolbar:toolbaritem xlink:href=".uno:Bold"/>
<toolbar:toolbaritem xlink:href=".uno:Italic"/>
diff --git a/sc/uiconfig/scalc/toolbar/standardbar.xml b/sc/uiconfig/scalc/toolbar/standardbar.xml
index c3d5c5d3ba7e..bbd8f42aebbd 100644
--- a/sc/uiconfig/scalc/toolbar/standardbar.xml
+++ b/sc/uiconfig/scalc/toolbar/standardbar.xml
@@ -59,6 +59,7 @@
<toolbar:toolbaritem xlink:href=".uno:SortDescending"/>
<toolbar:toolbaritem xlink:href=".uno:DataFilterAutoFilter"/>
<toolbar:toolbaritem xlink:href=".uno:DataFilterStandardFilter" toolbar:visible="false"/>
+ <toolbar:toolbaritem xlink:href=".uno:DataFilterSpecialFilter" toolbar:visible="false"/>
<toolbar:toolbaritem xlink:href=".uno:GoalSeekDialog" toolbar:visible="false"/>
<toolbar:toolbarseparator/>
<toolbar:toolbaritem xlink:href=".uno:InsertGraphic"/>