sw/uiconfig/swriter/toolbar/arrowshapes.xml | 32 +++++++++++++-------------
sw/uiconfig/swriter/toolbar/drawbar.xml | 2 -
sw/uiconfig/swriter/toolbar/starshapes.xml | 8 +++---
sw/uiconfig/swriter/toolbar/symbolshapes.xml | 16 ++++++-------
sw/uiconfig/swriter/toolbar/textobjectbar.xml | 4 ++-
5 files changed, 32 insertions(+), 30 deletions(-)
New commits:
commit caef2a4f7649bc7bddbefa7693d9c451758fb896
Author: Yousuf Philips <philipz85 at hotmail.com>
Date: Sat May 30 12:59:51 2015 +0400
tdf#81475 Additional work on the formatting and draw toolbar
Change-Id: Idf8c389915e880cbc4246743d2b6a70d4e99f2e2
Reviewed-on: https://gerrit.libreoffice.org/15992
Tested-by: Jenkins <ci at libreoffice.org>
Reviewed-by: Yousuf Philips <philipz85 at hotmail.com>
(cherry picked from commit 1a8e9dae32997bf199dbd192058fcd8f187ddc49)
Reviewed-on: https://gerrit.libreoffice.org/15997
Reviewed-by: Joren De Cuyper <jorendc at libreoffice.org>
Tested-by: Joren De Cuyper <jorendc at libreoffice.org>
diff --git a/sw/uiconfig/swriter/toolbar/arrowshapes.xml b/sw/uiconfig/swriter/toolbar/arrowshapes.xml
index 69c7d33..b17a7e6 100644
--- a/sw/uiconfig/swriter/toolbar/arrowshapes.xml
+++ b/sw/uiconfig/swriter/toolbar/arrowshapes.xml
@@ -18,34 +18,34 @@
* 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:ArrowShapes.left-arrow"/>
<toolbar:toolbaritem xlink:href=".uno:ArrowShapes.right-arrow"/>
- <toolbar:toolbaritem xlink:href=".uno:ArrowShapes.up-arrow"/>
+ <toolbar:toolbaritem xlink:href=".uno:ArrowShapes.left-arrow"/>
<toolbar:toolbaritem xlink:href=".uno:ArrowShapes.down-arrow"/>
+ <toolbar:toolbaritem xlink:href=".uno:ArrowShapes.up-arrow"/>
<toolbar:toolbaritem xlink:href=".uno:ArrowShapes.left-right-arrow"/>
<toolbar:toolbaritem xlink:href=".uno:ArrowShapes.up-down-arrow"/>
<toolbar:toolbarbreak/>
- <toolbar:toolbaritem xlink:href=".uno:ArrowShapes.up-right-arrow"/>
- <toolbar:toolbaritem xlink:href=".uno:ArrowShapes.up-right-down-arrow"/>
+ <toolbar:toolbaritem xlink:href=".uno:ArrowShapes.circular-arrow"/>
+ <toolbar:toolbaritem xlink:href=".uno:ArrowShapes.s-sharped-arrow"/>
+ <toolbar:toolbaritem xlink:href=".uno:ArrowShapes.split-arrow"/>
+ <toolbar:toolbaritem xlink:href=".uno:ArrowShapes.split-round-arrow"/>
<toolbar:toolbaritem xlink:href=".uno:ArrowShapes.quad-arrow"/>
<toolbar:toolbaritem xlink:href=".uno:ArrowShapes.corner-right-arrow"/>
- <toolbar:toolbaritem xlink:href=".uno:ArrowShapes.split-arrow"/>
- <toolbar:toolbaritem xlink:href=".uno:ArrowShapes.striped-right-arrow"/>
<toolbar:toolbarbreak/>
- <toolbar:toolbaritem xlink:href=".uno:ArrowShapes.notched-right-arrow"/>
- <toolbar:toolbaritem xlink:href=".uno:ArrowShapes.pentagon-right"/>
<toolbar:toolbaritem xlink:href=".uno:ArrowShapes.chevron"/>
+ <toolbar:toolbaritem xlink:href=".uno:ArrowShapes.pentagon-right"/>
+ <toolbar:toolbaritem xlink:href=".uno:ArrowShapes.striped-right-arrow"/>
+ <toolbar:toolbaritem xlink:href=".uno:ArrowShapes.up-right-down-arrow"/>
+ <toolbar:toolbaritem xlink:href=".uno:ArrowShapes.notched-right-arrow"/>
+ <toolbar:toolbaritem xlink:href=".uno:ArrowShapes.up-right-arrow"/>
+ <toolbar:toolbarbreak/>
<toolbar:toolbaritem xlink:href=".uno:ArrowShapes.right-arrow-callout"/>
<toolbar:toolbaritem xlink:href=".uno:ArrowShapes.left-arrow-callout"/>
- <toolbar:toolbaritem xlink:href=".uno:ArrowShapes.up-arrow-callout"/>
- <toolbar:toolbarbreak/>
<toolbar:toolbaritem xlink:href=".uno:ArrowShapes.down-arrow-callout"/>
+ <toolbar:toolbaritem xlink:href=".uno:ArrowShapes.up-arrow-callout"/>
<toolbar:toolbaritem xlink:href=".uno:ArrowShapes.left-right-arrow-callout"/>
<toolbar:toolbaritem xlink:href=".uno:ArrowShapes.up-down-arrow-callout"/>
- <toolbar:toolbaritem xlink:href=".uno:ArrowShapes.up-right-arrow-callout"/>
- <toolbar:toolbaritem xlink:href=".uno:ArrowShapes.quad-arrow-callout"/>
- <toolbar:toolbaritem xlink:href=".uno:ArrowShapes.circular-arrow"/>
<toolbar:toolbarbreak/>
- <toolbar:toolbaritem xlink:href=".uno:ArrowShapes.split-round-arrow"/>
- <toolbar:toolbaritem xlink:href=".uno:ArrowShapes.s-sharped-arrow"/>
-</toolbar:toolbar>
\ No newline at end of file
+ <toolbar:toolbaritem xlink:href=".uno:ArrowShapes.quad-arrow-callout"/>
+ <toolbar:toolbaritem xlink:href=".uno:ArrowShapes.up-right-arrow-callout"/>
+</toolbar:toolbar>
diff --git a/sw/uiconfig/swriter/toolbar/drawbar.xml b/sw/uiconfig/swriter/toolbar/drawbar.xml
index 4bce3dd..df7353b 100644
--- a/sw/uiconfig/swriter/toolbar/drawbar.xml
+++ b/sw/uiconfig/swriter/toolbar/drawbar.xml
@@ -45,9 +45,9 @@
<toolbar:toolbaritem xlink:href=".uno:BasicShapes" toolbar:helpid="11002"/>
<toolbar:toolbaritem xlink:href=".uno:SymbolShapes" toolbar:helpid="11003"/>
<toolbar:toolbaritem xlink:href=".uno:ArrowShapes" toolbar:helpid="11004"/>
- <toolbar:toolbaritem xlink:href=".uno:FlowChartShapes" toolbar:helpid="11005"/>
<toolbar:toolbaritem xlink:href=".uno:StarShapes" toolbar:helpid="11007"/>
<toolbar:toolbaritem xlink:href=".uno:CalloutShapes" toolbar:helpid="11006"/>
+ <toolbar:toolbaritem xlink:href=".uno:FlowChartShapes" toolbar:helpid="11005"/>
<toolbar:toolbarseparator/>
<toolbar:toolbaritem xlink:href=".uno:DrawCaption" toolbar:helpid="10254"/>
<toolbar:toolbaritem xlink:href=".uno:VerticalCaption" toolbar:helpid="10906"/>
diff --git a/sw/uiconfig/swriter/toolbar/starshapes.xml b/sw/uiconfig/swriter/toolbar/starshapes.xml
index 7168e3c..cb7cf6d 100644
--- a/sw/uiconfig/swriter/toolbar/starshapes.xml
+++ b/sw/uiconfig/swriter/toolbar/starshapes.xml
@@ -18,17 +18,17 @@
* 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:StarShapes.bang"/>
<toolbar:toolbaritem xlink:href=".uno:StarShapes.star4"/>
<toolbar:toolbaritem xlink:href=".uno:StarShapes.star5"/>
<toolbar:toolbaritem xlink:href=".uno:StarShapes.star6"/>
<toolbar:toolbaritem xlink:href=".uno:StarShapes.star8"/>
<toolbar:toolbaritem xlink:href=".uno:StarShapes.star12"/>
- <toolbar:toolbarbreak/>
<toolbar:toolbaritem xlink:href=".uno:StarShapes.star24"/>
- <toolbar:toolbaritem xlink:href=".uno:StarShapes.concave-star6"/>
+ <toolbar:toolbarseparator/>
+ <toolbar:toolbaritem xlink:href=".uno:StarShapes.bang"/>
<toolbar:toolbaritem xlink:href=".uno:StarShapes.vertical-scroll"/>
<toolbar:toolbaritem xlink:href=".uno:StarShapes.horizontal-scroll"/>
<toolbar:toolbaritem xlink:href=".uno:StarShapes.signet"/>
<toolbar:toolbaritem xlink:href=".uno:StarShapes.doorplate"/>
-</toolbar:toolbar>
\ No newline at end of file
+ <toolbar:toolbaritem xlink:href=".uno:StarShapes.concave-star6"/>
+</toolbar:toolbar>
diff --git a/sw/uiconfig/swriter/toolbar/symbolshapes.xml b/sw/uiconfig/swriter/toolbar/symbolshapes.xml
index 1d4afe7..f981c14 100644
--- a/sw/uiconfig/swriter/toolbar/symbolshapes.xml
+++ b/sw/uiconfig/swriter/toolbar/symbolshapes.xml
@@ -19,23 +19,23 @@
-->
<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:SymbolShapes.smiley"/>
+ <toolbar:toolbaritem xlink:href=".uno:SymbolShapes.heart"/>
<toolbar:toolbaritem xlink:href=".uno:SymbolShapes.sun"/>
<toolbar:toolbaritem xlink:href=".uno:SymbolShapes.moon"/>
+ <toolbar:toolbaritem xlink:href=".uno:SymbolShapes.cloud"/>
<toolbar:toolbaritem xlink:href=".uno:SymbolShapes.lightning"/>
- <toolbar:toolbaritem xlink:href=".uno:SymbolShapes.heart"/>
+ <toolbar:toolbarseparator/>
<toolbar:toolbaritem xlink:href=".uno:SymbolShapes.flower"/>
- <toolbar:toolbarbreak/>
- <toolbar:toolbaritem xlink:href=".uno:SymbolShapes.cloud"/>
<toolbar:toolbaritem xlink:href=".uno:SymbolShapes.forbidden"/>
<toolbar:toolbaritem xlink:href=".uno:SymbolShapes.puzzle"/>
+ <toolbar:toolbaritem xlink:href=".uno:SymbolShapes.quad-bevel"/>
+ <toolbar:toolbaritem xlink:href=".uno:SymbolShapes.octagon-bevel"/>
+ <toolbar:toolbaritem xlink:href=".uno:SymbolShapes.diamond-bevel"/>
+ <toolbar:toolbarseparator/>
<toolbar:toolbaritem xlink:href=".uno:SymbolShapes.bracket-pair"/>
<toolbar:toolbaritem xlink:href=".uno:SymbolShapes.left-bracket"/>
<toolbar:toolbaritem xlink:href=".uno:SymbolShapes.right-bracket"/>
- <toolbar:toolbarbreak/>
<toolbar:toolbaritem xlink:href=".uno:SymbolShapes.brace-pair"/>
<toolbar:toolbaritem xlink:href=".uno:SymbolShapes.left-brace"/>
<toolbar:toolbaritem xlink:href=".uno:SymbolShapes.right-brace"/>
- <toolbar:toolbaritem xlink:href=".uno:SymbolShapes.quad-bevel"/>
- <toolbar:toolbaritem xlink:href=".uno:SymbolShapes.octagon-bevel"/>
- <toolbar:toolbaritem xlink:href=".uno:SymbolShapes.diamond-bevel"/>
-</toolbar:toolbar>
\ No newline at end of file
+</toolbar:toolbar>
diff --git a/sw/uiconfig/swriter/toolbar/textobjectbar.xml b/sw/uiconfig/swriter/toolbar/textobjectbar.xml
index 8b20a53..9b9ef62 100644
--- a/sw/uiconfig/swriter/toolbar/textobjectbar.xml
+++ b/sw/uiconfig/swriter/toolbar/textobjectbar.xml
@@ -34,10 +34,12 @@
<toolbar:toolbaritem xlink:href=".uno:UnderlineDouble" toolbar:visible="false"/>
<toolbar:toolbaritem xlink:href=".uno:Strikeout"/>
<toolbar:toolbaritem xlink:href=".uno:Overline" toolbar:visible="false"/>
+ <toolbar:toolbarseparator/>
<toolbar:toolbaritem xlink:href=".uno:SuperScript"/>
<toolbar:toolbaritem xlink:href=".uno:SubScript"/>
+ <toolbar:toolbarseparator/>
<toolbar:toolbaritem xlink:href=".uno:Shadowed"/>
- <toolbar:toolbaritem xlink:href=".uno:OutlineFont" toolbar:visible="false"/>
+ <toolbar:toolbaritem xlink:href=".uno:OutlineFont"/>
<toolbar:toolbaritem xlink:href=".uno:ResetAttributes"/>
<toolbar:toolbarseparator/>
<toolbar:toolbaritem xlink:href=".uno:ChangeCaseToLower" toolbar:visible="false"/>