tdf#85594 Additional tweaks to standard and drawing toolbars

Change-Id: I57b538c0490a1fc8233041fdee51889b62ea0eb7
Reviewed-on: https://gerrit.libreoffice.org/16131
Reviewed-by: Yousuf Philips <philipz85@hotmail.com>
Tested-by: Yousuf Philips <philipz85@hotmail.com>
(cherry picked from commit 932d9cd9c9effcbc8b24c10aa7322e42a1cbc908)
Reviewed-on: https://gerrit.libreoffice.org/16253
Tested-by: Jenkins <ci@libreoffice.org>
Reviewed-by: Christian Lohmaier <lohmaier+LibreOffice@googlemail.com>

10 files changed, 110 insertions, 71 deletions

diff --git a/sc/uiconfig/scalc/toolbar/arrowshapes.xml b/sc/uiconfig/scalc/toolbar/arrowshapes.xml
index 69c7d3311f45..b17a7e6a6eec 100644
--- a/sc/uiconfig/scalc/toolbar/arrowshapes.xml
+++ b/sc/uiconfig/scalc/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/sc/uiconfig/scalc/toolbar/basicshapes.xml b/sc/uiconfig/scalc/toolbar/basicshapes.xml
index e0ff2140e960..f7e73cdad2fc 100644
--- a/sc/uiconfig/scalc/toolbar/basicshapes.xml
+++ b/sc/uiconfig/scalc/toolbar/basicshapes.xml
@@ -22,25 +22,27 @@
  <toolbar:toolbaritem xlink:href=".uno:BasicShapes.round-rectangle"/>
  <toolbar:toolbaritem xlink:href=".uno:BasicShapes.quadrat"/>
  <toolbar:toolbaritem xlink:href=".uno:BasicShapes.round-quadrat"/>
- <toolbar:toolbaritem xlink:href=".uno:BasicShapes.circle"/>
- <toolbar:toolbaritem xlink:href=".uno:BasicShapes.ellipse"/>
+ <toolbar:toolbaritem xlink:href=".uno:BasicShapes.parallelogram"/>
+ <toolbar:toolbaritem xlink:href=".uno:BasicShapes.trapezoid"/>
  <toolbar:toolbarbreak/>
+ <toolbar:toolbaritem xlink:href=".uno:BasicShapes.ellipse"/>
+ <toolbar:toolbaritem xlink:href=".uno:BasicShapes.circle"/>
  <toolbar:toolbaritem xlink:href=".uno:BasicShapes.circle-pie"/>
+ <toolbar:toolbaritem xlink:href=".uno:CircleCut"/>
+ <toolbar:toolbaritem xlink:href=".uno:Arc"/>
+ <toolbar:toolbaritem xlink:href=".uno:BasicShapes.block-arc"/>
+ <toolbar:toolbarbreak/>
  <toolbar:toolbaritem xlink:href=".uno:BasicShapes.isosceles-triangle"/>
  <toolbar:toolbaritem xlink:href=".uno:BasicShapes.right-triangle"/>
- <toolbar:toolbaritem xlink:href=".uno:BasicShapes.trapezoid"/>
  <toolbar:toolbaritem xlink:href=".uno:BasicShapes.diamond"/>
- <toolbar:toolbaritem xlink:href=".uno:BasicShapes.parallelogram"/>
- <toolbar:toolbarbreak/>
  <toolbar:toolbaritem xlink:href=".uno:BasicShapes.pentagon"/>
  <toolbar:toolbaritem xlink:href=".uno:BasicShapes.hexagon"/>
  <toolbar:toolbaritem xlink:href=".uno:BasicShapes.octagon"/>
- <toolbar:toolbaritem xlink:href=".uno:BasicShapes.cross"/>
- <toolbar:toolbaritem xlink:href=".uno:BasicShapes.ring"/>
- <toolbar:toolbaritem xlink:href=".uno:BasicShapes.block-arc"/>
  <toolbar:toolbarbreak/>
  <toolbar:toolbaritem xlink:href=".uno:BasicShapes.can"/>
  <toolbar:toolbaritem xlink:href=".uno:BasicShapes.cube"/>
  <toolbar:toolbaritem xlink:href=".uno:BasicShapes.paper"/>
+ <toolbar:toolbaritem xlink:href=".uno:BasicShapes.cross"/>
  <toolbar:toolbaritem xlink:href=".uno:BasicShapes.frame"/>
-</toolbar:toolbar>
\ No newline at end of file
+ <toolbar:toolbaritem xlink:href=".uno:BasicShapes.ring"/>
+</toolbar:toolbar>
diff --git a/sc/uiconfig/scalc/toolbar/calloutshapes.xml b/sc/uiconfig/scalc/toolbar/calloutshapes.xml
index 7bf475646a44..e894bc1fa748 100644
--- a/sc/uiconfig/scalc/toolbar/calloutshapes.xml
+++ b/sc/uiconfig/scalc/toolbar/calloutshapes.xml
@@ -22,7 +22,8 @@
  <toolbar:toolbaritem xlink:href=".uno:CalloutShapes.round-rectangular-callout"/>
  <toolbar:toolbaritem xlink:href=".uno:CalloutShapes.round-callout"/>
  <toolbar:toolbaritem xlink:href=".uno:CalloutShapes.cloud-callout"/>
+ <toolbar:toolbarbreak/>
  <toolbar:toolbaritem xlink:href=".uno:CalloutShapes.line-callout-1"/>
  <toolbar:toolbaritem xlink:href=".uno:CalloutShapes.line-callout-2"/>
  <toolbar:toolbaritem xlink:href=".uno:CalloutShapes.line-callout-3"/>
-</toolbar:toolbar>
\ No newline at end of file
+</toolbar:toolbar>
diff --git a/sc/uiconfig/scalc/toolbar/drawbar.xml b/sc/uiconfig/scalc/toolbar/drawbar.xml
index e376112af6fd..48fe87352da6 100644
--- a/sc/uiconfig/scalc/toolbar/drawbar.xml
+++ b/sc/uiconfig/scalc/toolbar/drawbar.xml
@@ -18,7 +18,11 @@
  *   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:SelectObject" toolbar:helpid="10128"/>
+ <toolbar:toolbaritem xlink:href=".uno:SelectObject" toolbar:helpid="10128" toolbar:visible="false"/>
+ <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:toolbarseparator/>
  <toolbar:toolbaritem xlink:href=".uno:Line" toolbar:helpid="10102"/>
  <toolbar:toolbaritem xlink:href=".uno:Rect" toolbar:helpid="10104" toolbar:visible="false"/>
@@ -34,27 +38,22 @@
  <toolbar:toolbaritem xlink:href=".uno:BasicShapes.isosceles-triangle"/>
  <toolbar:toolbaritem xlink:href=".uno:BasicShapes.right-triangle" toolbar:visible="false"/>
  <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:toolbarseparator/>
  <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:toolbarseparator/>
  <toolbar:toolbaritem xlink:href=".uno:CalloutShapes" toolbar:helpid="11006"/>
+ <toolbar:toolbarseparator/>
  <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:ToggleObjectBezierMode" toolbar:helpid="10126"/>
- <toolbar:toolbarseparator/>
  <toolbar:toolbaritem xlink:href=".uno:DrawText" toolbar:helpid="10253"/>
  <toolbar:toolbaritem xlink:href=".uno:VerticalText" toolbar:helpid="10905"/>
  <toolbar:toolbaritem xlink:href=".uno:FontworkGalleryFloater" toolbar:helpid="10977"/>
  <toolbar:toolbaritem xlink:href=".uno:Text_Marquee" toolbar:visible="false" toolbar:helpid="10465"/>
  <toolbar:toolbaritem xlink:href=".uno:InsertGraphic" toolbar:helpid="10241" toolbar:visible="false"/>
  <toolbar:toolbarseparator/>
+ <toolbar:toolbaritem xlink:href=".uno:ToggleObjectBezierMode" toolbar:helpid="10126"/>
  <toolbar:toolbaritem xlink:href=".uno:ExtrusionToggle" toolbar:helpid="10960"/>
 </toolbar:toolbar>
diff --git a/sc/uiconfig/scalc/toolbar/drawobjectbar.xml b/sc/uiconfig/scalc/toolbar/drawobjectbar.xml
index 535474ce586d..609f0231843b 100644
--- a/sc/uiconfig/scalc/toolbar/drawobjectbar.xml
+++ b/sc/uiconfig/scalc/toolbar/drawobjectbar.xml
@@ -18,22 +18,25 @@
  *   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:FormatLine" toolbar:helpid="10143"/>
- <toolbar:toolbaritem xlink:href=".uno:LineEndStyle" toolbar:helpid="10301"/>
+ <toolbar:toolbaritem xlink:href=".uno:FormatLine" toolbar:helpid="10143" toolbar:visible="false"/>
+ <toolbar:toolbarseparator/>
+ <toolbar:toolbaritem xlink:href=".uno:XLineColor" toolbar:style="dropdown" toolbar:helpid="10172"/>
  <toolbar:toolbarseparator/>
+ <toolbar:toolbaritem xlink:href=".uno:LineEndStyle" toolbar:helpid="10301"/>
  <toolbar:toolbaritem xlink:href=".uno:XLineStyle" toolbar:helpid="10169"/>
  <toolbar:toolbarseparator/>
  <toolbar:toolbaritem xlink:href=".uno:LineWidth" toolbar:helpid="10171"/>
  <toolbar:toolbarseparator/>
- <toolbar:toolbaritem xlink:href=".uno:XLineColor" toolbar:style="dropdown" toolbar:helpid="10172"/>
- <toolbar:toolbarseparator/>
  <toolbar:toolbaritem xlink:href=".uno:FormatArea" toolbar:helpid="10142"/>
+ <toolbar:toolbaritem xlink:href=".uno:FillColor" toolbar:visible="false"/>
  <toolbar:toolbarseparator/>
  <toolbar:toolbaritem xlink:href=".uno:FillStyle" toolbar:helpid="10164"/>
  <toolbar:toolbarseparator/>
- <toolbar:toolbaritem xlink:href=".uno:ToggleObjectRotateMode" toolbar:helpid="10129"/>
  <toolbar:toolbaritem xlink:href=".uno:ToggleAnchorType" toolbar:helpid="26412"/>
  <toolbar:toolbarseparator/>
+ <toolbar:toolbaritem xlink:href=".uno:ToggleObjectRotateMode" toolbar:helpid="10129"/>
+ <toolbar:toolbaritem xlink:href=".uno:ObjectAlign" toolbar:helpid="10130"/>
+ <toolbar:toolbarseparator/>
  <toolbar:toolbaritem xlink:href=".uno:BringToFront" toolbar:helpid="10286"/>
  <toolbar:toolbaritem xlink:href=".uno:ObjectForwardOne"/>
  <toolbar:toolbaritem xlink:href=".uno:ObjectBackOne"/>
@@ -46,5 +49,4 @@
  <toolbar:toolbaritem xlink:href=".uno:GridUse" toolbar:visible="false" toolbar:helpid="27154"/>
  <toolbar:toolbaritem xlink:href=".uno:HelplinesMove" toolbar:visible="false" toolbar:helpid="27153"/>
  <toolbar:toolbarseparator/>
- <toolbar:toolbaritem xlink:href=".uno:ObjectAlign" toolbar:helpid="10130"/>
 </toolbar:toolbar>
diff --git a/sc/uiconfig/scalc/toolbar/graphicobjectbar.xml b/sc/uiconfig/scalc/toolbar/graphicobjectbar.xml
index 5b17ac9c9d2f..857180475da3 100644
--- a/sc/uiconfig/scalc/toolbar/graphicobjectbar.xml
+++ b/sc/uiconfig/scalc/toolbar/graphicobjectbar.xml
@@ -22,27 +22,41 @@
  <toolbar:toolbarseparator/>
  <toolbar:toolbaritem xlink:href=".uno:GrafMode"/>
  <toolbar:toolbarseparator/>
- <toolbar:toolbaritem xlink:href=".uno:ColorSettings"/>
+ <toolbar:toolbaritem xlink:href=".uno:XLineColor"/>
+ <toolbar:toolbaritem xlink:href=".uno:XLineStyle"/>
  <toolbar:toolbarseparator/>
- <toolbar:toolbaritem xlink:href=".uno:GrafTransparence"/>
+ <toolbar:toolbaritem xlink:href=".uno:LineWidth"/>
  <toolbar:toolbarseparator/>
- <toolbar:toolbaritem xlink:href=".uno:FormatLine"/>
- <toolbar:toolbaritem xlink:href=".uno:FormatArea"/>
- <toolbar:toolbaritem xlink:href=".uno:FillShadow"/>
+ <toolbar:toolbaritem xlink:href=".uno:FormatArea" toolbar:helpid="10142"/>
+ <toolbar:toolbaritem xlink:href=".uno:FillColor" toolbar:visible="false"/>
+ <toolbar:toolbarseparator/>
+ <toolbar:toolbaritem xlink:href=".uno:FillStyle" toolbar:helpid="10164"/>
  <toolbar:toolbarseparator/>
  <toolbar:toolbaritem xlink:href=".uno:Crop"/>
- <toolbar:toolbaritem xlink:href=".uno:GrafAttrCrop"/>
+ <toolbar:toolbaritem xlink:href=".uno:FillShadow"/>
  <toolbar:toolbarseparator/>
  <toolbar:toolbaritem xlink:href=".uno:ToggleAnchorType"/>
+ <toolbar:toolbaritem xlink:href=".uno:ObjectAlign"/>
  <toolbar:toolbarseparator/>
  <toolbar:toolbaritem xlink:href=".uno:BringToFront"/>
+ <toolbar:toolbaritem xlink:href=".uno:ObjectForwardOne"/>
+ <toolbar:toolbaritem xlink:href=".uno:ObjectBackOne"/>
  <toolbar:toolbaritem xlink:href=".uno:SendToBack"/>
+ <toolbar:toolbarseparator/>
  <toolbar:toolbaritem xlink:href=".uno:SetObjectToForeground"/>
  <toolbar:toolbaritem xlink:href=".uno:SetObjectToBackground"/>
  <toolbar:toolbarseparator/>
+ <toolbar:toolbaritem xlink:href=".uno:FlipHorizontal"/>
+ <toolbar:toolbaritem xlink:href=".uno:FlipVertical"/>
+ <toolbar:toolbarseparator/>
  <toolbar:toolbaritem xlink:href=".uno:GridVisible" toolbar:visible="false"/>
  <toolbar:toolbaritem xlink:href=".uno:GridUse" toolbar:visible="false"/>
  <toolbar:toolbaritem xlink:href=".uno:HelplinesMove" toolbar:visible="false"/>
  <toolbar:toolbarseparator/>
- <toolbar:toolbaritem xlink:href=".uno:ObjectAlign"/>
+ <toolbar:toolbaritem xlink:href=".uno:GrafTransparence"/>
+ <toolbar:toolbarseparator/>
+ <toolbar:toolbaritem xlink:href=".uno:ColorSettings"/>
+ <toolbar:toolbarseparator/>
+ <toolbar:toolbaritem xlink:href=".uno:FormatLine" toolbar:visible="false"/>
+ <toolbar:toolbaritem xlink:href=".uno:FormatArea" toolbar:visible="false"/>
 </toolbar:toolbar>
diff --git a/sc/uiconfig/scalc/toolbar/standardbar.xml b/sc/uiconfig/scalc/toolbar/standardbar.xml
index 40c45b33161a..ea357fe45bd2 100644
--- a/sc/uiconfig/scalc/toolbar/standardbar.xml
+++ b/sc/uiconfig/scalc/toolbar/standardbar.xml
@@ -56,21 +56,24 @@
  <toolbar:toolbaritem xlink:href=".uno:SortDescending"/>
  <toolbar:toolbaritem xlink:href=".uno:DataFilterAutoFilter"/>
  <toolbar:toolbaritem xlink:href=".uno:DataFilterStandardFilter" toolbar:visible="false"/>
+ <toolbar:toolbaritem xlink:href=".uno:GoalSeekDialog" toolbar:visible="false"/>
  <toolbar:toolbarseparator/>
+ <toolbar:toolbaritem xlink:href=".uno:InsertGraphic"/>
+ <toolbar:toolbaritem xlink:href=".uno:Gallery" toolbar:visible="false"/>
  <toolbar:toolbaritem xlink:href=".uno:InsertObjectChart"/>
+ <toolbar:toolbaritem xlink:href=".uno:InsertObjectStarMath" toolbar:visible="false"/>
  <toolbar:toolbaritem xlink:href=".uno:DataDataPilotRun"/>
  <toolbar:toolbaritem xlink:href=".uno:InsertRowBreak" toolbar:visible="false"/>
  <toolbar:toolbarseparator/>
- <toolbar:toolbaritem xlink:href=".uno:InsertGraphic"/>
- <toolbar:toolbaritem xlink:href=".uno:Gallery" toolbar:visible="false"/>
- <toolbar:toolbaritem xlink:href=".uno:InsertObjectStarMath" toolbar:visible="false"/>
  <toolbar:toolbaritem xlink:href=".uno:InsertSymbol"/>
- <toolbar:toolbaritem xlink:href=".uno:EditHeaderAndFooter"/>
  <toolbar:toolbaritem xlink:href=".uno:HyperlinkDialog"/>
  <toolbar:toolbaritem xlink:href=".uno:InsertAnnotation"/>
  <toolbar:toolbaritem xlink:href=".uno:DrawText" toolbar:visible="false"/>
+ <toolbar:toolbaritem xlink:href=".uno:EditHeaderAndFooter"/>
  <toolbar:toolbarseparator/>
  <toolbar:toolbaritem xlink:href=".uno:DefinePrintArea"/>
+ <toolbar:toolbaritem xlink:href=".uno:EditPrintArea" toolbar:visible="false"/>
+ <toolbar:toolbaritem xlink:href=".uno:DeletePrintArea" toolbar:visible="false"/>
  <toolbar:toolbaritem xlink:href=".uno:FreezePanes"/>
  <toolbar:toolbaritem xlink:href=".uno:SplitWindow"/>
  <toolbar:toolbarseparator/>
diff --git a/sc/uiconfig/scalc/toolbar/starshapes.xml b/sc/uiconfig/scalc/toolbar/starshapes.xml
index 7168e3c0576a..cb7cf6d297e2 100644
--- a/sc/uiconfig/scalc/toolbar/starshapes.xml
+++ b/sc/uiconfig/scalc/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/sc/uiconfig/scalc/toolbar/symbolshapes.xml b/sc/uiconfig/scalc/toolbar/symbolshapes.xml
index 1d4afe7927f1..f981c142c603 100644
--- a/sc/uiconfig/scalc/toolbar/symbolshapes.xml
+++ b/sc/uiconfig/scalc/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/sc/uiconfig/scalc/toolbar/textobjectbar.xml b/sc/uiconfig/scalc/toolbar/textobjectbar.xml
index 7fe807188776..220d3b01f1cc 100644
--- a/sc/uiconfig/scalc/toolbar/textobjectbar.xml
+++ b/sc/uiconfig/scalc/toolbar/textobjectbar.xml
@@ -26,27 +26,45 @@
  <toolbar:toolbaritem xlink:href=".uno:Italic" toolbar:style="auto"/>
  <toolbar:toolbaritem xlink:href=".uno:Underline" toolbar:style="auto"/>
  <toolbar:toolbaritem xlink:href=".uno:UnderlineDouble" toolbar:style="auto" toolbar:visible="false"/>
+ <toolbar:toolbaritem xlink:href=".uno:Overline" toolbar:visible="false"/>
+ <toolbar:toolbaritem xlink:href=".uno:Strikeout"/>
+ <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:toolbarseparator/>
+ <toolbar:toolbaritem xlink:href=".uno:ChangeCaseToLower" toolbar:text="lowercase" toolbar:visible="false"/>
+ <toolbar:toolbaritem xlink:href=".uno:ChangeCaseToUpper" toolbar:text="UPPERCASE" toolbar:visible="false"/>
+ <toolbar:toolbarseparator/>
+ <toolbar:toolbaritem xlink:href=".uno:Color"/>
  <toolbar:toolbarseparator/>
  <toolbar:toolbaritem xlink:href=".uno:AlignLeft" toolbar:style="radio auto"/>
  <toolbar:toolbaritem xlink:href=".uno:AlignHorizontalCenter" toolbar:style="radio auto"/>
  <toolbar:toolbaritem xlink:href=".uno:AlignRight" toolbar:style="radio auto"/>
  <toolbar:toolbaritem xlink:href=".uno:AlignBlock" toolbar:style="radio auto"/>
  <toolbar:toolbarseparator/>
- <toolbar:toolbaritem xlink:href=".uno:SpacePara1" toolbar:style="radio auto"/>
- <toolbar:toolbaritem xlink:href=".uno:SpacePara15" toolbar:style="radio auto"/>
- <toolbar:toolbaritem xlink:href=".uno:SpacePara2" toolbar:style="radio auto"/>
+ <toolbar:toolbaritem xlink:href=".uno:CellVertTop"/>
+ <toolbar:toolbaritem xlink:href=".uno:CellVertCenter"/>
+ <toolbar:toolbaritem xlink:href=".uno:CellVertBottom"/>
+ <toolbar:toolbarseparator/>
+ <toolbar:toolbaritem xlink:href=".uno:LineSpacing"/>
+ <toolbar:toolbaritem xlink:href=".uno:SpacePara1" toolbar:style="radio auto" toolbar:visible="false"/>
+ <toolbar:toolbaritem xlink:href=".uno:SpacePara15" toolbar:style="radio auto" toolbar:visible="false"/>
+ <toolbar:toolbaritem xlink:href=".uno:SpacePara2" toolbar:style="radio auto" toolbar:visible="false"/>
+ <toolbar:toolbaritem xlink:href=".uno:ParaspaceDecrease"/>
+ <toolbar:toolbaritem xlink:href=".uno:ParaspaceIncrease"/>
+ <toolbar:toolbarseparator/>
+ <toolbar:toolbaritem xlink:href=".uno:DecrementIndent"/>
+ <toolbar:toolbaritem xlink:href=".uno:IncrementIndent"/>
  <toolbar:toolbarseparator/>
  <toolbar:toolbaritem xlink:href=".uno:ParaLeftToRight" toolbar:style="radio"/>
  <toolbar:toolbaritem xlink:href=".uno:ParaRightToLeft" toolbar:style="radio"/>
  <toolbar:toolbarseparator/>
- <toolbar:toolbaritem xlink:href=".uno:SuperScript"/>
- <toolbar:toolbaritem xlink:href=".uno:SubScript"/>
- <toolbar:toolbarseparator/>
  <toolbar:toolbaritem xlink:href=".uno:TextdirectionLeftToRight"/>
  <toolbar:toolbaritem xlink:href=".uno:TextdirectionTopToBottom"/>
  <toolbar:toolbarseparator/>
  <toolbar:toolbaritem xlink:href=".uno:FontDialog"/>
  <toolbar:toolbaritem xlink:href=".uno:ParagraphDialog"/>
- <toolbar:toolbarseparator/>
- <toolbar:toolbaritem xlink:href=".uno:Color"/>
 </toolbar:toolbar>