summaryrefslogtreecommitdiff
path: root/sc/uiconfig/scalc/toolbar
diff options
context:
space:
mode:
authorYousuf Philips <philipz85@hotmail.com>2014-11-14 04:49:55 +0400
committerCaolán McNamara <caolanm@redhat.com>2014-11-18 09:33:55 +0000
commit124f5f0d14e1609c4a70d0573f10b669506c1d6f (patch)
tree428a39b76eea203179af60817f1be7e711657cac /sc/uiconfig/scalc/toolbar
parent9e5a221f4e530873b19df1b280bb19124b8d8c68 (diff)
fdo#85594 moving merge cells to standard toolbar
Change-Id: I73b199458e23ffafc269c9683ca30ec87b41f770 Reviewed-on: https://gerrit.libreoffice.org/12417 Reviewed-by: Caolán McNamara <caolanm@redhat.com> Tested-by: Caolán McNamara <caolanm@redhat.com>
Diffstat (limited to 'sc/uiconfig/scalc/toolbar')
-rw-r--r--sc/uiconfig/scalc/toolbar/formatobjectbar.xml2
-rw-r--r--sc/uiconfig/scalc/toolbar/standardbar.xml3
2 files changed, 3 insertions, 2 deletions
diff --git a/sc/uiconfig/scalc/toolbar/formatobjectbar.xml b/sc/uiconfig/scalc/toolbar/formatobjectbar.xml
index 77e8ecda6705..d6d7c2ad5e7d 100644
--- a/sc/uiconfig/scalc/toolbar/formatobjectbar.xml
+++ b/sc/uiconfig/scalc/toolbar/formatobjectbar.xml
@@ -41,7 +41,7 @@
<toolbar:toolbaritem xlink:href=".uno:AlignRight" toolbar:style="radio auto"/>
<toolbar:toolbaritem xlink:href=".uno:AlignBlock" toolbar:style="radio auto" toolbar:visible="false"/>
<toolbar:toolbarseparator/>
- <toolbar:toolbaritem xlink:href=".uno:ToggleMergeCells"/>
+ <toolbar:toolbaritem xlink:href=".uno:ToggleMergeCells" toolbar:visible="false"/>
<toolbar:toolbaritem xlink:href=".uno:WrapText"/>
<toolbar:toolbarseparator/>
<toolbar:toolbaritem xlink:href=".uno:ParaLeftToRight" toolbar:style="radio"/>
diff --git a/sc/uiconfig/scalc/toolbar/standardbar.xml b/sc/uiconfig/scalc/toolbar/standardbar.xml
index 23b69275316f..7cce2b299d8d 100644
--- a/sc/uiconfig/scalc/toolbar/standardbar.xml
+++ b/sc/uiconfig/scalc/toolbar/standardbar.xml
@@ -46,6 +46,7 @@
<toolbar:toolbaritem xlink:href=".uno:SearchDialog"/>
<toolbar:toolbaritem xlink:href=".uno:Navigator" toolbar:visible="false"/>
<toolbar:toolbarseparator/>
+ <toolbar:toolbaritem xlink:href=".uno:ToggleMergeCells"/>
<toolbar:toolbaritem xlink:href=".uno:InsertRows"/>
<toolbar:toolbaritem xlink:href=".uno:DeleteRows"/>
<toolbar:toolbaritem xlink:href=".uno:InsertColumns"/>
@@ -55,12 +56,12 @@
<toolbar:toolbaritem xlink:href=".uno:SortAscending"/>
<toolbar:toolbaritem xlink:href=".uno:SortDescending"/>
<toolbar:toolbaritem xlink:href=".uno:DataFilterAutoFilter"/>
- <toolbar:toolbaritem xlink:href=".uno:DataDataPilotRun" toolbar:visible="false"/>
<toolbar:toolbarseparator/>
<toolbar:toolbaritem xlink:href=".uno:InsertGraphic"/>
<toolbar:toolbaritem xlink:href=".uno:InsertObjectChart"/>
<toolbar:toolbaritem xlink:href=".uno:Gallery" toolbar:visible="false"/>
<toolbar:toolbaritem xlink:href=".uno:HyperlinkDialog"/>
+ <toolbar:toolbaritem xlink:href=".uno:DataDataPilotRun" toolbar:visible="false"/>
<toolbar:toolbaritem xlink:href=".uno:InsertAnnotation" toolbar:visible="false"/>
<toolbar:toolbaritem xlink:href=".uno:InsertDraw" toolbar:visible="false"/>
<toolbar:toolbarseparator/>