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

[Yousuf Philips]

 sc/uiconfig/scalc/toolbar/formatobjectbar.xml |    2 +-
 sc/uiconfig/scalc/toolbar/standardbar.xml     |    3 ++-
 2 files changed, 3 insertions(+), 2 deletions(-)

New commits:
commit 124f5f0d14e1609c4a70d0573f10b669506c1d6f
Author: Yousuf Philips <philipz85 at hotmail.com>
Date:   Fri Nov 14 04:49:55 2014 +0400

    fdo#85594 moving merge cells to standard toolbar
    
    Change-Id: I73b199458e23ffafc269c9683ca30ec87b41f770
    Reviewed-on: https://gerrit.libreoffice.org/12417
    Reviewed-by: Caolán McNamara <caolanm at redhat.com>
    Tested-by: Caolán McNamara <caolanm at redhat.com>

diff --git a/sc/uiconfig/scalc/toolbar/formatobjectbar.xml b/sc/uiconfig/scalc/toolbar/formatobjectbar.xml
index 77e8ecd..d6d7c2a 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 23b6927..7cce2b2 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/>