[Libreoffice-commits] core.git: Branch 'libreoffice-6-0' - sw/uiconfig

[Yousuf Philips]

 sw/uiconfig/swriter/toolbar/standardbar.xml  |    3 ++-
 sw/uiconfig/swriter/toolbar/textstylebar.xml |    9 ++++++---
 2 files changed, 8 insertions(+), 4 deletions(-)

New commits:
commit 71604ca2ecebb78af6b8bb6b3ec1d9deae19dd1b
Author: Yousuf Philips <philipz85 at hotmail.com>
Date:   Tue Dec 19 03:56:19 2017 +0400

    Writer: Restore old symbol button and add new numbering styles
    
    Change-Id: I458ad3fe6c19cd5c65a4beb4758e0ac9aba630a4
    Reviewed-on: https://gerrit.libreoffice.org/46757
    Reviewed-by: Yousuf Philips <philipz85 at hotmail.com>
    Tested-by: Yousuf Philips <philipz85 at hotmail.com>
    (cherry picked from commit 490287a1b22411f4ac32127c93228e06dad4ff22)
    Reviewed-on: https://gerrit.libreoffice.org/46878
    Tested-by: Jenkins <ci at libreoffice.org>
    Reviewed-by: Heiko Tietze <tietze.heiko at gmail.com>
    Tested-by: Heiko Tietze <tietze.heiko at gmail.com>

diff --git a/sw/uiconfig/swriter/toolbar/standardbar.xml b/sw/uiconfig/swriter/toolbar/standardbar.xml
index 10c5b6edf05b..386aef671eb1 100644
--- a/sw/uiconfig/swriter/toolbar/standardbar.xml
+++ b/sw/uiconfig/swriter/toolbar/standardbar.xml
@@ -60,8 +60,9 @@
  <toolbar:toolbarseparator/>
  <toolbar:toolbaritem xlink:href=".uno:InsertPagebreak"/>
  <toolbar:toolbaritem xlink:href=".uno:InsertFieldCtrl"/>
+ <toolbar:toolbaritem xlink:href=".uno:InsertSymbol"/>
+ <toolbar:toolbaritem xlink:href=".uno:CharmapControl" toolbar:visible="false"/>
  <toolbar:toolbaritem xlink:href=".uno:EmojiControl" toolbar:visible="false"/>
- <toolbar:toolbaritem xlink:href=".uno:CharmapControl"/>
  <toolbar:toolbarseparator/>
  <toolbar:toolbaritem xlink:href=".uno:HyperlinkDialog"/>
  <toolbar:toolbaritem xlink:href=".uno:InsertFootnote"/>
diff --git a/sw/uiconfig/swriter/toolbar/textstylebar.xml b/sw/uiconfig/swriter/toolbar/textstylebar.xml
index 7aa997f75984..8b1706705b27 100644
--- a/sw/uiconfig/swriter/toolbar/textstylebar.xml
+++ b/sw/uiconfig/swriter/toolbar/textstylebar.xml
@@ -73,9 +73,12 @@
  <!-- These command can be enabled when tdf#107000 is fixed -->
  <toolbar:toolbaritem xlink:href=".uno:StyleApply" toolbar:text="List Styles" toolbar:visible="false"/>
  <toolbar:toolbarseparator/>
- <toolbar:toolbaritem xlink:href=".uno:BulletListStyle" toolbar:text="Bullet"/>
- <toolbar:toolbaritem xlink:href=".uno:NumberListStyle" toolbar:text="Number"/>
- <toolbar:toolbaritem xlink:href=".uno:RomanListStyle" toolbar:text="Roman"/>
+ <toolbar:toolbaritem xlink:href=".uno:BulletListStyle"/>
+ <toolbar:toolbaritem xlink:href=".uno:NumberListStyle"/>
+ <toolbar:toolbaritem xlink:href=".uno:AlphaListStyle"/>
+ <toolbar:toolbaritem xlink:href=".uno:AlphaLowListStyle"/>
+ <toolbar:toolbaritem xlink:href=".uno:RomanListStyle"/>
+ <toolbar:toolbaritem xlink:href=".uno:RomanLowListStyle"/>
  <toolbar:toolbarseparator/>
  <toolbar:toolbaritem xlink:href=".uno:LeftPara"/>
  <toolbar:toolbaritem xlink:href=".uno:CenterPara"/>