[Libreoffice-commits] core.git: Branch 'libreoffice-5-4' - sc/uiconfig

[Yousuf Philips]

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

New commits:
commit 8890b3a38f8bb628c526a2078265de6e066a6336
Author: Yousuf Philips <philipz85 at hotmail.com>
Date:   Sun May 28 01:14:56 2017 +0400

    tdf#85594 Add reset default formatting to standard toolbar
    
    Also change underline split button to regular button.
    
    Change-Id: Ie483c3e5454eac45d1fa0f3c48b009cb369a19e3
    Reviewed-on: https://gerrit.libreoffice.org/38008
    Reviewed-by: Yousuf Philips <philipz85 at hotmail.com>
    Tested-by: Yousuf Philips <philipz85 at hotmail.com>
    (cherry picked from commit 76c74cfe6db292cb69495887cb2efcb6d52b204b)
    Reviewed-on: https://gerrit.libreoffice.org/38094
    Reviewed-by: Eike Rathke <erack at redhat.com>
    Tested-by: Eike Rathke <erack at redhat.com>

diff --git a/sc/uiconfig/scalc/toolbar/formatobjectbar.xml b/sc/uiconfig/scalc/toolbar/formatobjectbar.xml
index 800db8db56cf..2529c84dbd47 100644
--- a/sc/uiconfig/scalc/toolbar/formatobjectbar.xml
+++ b/sc/uiconfig/scalc/toolbar/formatobjectbar.xml
@@ -29,7 +29,7 @@
  <toolbar:toolbarseparator/>
  <toolbar:toolbaritem xlink:href=".uno:Bold"/>
  <toolbar:toolbaritem xlink:href=".uno:Italic"/>
- <toolbar:toolbaritem xlink:href=".uno:Underline"/>
+ <toolbar:toolbaritem xlink:href=".uno:UnderlineSimple"/>
  <toolbar:toolbaritem xlink:href=".uno:UnderlineDouble" toolbar:visible="false"/>
  <toolbar:toolbaritem xlink:href=".uno:Strikeout" toolbar:visible="false"/>
  <toolbar:toolbaritem xlink:href=".uno:SuperScript" toolbar:visible="false"/>
diff --git a/sc/uiconfig/scalc/toolbar/standardbar.xml b/sc/uiconfig/scalc/toolbar/standardbar.xml
index cdb3aa37fac8..0d4656e9d467 100644
--- a/sc/uiconfig/scalc/toolbar/standardbar.xml
+++ b/sc/uiconfig/scalc/toolbar/standardbar.xml
@@ -37,7 +37,9 @@
  <toolbar:toolbaritem xlink:href=".uno:Cut"/>
  <toolbar:toolbaritem xlink:href=".uno:Copy"/>
  <toolbar:toolbaritem xlink:href=".uno:Paste"/>
+ <toolbar:toolbarseparator/>
  <toolbar:toolbaritem xlink:href=".uno:FormatPaintbrush"/>
+ <toolbar:toolbaritem xlink:href=".uno:ResetAttributes"/>
  <toolbar:toolbarseparator/>
  <toolbar:toolbaritem xlink:href=".uno:Undo"/>
  <toolbar:toolbaritem xlink:href=".uno:Redo"/>
diff --git a/sc/uiconfig/scalc/toolbar/textobjectbar.xml b/sc/uiconfig/scalc/toolbar/textobjectbar.xml
index ed59a1451780..d84a5e4f1914 100644
--- a/sc/uiconfig/scalc/toolbar/textobjectbar.xml
+++ b/sc/uiconfig/scalc/toolbar/textobjectbar.xml
@@ -24,7 +24,7 @@
  <toolbar:toolbarseparator/>
  <toolbar:toolbaritem xlink:href=".uno:Bold"/>
  <toolbar:toolbaritem xlink:href=".uno:Italic"/>
- <toolbar:toolbaritem xlink:href=".uno:Underline"/>
+ <toolbar:toolbaritem xlink:href=".uno:UnderlineSimple"/>
  <toolbar:toolbaritem xlink:href=".uno:UnderlineDouble" toolbar:visible="false"/>
  <toolbar:toolbaritem xlink:href=".uno:Overline" toolbar:visible="false"/>
  <toolbar:toolbaritem xlink:href=".uno:Strikeout"/>