sc/uiconfig/scalc/toolbar/singlemode.xml   |    7 ++++---
 sw/uiconfig/swriter/toolbar/singlemode.xml |   12 ++++++++++--
 2 files changed, 14 insertions(+), 5 deletions(-)

New commits:
commit 9b92999a7213c8a6918544bffd9962062bf99584
Author: Yousuf Philips <[email protected]>
Date:   Mon Aug 15 01:20:01 2016 +0400

    tdf#92218 Another round of tweaks to single toolbar mode
    
    Change-Id: I685687df630fe1905f18476be8c0266546048ceb
    Reviewed-on: https://gerrit.libreoffice.org/28108
    Reviewed-by: Yousuf Philips <[email protected]>
    Tested-by: Yousuf Philips <[email protected]>

diff --git a/sc/uiconfig/scalc/toolbar/singlemode.xml 
b/sc/uiconfig/scalc/toolbar/singlemode.xml
index 61f00dc..672ecac 100644
--- a/sc/uiconfig/scalc/toolbar/singlemode.xml
+++ b/sc/uiconfig/scalc/toolbar/singlemode.xml
@@ -18,7 +18,7 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
 -->
 <toolbar:toolbar xmlns:toolbar="http://openoffice.org/2001/toolbar"; 
xmlns:xlink="http://www.w3.org/1999/xlink";>
- <toolbar:toolbaritem xlink:href=".uno:AddDirect"/>
+ <toolbar:toolbaritem xlink:href=".uno:AddDirect" toolbar:visible="false"/>
  <toolbar:toolbaritem xlink:href=".uno:OpenFromCalc"/>
  <toolbar:toolbaritem xlink:href=".uno:Save"/>
  <toolbar:toolbaritem xlink:href=".uno:ExportDirectToPDF" 
toolbar:visible="false"/>
@@ -41,6 +41,7 @@
  <toolbar:toolbaritem xlink:href=".uno:NumberFormatDecDecimals"/>
  <toolbar:toolbarseparator/>
  <toolbar:toolbaritem xlink:href=".uno:StyleApply" toolbar:visible="false"/>
+ <toolbar:toolbarseparator/>
  <toolbar:toolbaritem xlink:href=".uno:CharFontName"/>
  <toolbar:toolbarseparator/>
  <toolbar:toolbaritem xlink:href=".uno:FontHeight"/>
@@ -61,14 +62,14 @@
  <toolbar:toolbaritem xlink:href=".uno:AlignHorizontalCenter"/>
  <toolbar:toolbaritem xlink:href=".uno:AlignRight"/>
  <toolbar:toolbaritem xlink:href=".uno:AlignBlock" toolbar:visible="false"/>
+ <toolbar:toolbarseparator/>
  <toolbar:toolbaritem xlink:href=".uno:WrapText"/>
+ <toolbar:toolbaritem xlink:href=".uno:ToggleMergeCells"/>
  <toolbar:toolbarseparator/>
  <toolbar:toolbaritem xlink:href=".uno:AlignTop"/>
  <toolbar:toolbaritem xlink:href=".uno:AlignVCenter"/>
  <toolbar:toolbaritem xlink:href=".uno:AlignBottom"/>
  <toolbar:toolbarseparator/>
- <toolbar:toolbaritem xlink:href=".uno:ToggleMergeCells" 
toolbar:visible="false"/>
- <toolbar:toolbarseparator/>
  <toolbar:toolbaritem xlink:href=".uno:IncrementIndent" 
toolbar:visible="false"/>
  <toolbar:toolbaritem xlink:href=".uno:DecrementIndent" 
toolbar:visible="false"/>
  <toolbar:toolbarseparator/>
diff --git a/sw/uiconfig/swriter/toolbar/singlemode.xml 
b/sw/uiconfig/swriter/toolbar/singlemode.xml
index fc2d6c8..1fb5891 100644
--- a/sw/uiconfig/swriter/toolbar/singlemode.xml
+++ b/sw/uiconfig/swriter/toolbar/singlemode.xml
@@ -18,7 +18,7 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
 -->
 <toolbar:toolbar xmlns:toolbar="http://openoffice.org/2001/toolbar"; 
xmlns:xlink="http://www.w3.org/1999/xlink";>
- <toolbar:toolbaritem xlink:href=".uno:AddDirect" toolbar:helpid="5537"/>
+ <toolbar:toolbaritem xlink:href=".uno:AddDirect" toolbar:helpid="5537" 
toolbar:visible="false"/>
  <toolbar:toolbaritem xlink:href=".uno:OpenFromWriter"/>
  <toolbar:toolbaritem xlink:href=".uno:Save" toolbar:helpid="5505"/>
  <toolbar:toolbaritem xlink:href=".uno:ExportDirectToPDF" 
toolbar:visible="false" toolbar:helpid="6674"/>
@@ -31,6 +31,7 @@
  <toolbar:toolbaritem xlink:href=".uno:SearchDialog"/>
  <toolbar:toolbaritem xlink:href=".uno:FormatPaintbrush" 
toolbar:helpid="5715"/>
  <toolbar:toolbaritem xlink:href=".uno:SpellingAndGrammarDialog" 
toolbar:visible="false" toolbar:helpid="20622"/>
+ <toolbar:toolbaritem xlink:href=".uno:Zoom" toolbar:visible="false"/>
  <toolbar:toolbarseparator/>
  <toolbar:toolbaritem xlink:href=".uno:Bold"/>
  <toolbar:toolbaritem xlink:href=".uno:Italic"/>
@@ -39,6 +40,11 @@
  <toolbar:toolbaritem xlink:href=".uno:FontColor"/>
  <toolbar:toolbaritem xlink:href=".uno:BackColor" toolbar:visible="false"/>
  <toolbar:toolbarseparator/>
+ <toolbar:toolbaritem xlink:href=".uno:SuperScript" toolbar:visible="false"/>
+ <toolbar:toolbaritem xlink:href=".uno:SubScript" toolbar:visible="false"/>
+ <toolbar:toolbarseparator/>
+ <toolbar:toolbaritem xlink:href=".uno:ResetAttributes" 
toolbar:visible="false"/>
+ <toolbar:toolbarseparator/>
  <toolbar:toolbaritem xlink:href=".uno:LeftPara"/>
  <toolbar:toolbaritem xlink:href=".uno:CenterPara"/>
  <toolbar:toolbaritem xlink:href=".uno:RightPara"/>
@@ -51,6 +57,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:LineSpacing"/>
  <toolbar:toolbarseparator/>
@@ -63,8 +71,8 @@
  <toolbar:toolbaritem xlink:href=".uno:InsertGraphic" toolbar:helpid="10241"/>
  <toolbar:toolbaritem xlink:href=".uno:HyperlinkDialog" toolbar:helpid="5678"/>
  <toolbar:toolbaritem xlink:href=".uno:InsertAnnotation" 
toolbar:helpid="20329"/>
- <toolbar:toolbarseparator/>
  <toolbar:toolbaritem xlink:href=".uno:TrackChanges"/>
+ <toolbar:toolbarseparator/>
  <toolbar:toolbaritem xlink:href=".uno:ControlCodes"/>
  <toolbar:toolbaritem xlink:href=".uno:Zoom" toolbar:visible="false"/>
 </toolbar:toolbar>
_______________________________________________
Libreoffice-commits mailing list
[email protected]
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

Reply via email to