summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorYousuf Philips <philipz85@hotmail.com>2016-06-09 23:18:03 +0400
committerCaolán McNamara <caolanm@redhat.com>2016-06-12 19:32:37 +0000
commita10af9dbf2f6ed600f857b2fec9dae8362f9545e (patch)
tree8205f60702ad34e8aa0a9d3a0215793ad482f364
parent49c73926554dab691978b6d6c101525d1415a751 (diff)
tdf#92218 tweaks to single toolbar mode toolbars
Change-Id: Ia8311c48dfa116b4557880a48a7299659a10cb0e Reviewed-on: https://gerrit.libreoffice.org/26131 Tested-by: Jenkins <ci@libreoffice.org> Reviewed-by: Yousuf Philips <philipz85@hotmail.com> (cherry picked from commit f72270a6a23e2577cb3b67f154e1ec55df8afadd) Reviewed-on: https://gerrit.libreoffice.org/26192 Reviewed-by: Caolán McNamara <caolanm@redhat.com> Tested-by: Caolán McNamara <caolanm@redhat.com>
-rw-r--r--sc/uiconfig/scalc/toolbar/singlemode.xml6
-rw-r--r--sw/uiconfig/swriter/toolbar/singlemode.xml15
2 files changed, 11 insertions, 10 deletions
diff --git a/sc/uiconfig/scalc/toolbar/singlemode.xml b/sc/uiconfig/scalc/toolbar/singlemode.xml
index fff6ef809f1a..61f00dcb8384 100644
--- a/sc/uiconfig/scalc/toolbar/singlemode.xml
+++ b/sc/uiconfig/scalc/toolbar/singlemode.xml
@@ -55,7 +55,7 @@
<toolbar:toolbaritem xlink:href=".uno:BackgroundColor"/>
<toolbar:toolbaritem xlink:href=".uno:SetBorderStyle"/>
<toolbar:toolbaritem xlink:href=".uno:LineStyle" toolbar:visible="false"/>
- <toolbar:toolbaritem xlink:href=".uno:FrameLineColor"/>
+ <toolbar:toolbaritem xlink:href=".uno:FrameLineColor" toolbar:visible="false"/>
<toolbar:toolbarseparator/>
<toolbar:toolbaritem xlink:href=".uno:AlignLeft"/>
<toolbar:toolbaritem xlink:href=".uno:AlignHorizontalCenter"/>
@@ -75,8 +75,8 @@
<toolbar:toolbaritem xlink:href=".uno:InsertGraphic" toolbar:visible="false"/>
<toolbar:toolbaritem xlink:href=".uno:InsertObjectChart"/>
<toolbar:toolbaritem xlink:href=".uno:DataDataPilotRun"/>
- <toolbar:toolbaritem xlink:href=".uno:InsertAnnotation"/>
- <toolbar:toolbaritem xlink:href=".uno:HyperlinkDialog"/>
+ <toolbar:toolbaritem xlink:href=".uno:InsertAnnotation" toolbar:visible="false"/>
+ <toolbar:toolbaritem xlink:href=".uno:HyperlinkDialog" toolbar:visible="false"/>
<toolbar:toolbarseparator/>
<toolbar:toolbaritem xlink:href=".uno:DataSort"/>
<toolbar:toolbaritem xlink:href=".uno:SortAscending" toolbar:visible="false"/>
diff --git a/sw/uiconfig/swriter/toolbar/singlemode.xml b/sw/uiconfig/swriter/toolbar/singlemode.xml
index a646d4a0b758..fc2d6c8eb6e6 100644
--- a/sw/uiconfig/swriter/toolbar/singlemode.xml
+++ b/sw/uiconfig/swriter/toolbar/singlemode.xml
@@ -28,22 +28,22 @@
<toolbar:toolbaritem xlink:href=".uno:Undo" toolbar:helpid="5701"/>
<toolbar:toolbaritem xlink:href=".uno:Redo" toolbar:helpid="5700"/>
<toolbar:toolbarseparator/>
+ <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:toolbarseparator/>
<toolbar:toolbaritem xlink:href=".uno:Bold"/>
<toolbar:toolbaritem xlink:href=".uno:Italic"/>
<toolbar:toolbaritem xlink:href=".uno:Underline"/>
<toolbar:toolbaritem xlink:href=".uno:Strikeout" toolbar:visible="false"/>
<toolbar:toolbaritem xlink:href=".uno:FontColor"/>
<toolbar:toolbaritem xlink:href=".uno:BackColor" toolbar:visible="false"/>
- <toolbar:toolbaritem xlink:href=".uno:FormatPaintbrush" toolbar:helpid="5715"/>
<toolbar:toolbarseparator/>
<toolbar:toolbaritem xlink:href=".uno:LeftPara"/>
<toolbar:toolbaritem xlink:href=".uno:CenterPara"/>
<toolbar:toolbaritem xlink:href=".uno:RightPara"/>
<toolbar:toolbaritem xlink:href=".uno:JustifyPara"/>
<toolbar:toolbarseparator/>
- <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:StyleApply"/>
<toolbar:toolbaritem xlink:href=".uno:StyleUpdateByExample" toolbar:visible="false"/>
<toolbar:toolbaritem xlink:href=".uno:StyleNewByExample" toolbar:visible="false"/>
@@ -61,9 +61,10 @@
<toolbar:toolbarseparator/>
<toolbar:toolbaritem xlink:href=".uno:InsertTable" toolbar:helpid="20330"/>
<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:SpellingAndGrammarDialog" toolbar:visible="false" toolbar:helpid="20622"/>
- <toolbar:toolbaritem xlink:href=".uno:SearchDialog"/>
- <toolbar:toolbaritem xlink:href=".uno:ControlCodes" toolbar:helpid="20224"/>
+ <toolbar:toolbaritem xlink:href=".uno:TrackChanges"/>
+ <toolbar:toolbaritem xlink:href=".uno:ControlCodes"/>
<toolbar:toolbaritem xlink:href=".uno:Zoom" toolbar:visible="false"/>
</toolbar:toolbar>