sw/uiconfig/swriter/toolbar/drawbar.xml | 15 ++++++++-------
sw/uiconfig/swriter/toolbar/drawingobjectbar.xml | 7 +++++--
sw/uiconfig/swriter/toolbar/standardbar.xml | 2 +-
sw/uiconfig/swriter/toolbar/tableobjectbar.xml | 8 ++++----
4 files changed, 18 insertions(+), 14 deletions(-)
New commits:
commit ff9fde527ec05a71c27fa3109ef4b57216f785dd
Author: Yousuf Philips <philip...@hotmail.com>
Date: Wed Mar 25 00:35:11 2015 +0400
tdf#81475 Fix missing space in standard toolbar and rearranged other
toolbars
Change-Id: I7b923da346edd359cfec3b1c4d1b1f1860df79bf
Reviewed-on: https://gerrit.libreoffice.org/14990
Tested-by: Yousuf Philips <philip...@hotmail.com>
Reviewed-by: Yousuf Philips <philip...@hotmail.com>
diff --git a/sw/uiconfig/swriter/toolbar/drawbar.xml
b/sw/uiconfig/swriter/toolbar/drawbar.xml
index b31c198..e3ab05e 100644
--- a/sw/uiconfig/swriter/toolbar/drawbar.xml
+++ b/sw/uiconfig/swriter/toolbar/drawbar.xml
@@ -23,17 +23,18 @@
<toolbar:toolbaritem xlink:href=".uno:Line" toolbar:helpid="10102"/>
<toolbar:toolbaritem xlink:href=".uno:BasicShapes.rectangle"
toolbar:helpid="10104"/>
<toolbar:toolbaritem xlink:href=".uno:BasicShapes.ellipse"
toolbar:helpid="10110"/>
- <toolbar:toolbaritem xlink:href=".uno:Polygon_Unfilled"
toolbar:visible="false" toolbar:helpid="10395"/>
- <toolbar:toolbaritem xlink:href=".uno:Bezier_Unfilled"
toolbar:visible="false" toolbar:helpid="10397"/>
+ <toolbar:toolbaritem xlink:href=".uno:DrawCaption" toolbar:helpid="10254"/>
+ <toolbar:toolbaritem xlink:href=".uno:VerticalCaption"
toolbar:helpid="10906"/>
+ <toolbar:toolbarseparator/>
<toolbar:toolbaritem xlink:href=".uno:Freeline_Unfilled"
toolbar:helpid="10464"/>
+ <toolbar:toolbaritem xlink:href=".uno:Bezier_Unfilled"
toolbar:helpid="10397"/>
+ <toolbar:toolbaritem xlink:href=".uno:Polygon_Unfilled"
toolbar:helpid="10395"/>
<toolbar:toolbaritem xlink:href=".uno:Arc" toolbar:visible="false"
toolbar:helpid="10114"/>
<toolbar:toolbaritem xlink:href=".uno:Pie" toolbar:visible="false"
toolbar:helpid="10112"/>
<toolbar:toolbaritem xlink:href=".uno:CircleCut" toolbar:visible="false"
toolbar:helpid="10115"/>
- <toolbar:toolbaritem xlink:href=".uno:DrawText" toolbar:helpid="10253"/>
- <toolbar:toolbaritem xlink:href=".uno:VerticalText" toolbar:helpid="10905"/>
+ <toolbar:toolbaritem xlink:href=".uno:DrawText" toolbar:helpid="10253"
toolbar:visible="false"/>
+ <toolbar:toolbaritem xlink:href=".uno:VerticalText" toolbar:helpid="10905"
toolbar:visible="false"/>
<toolbar:toolbaritem xlink:href=".uno:Text_Marquee" toolbar:visible="false"
toolbar:helpid="10465"/>
- <toolbar:toolbaritem xlink:href=".uno:DrawCaption" toolbar:helpid="10254"/>
- <toolbar:toolbaritem xlink:href=".uno:VerticalCaption"
toolbar:helpid="10906"/>
<toolbar:toolbarseparator/>
<toolbar:toolbaritem xlink:href=".uno:BasicShapes" toolbar:helpid="11002"/>
<toolbar:toolbaritem xlink:href=".uno:SymbolShapes" toolbar:helpid="11003"/>
@@ -45,7 +46,7 @@
<toolbar:toolbaritem xlink:href=".uno:ToggleObjectBezierMode"
toolbar:helpid="10126"/>
<toolbar:toolbarseparator/>
<toolbar:toolbaritem xlink:href=".uno:FontworkGalleryFloater"
toolbar:helpid="10977"/>
- <toolbar:toolbaritem xlink:href=".uno:InsertGraphic" toolbar:helpid="10241"/>
+ <toolbar:toolbaritem xlink:href=".uno:InsertGraphic" toolbar:helpid="10241"
toolbar:visible="false"/>
<toolbar:toolbarseparator/>
<toolbar:toolbaritem xlink:href=".uno:ExtrusionToggle"
toolbar:helpid="10960"/>
</toolbar:toolbar>
diff --git a/sw/uiconfig/swriter/toolbar/drawingobjectbar.xml
b/sw/uiconfig/swriter/toolbar/drawingobjectbar.xml
index 376a501..ef68b95 100644
--- a/sw/uiconfig/swriter/toolbar/drawingobjectbar.xml
+++ b/sw/uiconfig/swriter/toolbar/drawingobjectbar.xml
@@ -46,12 +46,15 @@
<toolbar:toolbarseparator/>
<toolbar:toolbaritem xlink:href=".uno:SetObjectToForeground"
toolbar:helpid="10283"/>
<toolbar:toolbaritem xlink:href=".uno:SetObjectToBackground"
toolbar:helpid="10282"/>
+ <toolbar:toolbarseparator/>
<toolbar:toolbaritem xlink:href=".uno:BringToFront" toolbar:helpid="10286"/>
+ <toolbar:toolbaritem xlink:href=".uno:ObjectForwardOne"/>
+ <toolbar:toolbaritem xlink:href=".uno:ObjectBackOne"/>
<toolbar:toolbaritem xlink:href=".uno:SendToBack" toolbar:helpid="10287"/>
- <toolbar:toolbaritem xlink:href=".uno:ObjectAlign" toolbar:helpid="10130"/>
<toolbar:toolbarseparator/>
+ <toolbar:toolbaritem xlink:href=".uno:ObjectAlign" toolbar:helpid="10130"/>
<toolbar:toolbaritem xlink:href=".uno:ToggleAnchorType"
toolbar:helpid="20349"/>
<toolbar:toolbarseparator/>
<toolbar:toolbaritem xlink:href=".uno:FormatUngroup" toolbar:helpid="10455"/>
<toolbar:toolbaritem xlink:href=".uno:FormatGroup" toolbar:helpid="10454"/>
-</toolbar:toolbar>
\ No newline at end of file
+</toolbar:toolbar>
diff --git a/sw/uiconfig/swriter/toolbar/standardbar.xml
b/sw/uiconfig/swriter/toolbar/standardbar.xml
index 88c28bd..4910fb8 100644
--- a/sw/uiconfig/swriter/toolbar/standardbar.xml
+++ b/sw/uiconfig/swriter/toolbar/standardbar.xml
@@ -67,7 +67,7 @@
<toolbar:toolbaritem xlink:href=".uno:InsertIndexesEntry"
toolbar:visible="false"/>
<toolbar:toolbarseparator/>
<toolbar:toolbaritem xlink:href=".uno:InsertAnnotation"
toolbar:helpid="20329"/>
- <toolbar:toolbaritem
xlink:href=".uno:ShowTrackedChanges"toolbar:visible="false"/>
+ <toolbar:toolbaritem xlink:href=".uno:ShowTrackedChanges"
toolbar:visible="false"/>
<toolbar:toolbaritem xlink:href=".uno:TrackChanges"/>
<toolbar:toolbarseparator/>
<toolbar:toolbaritem xlink:href=".uno:Line" toolbar:helpid="10102"/>
diff --git a/sw/uiconfig/swriter/toolbar/tableobjectbar.xml
b/sw/uiconfig/swriter/toolbar/tableobjectbar.xml
index 7c41027..48fa579 100644
--- a/sw/uiconfig/swriter/toolbar/tableobjectbar.xml
+++ b/sw/uiconfig/swriter/toolbar/tableobjectbar.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:id="toolbar">
- <toolbar:toolbaritem xlink:href=".uno:TableDialog"/>
+ <toolbar:toolbaritem xlink:href=".uno:TableDialog" toolbar:visible="false"/>
<toolbar:toolbarseparator/>
<toolbar:toolbaritem xlink:href=".uno:InsertRows"/>
<toolbar:toolbaritem xlink:href=".uno:InsertColumns"/>
@@ -46,9 +46,9 @@
<toolbar:toolbaritem xlink:href=".uno:LineStyle"/>
<toolbar:toolbaritem xlink:href=".uno:FrameLineColor"/>
<toolbar:toolbarseparator/>
+ <toolbar:toolbaritem xlink:href=".uno:InsertCaptionDialog"/>
+ <toolbar:toolbaritem xlink:href=".uno:TableSort"/>
+ <toolbar:toolbarseparator/>
<toolbar:toolbaritem xlink:href=".uno:AutoSum"/>
<toolbar:toolbaritem xlink:href=".uno:InsertFormula"/>
- <toolbar:toolbarseparator/>
- <toolbar:toolbaritem xlink:href=".uno:TableSort"/>
- <toolbar:toolbaritem xlink:href=".uno:InsertCaptionDialog"/>
</toolbar:toolbar>
_______________________________________________
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
