From fe889944d1faa84d4ccf9aae6926f18e392c68f5 Mon Sep 17 00:00:00 2001
From: Yousuf Philips <philipz85@hotmail.com>
Date: Mon, 23 Mar 2015 02:54:15 +0400
Subject: tdf#84909 rearranged the buttons in the standard, drawing and line
 toolbars

Change-Id: I3bc46ee3425cabfac342368ff302e16379227172
Reviewed-on: https://gerrit.libreoffice.org/14957
Tested-by: Yousuf Philips <philipz85@hotmail.com>
Reviewed-by: Yousuf Philips <philipz85@hotmail.com>
---
 sd/uiconfig/sdraw/toolbar/drawingobjectbar.xml |  3 +--
 sd/uiconfig/sdraw/toolbar/linesbar.xml         |  4 +--
 sd/uiconfig/sdraw/toolbar/standardbar.xml      | 17 ++++++-------
 sd/uiconfig/sdraw/toolbar/toolbar.xml          | 35 +++++++++++++-------------
 4 files changed, 29 insertions(+), 30 deletions(-)

(limited to 'sd/uiconfig')

diff --git a/sd/uiconfig/sdraw/toolbar/drawingobjectbar.xml b/sd/uiconfig/sdraw/toolbar/drawingobjectbar.xml
index 1d6b675dfcd9..996beced55e2 100644
--- a/sd/uiconfig/sdraw/toolbar/drawingobjectbar.xml
+++ b/sd/uiconfig/sdraw/toolbar/drawingobjectbar.xml
@@ -25,9 +25,8 @@
  <toolbar:toolbarseparator/>
  <toolbar:toolbaritem xlink:href=".uno:XLineStyle" toolbar:visible="false" toolbar:helpid="10169"/>
  <toolbar:toolbarseparator/>
- <toolbar:toolbaritem xlink:href=".uno:LineWidth" toolbar:visible="false" toolbar:helpid="10171"/>
- <toolbar:toolbarseparator/>
  <toolbar:toolbaritem xlink:href=".uno:XLineColor" toolbar:style="dropdown" toolbar:helpid="10172"/>
+ <toolbar:toolbaritem xlink:href=".uno:LineWidth" toolbar:helpid="10171"/>
  <toolbar:toolbarseparator/>
  <toolbar:toolbaritem xlink:href=".uno:FormatArea" toolbar:visible="false" toolbar:helpid="10142"/>
  <toolbar:toolbarseparator/>
diff --git a/sd/uiconfig/sdraw/toolbar/linesbar.xml b/sd/uiconfig/sdraw/toolbar/linesbar.xml
index 065c842456b1..c1f4d8c7250e 100644
--- a/sd/uiconfig/sdraw/toolbar/linesbar.xml
+++ b/sd/uiconfig/sdraw/toolbar/linesbar.xml
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="UTF-8"?>
+u<?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE toolbar:toolbar PUBLIC "-//OpenOffice.org//DTD OfficeDocument 1.0//EN" "toolbar.dtd">
 <!--
  * This file is part of the LibreOffice project.
@@ -27,4 +27,4 @@
  <toolbar:toolbaritem xlink:href=".uno:Polygon_Unfilled" toolbar:style="radio"/>
  <toolbar:toolbaritem xlink:href=".uno:Polygon_Diagonal_Unfilled" toolbar:style="radio"/>
  <toolbar:toolbaritem xlink:href=".uno:Freeline_Unfilled" toolbar:style="radio"/>
-</toolbar:toolbar>
\ No newline at end of file
+</toolbar:toolbar>
diff --git a/sd/uiconfig/sdraw/toolbar/standardbar.xml b/sd/uiconfig/sdraw/toolbar/standardbar.xml
index ef32191c3193..2efee39003fe 100644
--- a/sd/uiconfig/sdraw/toolbar/standardbar.xml
+++ b/sd/uiconfig/sdraw/toolbar/standardbar.xml
@@ -42,24 +42,18 @@
  <toolbar:toolbarseparator/>
  <toolbar:toolbaritem xlink:href=".uno:SpellDialog" toolbar:helpid="20622"/>
  <toolbar:toolbaritem xlink:href=".uno:SpellOnline" toolbar:visible="false" toolbar:helpid="12021"/>
- <toolbar:toolbaritem xlink:href=".uno:ZoomMode"/>
+ <toolbar:toolbaritem xlink:href=".uno:ZoomMode" toolbar:visible="false"/>
  <toolbar:toolbaritem xlink:href=".uno:ZoomObjects" toolbar:visible="false"/>
  <toolbar:toolbaritem xlink:href=".uno:ZoomToolBox" toolbar:visible="false" toolbar:helpid="10096"/>
- <toolbar:toolbarseparator/>
  <toolbar:toolbaritem xlink:href=".uno:GridVisible"/>
  <toolbar:toolbaritem xlink:href=".uno:HelplinesMove"/>
  <toolbar:toolbarseparator/>
- <toolbar:toolbaritem xlink:href=".uno:InsertGraphic"/>
- <toolbar:toolbaritem xlink:href=".uno:FontworkGalleryFloater"/>
+ <toolbar:toolbaritem xlink:href=".uno:InsertGraphic" toolbar:visible="false"/>
+ <toolbar:toolbaritem xlink:href=".uno:FontworkGalleryFloater" toolbar:visible="false"/>
  <toolbar:toolbaritem xlink:href=".uno:InsertTable" toolbar:visible="false"/>
  <toolbar:toolbaritem xlink:href=".uno:InsertObjectChart" toolbar:helpid="10140" toolbar:visible="false"/>
  <toolbar:toolbaritem xlink:href=".uno:HyperlinkDialog" toolbar:helpid="5678" toolbar:visible="false"/>
  <toolbar:toolbarseparator/>
- <toolbar:toolbaritem xlink:href=".uno:Window3D" toolbar:style="auto" toolbar:visible="false"/>
- <toolbar:toolbarseparator/>
- <toolbar:toolbaritem xlink:href=".uno:HelpIndex" toolbar:visible="false"/>
- <toolbar:toolbaritem xlink:href=".uno:ExtendedHelp" toolbar:visible="false"/>
- <toolbar:toolbarseparator/>
  <toolbar:toolbaritem xlink:href=".uno:AdvancedMode" toolbar:style="radio dropdown"/>
  <toolbar:toolbaritem xlink:href=".uno:Mirror" toolbar:visible="false"/>
  <toolbar:toolbaritem xlink:href=".uno:TransformDialog" toolbar:visible="false"/>
@@ -69,4 +63,9 @@
  <toolbar:toolbarseparator/>
  <toolbar:toolbaritem xlink:href=".uno:FillShadow" toolbar:helpid="10299"/>
  <toolbar:toolbaritem xlink:href=".uno:ImageMapDialog" toolbar:visible="false" toolbar:helpid="10371"/>
+ <toolbar:toolbarseparator/>
+ <toolbar:toolbaritem xlink:href=".uno:Window3D" toolbar:style="auto" toolbar:visible="false"/>
+ <toolbar:toolbarseparator/>
+ <toolbar:toolbaritem xlink:href=".uno:HelpIndex" toolbar:visible="false"/>
+ <toolbar:toolbaritem xlink:href=".uno:ExtendedHelp" toolbar:visible="false"/>
 </toolbar:toolbar>
diff --git a/sd/uiconfig/sdraw/toolbar/toolbar.xml b/sd/uiconfig/sdraw/toolbar/toolbar.xml
index 4f2207ededcf..5466bb6e836e 100644
--- a/sd/uiconfig/sdraw/toolbar/toolbar.xml
+++ b/sd/uiconfig/sdraw/toolbar/toolbar.xml
@@ -19,30 +19,30 @@
 -->
 <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:SelectObject" toolbar:style="radio"/>
- <toolbar:toolbaritem xlink:href=".uno:ZoomMode" toolbar:visible="false"/>
+ <toolbar:toolbaritem xlink:href=".uno:ZoomMode"/>
  <toolbar:toolbaritem xlink:href=".uno:ZoomObjects" toolbar:visible="false"/>
- <toolbar:toolbaritem xlink:href=".uno:Text" toolbar:style="radio"/>
- <toolbar:toolbaritem xlink:href=".uno:VerticalText" toolbar:style="radio"/>
  <toolbar:toolbarseparator/>
  <toolbar:toolbaritem xlink:href=".uno:Line" toolbar:style="radio"/>
- <toolbar:toolbaritem xlink:href=".uno:LineArrowEnd" toolbar:style="radio" toolbar:visible="false"/>
- <toolbar:toolbaritem xlink:href=".uno:BasicShapes.rectangle" toolbar:style="radio"/>
- <toolbar:toolbaritem xlink:href=".uno:BasicShapes.ellipse" toolbar:style="radio"/>
- <toolbar:toolbarseparator/>
- <toolbar:toolbaritem xlink:href=".uno:InsertGraphic" toolbar:visible="false"/>
- <toolbar:toolbaritem xlink:href=".uno:FontworkGalleryFloater" toolbar:visible="false"/>
- <toolbar:toolbarseparator/>
- <toolbar:toolbaritem xlink:href=".uno:ArrowsToolbox" toolbar:helpid=".uno:ArrowsToolbox" toolbar:style="radio dropdown"/>
- <toolbar:toolbaritem xlink:href=".uno:ConnectorToolbox" toolbar:style="radio dropdown"/>
+ <toolbar:toolbaritem xlink:href=".uno:Freeline_Unfilled" toolbar:style="radio"/>
+ <toolbar:toolbaritem xlink:href=".uno:Freeline" toolbar:style="radio" toolbar:visible="false"/>
+ <toolbar:toolbaritem xlink:href=".uno:Bezier_Unfilled" toolbar:style="radio"/>
  <toolbar:toolbaritem xlink:href=".uno:LineToolbox" toolbar:style="radio dropdown"/>
- <toolbar:toolbaritem xlink:href=".uno:Objects3DToolbox" toolbar:style="radio dropdown" toolbar:visible="false"/>
+ <toolbar:toolbaritem xlink:href=".uno:ArrowsToolbox" toolbar:style="radio dropdown" toolbar:visible="false"/>
+ <toolbar:toolbaritem xlink:href=".uno:ConnectorToolbox" toolbar:style="radio dropdown"/>
  <toolbar:toolbarseparator/>
+ <toolbar:toolbaritem xlink:href=".uno:BasicShapes.rectangle" toolbar:style="radio"/>
+ <toolbar:toolbaritem xlink:href=".uno:BasicShapes.ellipse" toolbar:style="radio"/>
  <toolbar:toolbaritem xlink:href=".uno:BasicShapes" toolbar:style="radio dropdown"/>
- <toolbar:toolbaritem xlink:href=".uno:SymbolShapes" toolbar:style="radio dropdown"/>
- <toolbar:toolbaritem xlink:href=".uno:ArrowShapes" toolbar:style="radio dropdown"/>
+ <toolbar:toolbaritem xlink:href=".uno:SymbolShapes" toolbar:style="radio dropdown" toolbar:visible="false"/>
+ <toolbar:toolbaritem xlink:href=".uno:ArrowShapes" toolbar:style="radio dropdown" toolbar:visible="false"/>
  <toolbar:toolbaritem xlink:href=".uno:FlowChartShapes" toolbar:style="radio dropdown"/>
- <toolbar:toolbaritem xlink:href=".uno:CalloutShapes" toolbar:style="radio dropdown"/>
- <toolbar:toolbaritem xlink:href=".uno:StarShapes" toolbar:style="radio dropdown"/>
+ <toolbar:toolbaritem xlink:href=".uno:CalloutShapes" toolbar:style="radio dropdown" toolbar:visible="false"/>
+ <toolbar:toolbaritem xlink:href=".uno:StarShapes" toolbar:style="radio dropdown" toolbar:visible="false"/>
+ <toolbar:toolbarseparator/>
+ <toolbar:toolbaritem xlink:href=".uno:Text" toolbar:style="radio"/>
+ <toolbar:toolbaritem xlink:href=".uno:VerticalText" toolbar:style="radio"/>
+ <toolbar:toolbaritem xlink:href=".uno:InsertGraphic"/>
+ <toolbar:toolbaritem xlink:href=".uno:FontworkGalleryFloater"/>
  <toolbar:toolbarseparator/>
  <toolbar:toolbaritem xlink:href=".uno:ToggleObjectBezierMode" toolbar:helpid="10126"/>
  <toolbar:toolbaritem xlink:href=".uno:GlueEditMode" toolbar:style="auto"/>
@@ -50,6 +50,7 @@
  <toolbar:toolbaritem xlink:href=".uno:ChangePolygon" toolbar:visible="false"/>
  <toolbar:toolbaritem xlink:href=".uno:ConvertInto3D" toolbar:visible="false"/>
  <toolbar:toolbaritem xlink:href=".uno:ConvertInto3DLatheFast" toolbar:visible="false"/>
+ <toolbar:toolbaritem xlink:href=".uno:Objects3DToolbox" toolbar:style="radio dropdown" toolbar:visible="false"/>
  <toolbar:toolbarseparator/>
  <toolbar:toolbaritem xlink:href=".uno:InsertToolbox" toolbar:style="radio dropdown" toolbar:visible="false"/>
  <toolbar:toolbaritem xlink:href=".uno:Config" toolbar:style="dropdown" toolbar:visible="false"/>
-- 
cgit