sync swxform ui files with swriter ui files

Change-Id: Ie1e4a843e72351fabefba6f3a3c3fc9c35b40c46 Reviewed-on: https://gerrit.libreoffice.org/68606 Tested-by: Jenkins Reviewed-by: andreas_kainz <kainz.a@gmail.com>

sync swxform ui files with swriter ui files
Change-Id: Ie1e4a843e72351fabefba6f3a3c3fc9c35b40c46 Reviewed-on: https://gerrit.libreoffice.org/68606 Tested-by: Jenkins Reviewed-by: andreas_kainz <kainz.a@gmail.com>
7823ea5a · andreas kainz · andreas_kainz · 361abbf8 · 7823ea5a · 7823ea5a
Kaydet (Commit) 7823ea5a authored Mar 01, 2019 tarafından andreas kainz Kaydeden (comit) andreas_kainz Mar 02, 2019
16 changed files
--- a/sw/uiconfig/swxform/statusbar/statusbar.xml
+++ b/sw/uiconfig/swxform/statusbar/statusbar.xml
@@ -18,15 +18,16 @@
 *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
 -->
 <statusbar:statusbar xmlns:statusbar="http://openoffice.org/2001/statusbar" xmlns:xlink="http://www.w3.org/1999/xlink">
- <statusbar:statusbaritem xlink:href=".uno:StatePageNumber" statusbar:align="left" statusbar:autosize="true" statusbar:width="54"/>
+ <statusbar:statusbaritem xlink:href=".uno:StatePageNumber" statusbar:align="left" statusbar:autosize="true" statusbar:mandatory="true" statusbar:width="54"/>
+ <statusbar:statusbaritem xlink:href=".uno:StateWordCount" statusbar:align="left" statusbar:autosize="true"/>
 <statusbar:statusbaritem xlink:href=".uno:PageStyleName" statusbar:align="left" statusbar:autosize="true" statusbar:width="79"/>
- <statusbar:statusbaritem xlink:href=".uno:LanguageStatus" statusbar:align="center" statusbar:autosize="true" statusbar:width="100"/>
- <statusbar:statusbaritem xlink:href=".uno:InsertMode" statusbar:align="center" statusbar:width="55"/>
- <statusbar:statusbaritem xlink:href=".uno:SelectionMode" statusbar:align="center" statusbar:ownerdraw="true" statusbar:width="16"/>
- <statusbar:statusbaritem xlink:href=".uno:ModifiedStatus" statusbar:align="center" statusbar:ownerdraw="true" statusbar:width="16"/>
- <statusbar:statusbaritem xlink:href=".uno:Signature" statusbar:align="center" statusbar:ownerdraw="true" statusbar:width="16"/>
- <statusbar:statusbaritem xlink:href=".uno:Size" statusbar:align="left" statusbar:autosize="true" statusbar:ownerdraw="true" statusbar:width="10"/>
+ <statusbar:statusbaritem xlink:href=".uno:LanguageStatus" statusbar:align="center" statusbar:autosize="true" statusbar:mandatory="false" statusbar:width="100"/>
+ <statusbar:statusbaritem xlink:href=".uno:InsertMode" statusbar:align="center" statusbar:mandatory="false" statusbar:width="55"/>
+ <statusbar:statusbaritem xlink:href=".uno:SelectionMode" statusbar:align="center" statusbar:ownerdraw="true" statusbar:mandatory="false" statusbar:width="16"/>
+ <statusbar:statusbaritem xlink:href=".uno:ModifiedStatus" statusbar:align="center" statusbar:ownerdraw="true" statusbar:mandatory="false" statusbar:width="16"/>
+ <statusbar:statusbaritem xlink:href=".uno:Signature" statusbar:align="center" statusbar:ownerdraw="true" statusbar:mandatory="false" statusbar:width="16"/>
+ <statusbar:statusbaritem xlink:href=".uno:Size" statusbar:align="left" statusbar:autosize="true" statusbar:mandatory="false" statusbar:ownerdraw="true" statusbar:width="10"/>
 <statusbar:statusbaritem xlink:href=".uno:ViewLayout" statusbar:align="center" statusbar:ownerdraw="true" statusbar:width="63"/>
- <statusbar:statusbaritem xlink:href=".uno:ZoomSlider" statusbar:align="center" statusbar:ownerdraw="true" statusbar:width="130"/>
- <statusbar:statusbaritem xlink:href=".uno:Zoom" statusbar:align="center" statusbar:width="35"/>
+ <statusbar:statusbaritem xlink:href=".uno:ZoomSlider" statusbar:align="center" statusbar:ownerdraw="true" statusbar:mandatory="true" statusbar:width="130"/>
+ <statusbar:statusbaritem xlink:href=".uno:Zoom" statusbar:align="center" statusbar:mandatory="true" statusbar:width="35"/>
 </statusbar:statusbar>
--- a/sw/uiconfig/swxform/toolbar/arrowshapes.xml
+++ b/sw/uiconfig/swxform/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: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>
--- a/sw/uiconfig/swxform/toolbar/basicshapes.xml
+++ b/sw/uiconfig/swxform/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>
--- a/sw/uiconfig/swxform/toolbar/bezierobjectbar.xml
+++ b/sw/uiconfig/swxform/toolbar/bezierobjectbar.xml
@@ -18,20 +18,21 @@
 *   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:ToggleObjectBezierMode"/>
+ <toolbar:toolbaritem xlink:href=".uno:ToggleObjectBezierMode" toolbar:visible="false"/>
 <toolbar:toolbarseparator/>
 <toolbar:toolbaritem xlink:href=".uno:BezierMove"/>
 <toolbar:toolbaritem xlink:href=".uno:BezierInsert"/>
- <toolbar:toolbarseparator/>
 <toolbar:toolbaritem xlink:href=".uno:BezierDelete"/>
- <toolbar:toolbaritem xlink:href=".uno:BezierCutLine"/>
+ <toolbar:toolbarseparator/>
 <toolbar:toolbaritem xlink:href=".uno:BezierConvert"/>
 <toolbar:toolbarseparator/>
+ <toolbar:toolbaritem xlink:href=".uno:BezierClose"/>
+ <toolbar:toolbaritem xlink:href=".uno:BezierCutLine"/>
+ <toolbar:toolbarseparator/>
 <toolbar:toolbaritem xlink:href=".uno:BezierEdge"/>
 <toolbar:toolbaritem xlink:href=".uno:BezierSmooth"/>
 <toolbar:toolbaritem xlink:href=".uno:BezierSymmetric"/>
 <toolbar:toolbarseparator/>
- <toolbar:toolbaritem xlink:href=".uno:BezierClose"/>
 <toolbar:toolbarseparator/>
 <toolbar:toolbaritem xlink:href=".uno:BezierEliminatePoints"/>
-</toolbar:toolbar>
\ No newline at end of file
+</toolbar:toolbar>
--- a/sw/uiconfig/swxform/toolbar/calloutshapes.xml
+++ b/sw/uiconfig/swxform/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>
--- a/sw/uiconfig/swxform/toolbar/drawbar.xml
+++ b/sw/uiconfig/swxform/toolbar/drawbar.xml
@@ -21,31 +21,43 @@
 <toolbar:toolbaritem xlink:href=".uno:SelectObject"/>
 <toolbar:toolbarseparator/>
 <toolbar:toolbaritem xlink:href=".uno:Line"/>
+ <toolbar:toolbaritem xlink:href=".uno:ArrowsToolbox"/>
+ <toolbar:toolbaritem xlink:href=".uno:LineToolbox"/>
+ <toolbar:toolbaritem xlink:href=".uno:Freeline_Unfilled" toolbar:visible="false"/>
+ <toolbar:toolbaritem xlink:href=".uno:Freeline" toolbar:visible="false"/>
+ <toolbar:toolbaritem xlink:href=".uno:Bezier_Unfilled"/>
+ <toolbar:toolbaritem xlink:href=".uno:BezierFill" toolbar:visible="false"/>
+ <toolbar:toolbaritem xlink:href=".uno:Polygon_Unfilled"/>
+ <toolbar:toolbaritem xlink:href=".uno:Polygon_Diagonal_Unfilled" toolbar:visible="false"/>
+ <toolbar:toolbaritem xlink:href=".uno:Polygon_Diagonal" toolbar:visible="false"/>
+ <toolbar:toolbarseparator/>
 <toolbar:toolbaritem xlink:href=".uno:BasicShapes.rectangle"/>
+ <toolbar:toolbaritem xlink:href=".uno:BasicShapes.round-rectangle"/>
+ <toolbar:toolbaritem xlink:href=".uno:BasicShapes.quadrat"/>
 <toolbar:toolbaritem xlink:href=".uno:BasicShapes.ellipse"/>
- <toolbar:toolbaritem xlink:href=".uno:Polygon_Unfilled" toolbar:visible="false"/>
- <toolbar:toolbaritem xlink:href=".uno:Bezier_Unfilled" toolbar:visible="false"/>
- <toolbar:toolbaritem xlink:href=".uno:Freeline_Unfilled"/>
+ <toolbar:toolbaritem xlink:href=".uno:BasicShapes.circle"/>
 <toolbar:toolbaritem xlink:href=".uno:Arc" toolbar:visible="false"/>
 <toolbar:toolbaritem xlink:href=".uno:Pie" toolbar:visible="false"/>
 <toolbar:toolbaritem xlink:href=".uno:CircleCut" toolbar:visible="false"/>
- <toolbar:toolbaritem xlink:href=".uno:DrawText"/>
- <toolbar:toolbaritem xlink:href=".uno:VerticalText"/>
- <toolbar:toolbaritem xlink:href=".uno:Text_Marquee" toolbar:visible="false"/>
- <toolbar:toolbaritem xlink:href=".uno:DrawCaption"/>
- <toolbar:toolbaritem xlink:href=".uno:VerticalCaption"/>
+ <toolbar:toolbaritem xlink:href=".uno:BasicShapes.isosceles-triangle"/>
+ <toolbar:toolbaritem xlink:href=".uno:BasicShapes.right-triangle"/>
 <toolbar:toolbarseparator/>
 <toolbar:toolbaritem xlink:href=".uno:BasicShapes"/>
 <toolbar:toolbaritem xlink:href=".uno:SymbolShapes"/>
 <toolbar:toolbaritem xlink:href=".uno:ArrowShapes"/>
- <toolbar:toolbaritem xlink:href=".uno:FlowChartShapes"/>
- <toolbar:toolbaritem xlink:href=".uno:CalloutShapes"/>
 <toolbar:toolbaritem xlink:href=".uno:StarShapes"/>
+ <toolbar:toolbaritem xlink:href=".uno:CalloutShapes"/>
+ <toolbar:toolbaritem xlink:href=".uno:FlowChartShapes"/>
 <toolbar:toolbarseparator/>
- <toolbar:toolbaritem xlink:href=".uno:ToggleObjectBezierMode"/>
+ <toolbar:toolbaritem xlink:href=".uno:DrawCaption"/>
+ <toolbar:toolbaritem xlink:href=".uno:VerticalCaption"/>
 <toolbar:toolbarseparator/>
+ <toolbar:toolbaritem xlink:href=".uno:DrawText"/>
+ <toolbar:toolbaritem xlink:href=".uno:VerticalText"/>
+ <toolbar:toolbaritem xlink:href=".uno:InsertGraphic" toolbar:visible="false"/>
 <toolbar:toolbaritem xlink:href=".uno:FontworkGalleryFloater"/>
- <toolbar:toolbaritem xlink:href=".uno:InsertGraphic"/>
+ <toolbar:toolbaritem xlink:href=".uno:Text_Marquee" toolbar:visible="false"/>
 <toolbar:toolbarseparator/>
+ <toolbar:toolbaritem xlink:href=".uno:ToggleObjectBezierMode"/>
 <toolbar:toolbaritem xlink:href=".uno:ExtrusionToggle"/>
 </toolbar:toolbar>
--- a/sw/uiconfig/swxform/toolbar/drawingobjectbar.xml
+++ b/sw/uiconfig/swxform/toolbar/drawingobjectbar.xml
@@ -18,40 +18,56 @@
 *   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:toolbaritem xlink:href=".uno:LineEndStyle"/>
+ <toolbar:toolbaritem xlink:href=".uno:AnchorMenu"/>
 <toolbar:toolbarseparator/>
- <toolbar:toolbaritem xlink:href=".uno:XLineStyle"/>
+ <toolbar:toolbaritem xlink:href=".uno:WrapOff"/>
+ <toolbar:toolbaritem xlink:href=".uno:WrapOn"/>
+ <toolbar:toolbaritem xlink:href=".uno:WrapIdeal"/>
+ <toolbar:toolbaritem xlink:href=".uno:WrapLeft"/>
+ <toolbar:toolbaritem xlink:href=".uno:WrapRight"/>
+ <toolbar:toolbaritem xlink:href=".uno:WrapThrough"/>
+ <toolbar:toolbaritem xlink:href=".uno:WrapContour" toolbar:visible="false"/>
 <toolbar:toolbarseparator/>
- <toolbar:toolbaritem xlink:href=".uno:LineWidth"/>
+ <toolbar:toolbaritem xlink:href=".uno:ObjectAlign"/>
 <toolbar:toolbarseparator/>
- <toolbar:toolbaritem xlink:href=".uno:XLineColor"/>
+ <toolbar:toolbaritem xlink:href=".uno:ObjectAlignLeft" toolbar:visible="false"/>
+ <toolbar:toolbaritem xlink:href=".uno:AlignCenter" toolbar:visible="false"/>
+ <toolbar:toolbaritem xlink:href=".uno:ObjectAlignRight" toolbar:visible="false"/>
+ <toolbar:toolbarseparator/>
+ <toolbar:toolbaritem xlink:href=".uno:AlignUp" toolbar:visible="false"/>
+ <toolbar:toolbaritem xlink:href=".uno:AlignMiddle" toolbar:visible="false"/>
+ <toolbar:toolbaritem xlink:href=".uno:AlignDown" toolbar:visible="false"/>
+ <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:FormatArea"/>
+ <toolbar:toolbaritem xlink:href=".uno:LineEndStyle"/>
+ <toolbar:toolbaritem xlink:href=".uno:XLineStyle"/>
+ <toolbar:toolbaritem xlink:href=".uno:LineWidth"/>
+ <toolbar:toolbaritem xlink:href=".uno:XLineColor"/>
 <toolbar:toolbarseparator/>
 <toolbar:toolbaritem xlink:href=".uno:FillStyle"/>
+ <toolbar:toolbaritem xlink:href=".uno:FillColor" toolbar:visible="false"/>
 <toolbar:toolbarseparator/>
 <toolbar:toolbaritem xlink:href=".uno:ToggleObjectRotateMode"/>
- <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:toolbaritem xlink:href=".uno:ToggleObjectBezierMode"/>
 <toolbar:toolbarseparator/>
- <toolbar:toolbaritem xlink:href=".uno:WrapOff" toolbar:visible="false"/>
- <toolbar:toolbaritem xlink:href=".uno:WrapOn" toolbar:visible="false"/>
- <toolbar:toolbaritem xlink:href=".uno:WrapIdeal" toolbar:visible="false"/>
- <toolbar:toolbaritem xlink:href=".uno:WrapLeft" toolbar:visible="false"/>
- <toolbar:toolbaritem xlink:href=".uno:WrapRight" toolbar:visible="false"/>
- <toolbar:toolbaritem xlink:href=".uno:WrapThrough" toolbar:visible="false"/>
- <toolbar:toolbaritem xlink:href=".uno:WrapContour" toolbar:visible="false"/>
+ <toolbar:toolbaritem xlink:href=".uno:FormatGroup"/>
+ <toolbar:toolbaritem xlink:href=".uno:EnterGroup"/>
+ <toolbar:toolbaritem xlink:href=".uno:LeaveGroup"/>
+ <toolbar:toolbaritem xlink:href=".uno:FormatUngroup"/>
 <toolbar:toolbarseparator/>
- <toolbar:toolbaritem xlink:href=".uno:SetObjectToForeground"/>
- <toolbar:toolbaritem xlink:href=".uno:SetObjectToBackground"/>
- <toolbar:toolbaritem xlink:href=".uno:BringToFront"/>
- <toolbar:toolbaritem xlink:href=".uno:SendToBack"/>
- <toolbar:toolbaritem xlink:href=".uno:ObjectAlign"/>
+ <toolbar:toolbaritem xlink:href=".uno:InsertCaptionDialog"/>
 <toolbar:toolbarseparator/>
- <toolbar:toolbaritem xlink:href=".uno:AnchorMenu"/>
+ <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:FormatUngroup"/>
- <toolbar:toolbaritem xlink:href=".uno:FormatGroup"/>
-</toolbar:toolbar>
\ No newline at end of file
+ <toolbar:toolbaritem xlink:href=".uno:FormatLine" toolbar:visible="false"/>
+ <toolbar:toolbaritem xlink:href=".uno:FormatArea" toolbar:visible="false"/>
+</toolbar:toolbar>
--- a/sw/uiconfig/swxform/toolbar/fullscreenbar.xml
+++ b/sw/uiconfig/swxform/toolbar/fullscreenbar.xml
 <?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.
+ *
+ * This Source Code Form is subject to the terms of the Mozilla Public
+ * License, v. 2.0. If a copy of the MPL was not distributed with this
+ * file, You can obtain one at http://mozilla.org/MPL/2.0/.
+ *
+ * This file incorporates work covered by the following license notice:
+ *
+ *   Licensed to the Apache Software Foundation (ASF) under one or more
+ *   contributor license agreements. See the NOTICE file distributed
+ *   with this work for additional information regarding copyright
+ *   ownership. The ASF licenses this file to you under the Apache
+ *   License, Version 2.0 (the "License"); you may not use this file
+ *   except in compliance with the License. You may obtain a copy of
+ *   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:FullScreen"/>
-</toolbar:toolbar>
\ No newline at end of file
+</toolbar:toolbar>
--- a/sw/uiconfig/swxform/toolbar/graphicobjectbar.xml
+++ b/sw/uiconfig/swxform/toolbar/graphicobjectbar.xml
@@ -22,17 +22,20 @@
 <toolbar:toolbarseparator/>
 <toolbar:toolbaritem xlink:href=".uno:GrafMode"/>
 <toolbar:toolbarseparator/>
- <toolbar:toolbaritem xlink:href=".uno:ColorSettings"/>
- <toolbar:toolbarseparator/>
- <toolbar:toolbaritem xlink:href=".uno:GrafTransparence"/>
+ <toolbar:toolbaritem xlink:href=".uno:Crop"/>
 <toolbar:toolbarseparator/>
 <toolbar:toolbaritem xlink:href=".uno:FlipVertical"/>
 <toolbar:toolbaritem xlink:href=".uno:FlipHorizontal"/>
 <toolbar:toolbaritem xlink:href=".uno:RotateLeft"/>
 <toolbar:toolbaritem xlink:href=".uno:RotateRight"/>
+ <toolbar:toolbaritem xlink:href=".uno:ToggleObjectRotateMode"/>
 <toolbar:toolbaritem xlink:href=".uno:Rotate180" toolbar:visible="false"/>
 <toolbar:toolbaritem xlink:href=".uno:RotateReset" toolbar:visible="false"/>
- <toolbar:toolbaritem xlink:href=".uno:Crop"/>
 <toolbar:toolbarseparator/>
- <toolbar:toolbaritem xlink:href=".uno:FrameDialog"/>
+ <toolbar:toolbaritem xlink:href=".uno:GrafTransparence"/>
+ <toolbar:toolbarseparator/>
+ <toolbar:toolbaritem xlink:href=".uno:ColorSettings"/>
+ <toolbar:toolbarseparator/>
+ <toolbar:toolbaritem xlink:href=".uno:InsertCaptionDialog" toolbar:visible="false"/>
+ <toolbar:toolbaritem xlink:href=".uno:GraphicDialog" toolbar:visible="false"/>
 </toolbar:toolbar>
--- a/sw/uiconfig/swxform/toolbar/insertbar.xml
+++ b/sw/uiconfig/swxform/toolbar/insertbar.xml
@@ -19,28 +19,29 @@
 -->
 <toolbar:toolbar xmlns:toolbar="http://openoffice.org/2001/toolbar" xmlns:xlink="http://www.w3.org/1999/xlink">
 <toolbar:toolbaritem xlink:href=".uno:InsertTable"/>
+ <toolbar:toolbaritem xlink:href=".uno:InsertSection"/>
 <toolbar:toolbaritem xlink:href=".uno:InsertFrameInteract"/>
- <toolbar:toolbarseparator/>
- <toolbar:toolbaritem xlink:href=".uno:InsertDoc"/>
- <toolbar:toolbaritem xlink:href=".uno:InsertGraphic"/>
- <toolbar:toolbaritem xlink:href=".uno:InsertAVMedia"/>
+ <toolbar:toolbaritem xlink:href=".uno:InsertObjectFloatingFrame" toolbar:visible="false"/>
 <toolbar:toolbarseparator/>
 <toolbar:toolbaritem xlink:href=".uno:InsertFootnote"/>
 <toolbar:toolbaritem xlink:href=".uno:InsertEndnote"/>
+ <toolbar:toolbaritem xlink:href=".uno:InsertAnnotation"/>
+ <toolbar:toolbaritem xlink:href=".uno:InsertBookmark"/>
+ <toolbar:toolbaritem xlink:href=".uno:InsertReferenceField" toolbar:visible="false"/>
 <toolbar:toolbarseparator/>
+ <toolbar:toolbaritem xlink:href=".uno:InsertDoc" toolbar:visible="false"/>
+ <toolbar:toolbaritem xlink:href=".uno:EditGlossary"/>
 <toolbar:toolbaritem xlink:href=".uno:InsertSymbol"/>
- <toolbar:toolbaritem xlink:href=".uno:InsertObjectStarMath"/>
- <toolbar:toolbarseparator/>
- <toolbar:toolbaritem xlink:href=".uno:InsertSection"/>
- <toolbar:toolbaritem xlink:href=".uno:InsertIndexesEntry"/>
- <toolbar:toolbarseparator/>
 <toolbar:toolbaritem xlink:href=".uno:InsertFieldCtrl"/>
- <toolbar:toolbaritem xlink:href=".uno:InsertObjectChart" toolbar:visible="false"/>
- <toolbar:toolbaritem xlink:href=".uno:InsertObjCtrl" toolbar:visible="false"/>
 <toolbar:toolbaritem xlink:href=".uno:Config" toolbar:visible="false"/>
 <toolbar:toolbarseparator/>
+ <toolbar:toolbaritem xlink:href=".uno:InsertGraphic"/>
+ <toolbar:toolbaritem xlink:href=".uno:InsertAVMedia"/>
+ <toolbar:toolbaritem xlink:href=".uno:InsertObjectStarMath"/>
+ <toolbar:toolbaritem xlink:href=".uno:InsertObjectChart"/>
+ <toolbar:toolbaritem xlink:href=".uno:InsertObject" toolbar:visible="false"/>
+ <toolbar:toolbarseparator/>
 <toolbar:toolbaritem xlink:href=".uno:InsertMultiIndex"/>
- <toolbar:toolbaritem xlink:href=".uno:EditGlossary"/>
- <toolbar:toolbaritem xlink:href=".uno:InsertAnnotation"/>
- <toolbar:toolbaritem xlink:href=".uno:InsertBookmark"/>
-</toolbar:toolbar>
\ No newline at end of file
+ <toolbar:toolbaritem xlink:href=".uno:InsertIndexesEntry"/>
+</toolbar:toolbar>
+
--- a/sw/uiconfig/swxform/toolbar/numobjectbar.xml
+++ b/sw/uiconfig/swxform/toolbar/numobjectbar.xml
@@ -18,18 +18,26 @@
 *   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:IncrementLevel"/>
 <toolbar:toolbaritem xlink:href=".uno:DecrementLevel"/>
- <toolbar:toolbaritem xlink:href=".uno:IncrementSubLevels"/>
+ <toolbar:toolbaritem xlink:href=".uno:IncrementLevel"/>
 <toolbar:toolbaritem xlink:href=".uno:DecrementSubLevels"/>
+ <toolbar:toolbaritem xlink:href=".uno:IncrementSubLevels"/>
 <toolbar:toolbarseparator/>
- <toolbar:toolbaritem xlink:href=".uno:InsertNeutralParagraph"/>
- <toolbar:toolbarseparator/>
- <toolbar:toolbaritem xlink:href=".uno:MoveUp"/>
 <toolbar:toolbaritem xlink:href=".uno:MoveDown"/>
- <toolbar:toolbaritem xlink:href=".uno:MoveUpSubItems"/>
+ <toolbar:toolbaritem xlink:href=".uno:MoveUp"/>
 <toolbar:toolbaritem xlink:href=".uno:MoveDownSubItems"/>
+ <toolbar:toolbaritem xlink:href=".uno:MoveUpSubItems"/>
 <toolbar:toolbarseparator/>
+ <toolbar:toolbaritem xlink:href=".uno:InsertNeutralParagraph"/>
 <toolbar:toolbaritem xlink:href=".uno:NumberingStart"/>
+ <toolbar:toolbarseparator/>
+ <toolbar:toolbaritem xlink:href=".uno:JumpDownThisLevel" toolbar:visible="false"/>
+ <toolbar:toolbaritem xlink:href=".uno:JumpUpThisLevel" toolbar:visible="false"/>
+ <toolbar:toolbaritem xlink:href=".uno:ContinueNumbering" toolbar:visible="false"/>
+ <toolbar:toolbarseparator/>
+ <toolbar:toolbaritem xlink:href=".uno:DefaultBullet" toolbar:visible="false"/>
+ <toolbar:toolbaritem xlink:href=".uno:DefaultNumbering" toolbar:visible="false"/>
+ <toolbar:toolbaritem xlink:href=".uno:SetOutline" toolbar:visible="false"/>
+ <toolbar:toolbarseparator/>
 <toolbar:toolbaritem xlink:href=".uno:BulletsAndNumberingDialog"/>
 </toolbar:toolbar>
--- a/sw/uiconfig/swxform/toolbar/previewobjectbar.xml
+++ b/sw/uiconfig/swxform/toolbar/previewobjectbar.xml
@@ -18,23 +18,24 @@
 *   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:PageUp"/>
- <toolbar:toolbaritem xlink:href=".uno:PageDown"/>
- <toolbar:toolbarseparator/>
- <toolbar:toolbaritem xlink:href=".uno:GoToStartOfDoc"/>
- <toolbar:toolbaritem xlink:href=".uno:GoToEndOfDoc"/>
 <toolbar:toolbarseparator/>
 <toolbar:toolbaritem xlink:href=".uno:ShowSinglePage"/>
 <toolbar:toolbaritem xlink:href=".uno:ShowTwoPages"/>
- <toolbar:toolbaritem xlink:href=".uno:ShowMultiplePages"/>
 <toolbar:toolbaritem xlink:href=".uno:ShowBookview"/>
+ <toolbar:toolbaritem xlink:href=".uno:ShowMultiplePages"/>
+ <toolbar:toolbarseparator/>
+ <toolbar:toolbaritem xlink:href=".uno:GoToStartOfDoc"/>
+ <toolbar:toolbaritem xlink:href=".uno:PageUp"/>
+ <toolbar:toolbaritem xlink:href=".uno:JumpToSpecificPage"/>
+ <toolbar:toolbaritem xlink:href=".uno:PageDown"/>
+ <toolbar:toolbaritem xlink:href=".uno:GoToEndOfDoc"/>
 <toolbar:toolbarseparator/>
 <toolbar:toolbaritem xlink:href=".uno:ZoomMinus"/>
 <toolbar:toolbaritem xlink:href=".uno:PreviewZoom"/>
 <toolbar:toolbaritem xlink:href=".uno:ZoomPlus"/>
 <toolbar:toolbarseparator/>
+ <toolbar:toolbaritem xlink:href=".uno:Print"/>
 <toolbar:toolbaritem xlink:href=".uno:FullScreen"/>
- <toolbar:toolbaritem xlink:href=".uno:PrintPagePreview"/>
 <toolbar:toolbarseparator/>
- <toolbar:toolbaritem xlink:href=".uno:ClosePreview"/>
+ <toolbar:toolbaritem xlink:href=".uno:ClosePreview" toolbar:style="image text"/>
 </toolbar:toolbar>
--- a/sw/uiconfig/swxform/toolbar/standardbar.xml
+++ b/sw/uiconfig/swxform/toolbar/standardbar.xml
@@ -22,37 +22,68 @@
 <toolbar:toolbaritem xlink:href=".uno:AddDirect"/>
 <toolbar:toolbaritem xlink:href=".uno:NewDoc" toolbar:visible="false"/>
 <toolbar:toolbaritem xlink:href=".uno:Open"/>
+ <toolbar:toolbaritem xlink:href=".uno:OpenRemote" toolbar:visible="false"/>
 <toolbar:toolbaritem xlink:href=".uno:Save"/>
 <toolbar:toolbaritem xlink:href=".uno:SaveAs" toolbar:visible="false"/>
 <toolbar:toolbaritem xlink:href=".uno:SendMail" toolbar:visible="false"/>
 <toolbar:toolbarseparator/>
 <toolbar:toolbaritem xlink:href=".uno:EditDoc" toolbar:visible="false"/>
+ <toolbar:toolbaritem xlink:href=".uno:ReadOnlyDoc" toolbar:visible="false"/>
 <toolbar:toolbarseparator/>
 <toolbar:toolbaritem xlink:href=".uno:ExportDirectToPDF"/>
 <toolbar:toolbaritem xlink:href=".uno:ExportDirectToEPUB" toolbar:visible="false"/>
- <toolbar:toolbaritem xlink:href=".uno:PrintDefault" toolbar:visible="false"/>
 <toolbar:toolbaritem xlink:href=".uno:Print"/>
+ <toolbar:toolbaritem xlink:href=".uno:PrintDefault" toolbar:visible="false"/>
 <toolbar:toolbaritem xlink:href=".uno:PrintPreview"/>
 <toolbar:toolbarseparator/>
- <toolbar:toolbaritem xlink:href=".uno:SpellDialog"/>
- <toolbar:toolbaritem xlink:href=".uno:SpellOnline"/>
- <toolbar:toolbarseparator/>
 <toolbar:toolbaritem xlink:href=".uno:Cut"/>
 <toolbar:toolbaritem xlink:href=".uno:Copy"/>
 <toolbar:toolbaritem xlink:href=".uno:Paste"/>
+ <toolbar:toolbarseparator/>
 <toolbar:toolbaritem xlink:href=".uno:FormatPaintbrush"/>
+ <toolbar:toolbaritem xlink:href=".uno:ResetAttributes" toolbar:visible="false"/>
 <toolbar:toolbarseparator/>
 <toolbar:toolbaritem xlink:href=".uno:Undo"/>
 <toolbar:toolbaritem xlink:href=".uno:Redo"/>
 <toolbar:toolbarseparator/>
- <toolbar:toolbaritem xlink:href=".uno:HyperlinkDialog"/>
+ <toolbar:toolbaritem xlink:href=".uno:SearchDialog"/>
+ <toolbar:toolbaritem xlink:href=".uno:Navigator" toolbar:visible="false"/>
+ <toolbar:toolbaritem xlink:href=".uno:SpellingAndGrammarDialog"/>
+ <toolbar:toolbaritem xlink:href=".uno:SpellOnline" toolbar:visible="false"/>
+ <toolbar:toolbaritem xlink:href=".uno:ControlCodes"/>
+ <toolbar:toolbarseparator/>
 <toolbar:toolbaritem xlink:href=".uno:InsertTable"/>
+ <toolbar:toolbaritem xlink:href=".uno:InsertGraphic"/>
+ <toolbar:toolbaritem xlink:href=".uno:InsertObjectChart"/>
+ <toolbar:toolbaritem xlink:href=".uno:InsertObjectStarMath" toolbar:visible="false"/>
+ <toolbar:toolbaritem xlink:href=".uno:DrawText"/>
+ <toolbar:toolbaritem xlink:href=".uno:VerticalText" toolbar:visible="false"/>
+ <toolbar:toolbarseparator/>
+ <toolbar:toolbaritem xlink:href=".uno:InsertPagebreak"/>
+ <toolbar:toolbaritem xlink:href=".uno:InsertFieldCtrl"/>
+ <toolbar:toolbaritem xlink:href=".uno:InsertSymbol" toolbar:visible="false"/>
+ <toolbar:toolbaritem xlink:href=".uno:CharmapControl"/>
+ <toolbar:toolbaritem xlink:href=".uno:EmojiControl" toolbar:visible="false"/>
+ <toolbar:toolbarseparator/>
+ <toolbar:toolbaritem xlink:href=".uno:HyperlinkDialog"/>
+ <toolbar:toolbaritem xlink:href=".uno:InsertFootnote"/>
+ <toolbar:toolbaritem xlink:href=".uno:InsertEndnote"/>
+ <toolbar:toolbaritem xlink:href=".uno:InsertBookmark"/>
+ <toolbar:toolbaritem xlink:href=".uno:InsertReferenceField"/>
+ <toolbar:toolbaritem xlink:href=".uno:InsertIndexesEntry" toolbar:visible="false"/>
+ <toolbar:toolbarseparator/>
+ <toolbar:toolbaritem xlink:href=".uno:InsertAnnotation"/>
+ <toolbar:toolbaritem xlink:href=".uno:ShowTrackedChanges" toolbar:visible="false"/>
+ <toolbar:toolbaritem xlink:href=".uno:TrackChanges" toolbar:visible="false"/>
+ <toolbar:toolbaritem xlink:href=".uno:TrackChangesBar"/>
+ <toolbar:toolbarseparator/>
+ <toolbar:toolbaritem xlink:href=".uno:Line"/>
+ <toolbar:toolbaritem xlink:href=".uno:BasicShapes"/>
 <toolbar:toolbaritem xlink:href=".uno:InsertDraw"/>
 <toolbar:toolbarseparator/>
- <toolbar:toolbaritem xlink:href=".uno:SearchDialog" toolbar:visible="false"/>
 <toolbar:toolbaritem xlink:href=".uno:ViewDataSourceBrowser" toolbar:visible="false"/>
- <toolbar:toolbaritem xlink:href=".uno:ControlCodes"/>
 <toolbar:toolbaritem xlink:href=".uno:Zoom" 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>
--- a/sw/uiconfig/swxform/toolbar/starshapes.xml
+++ b/sw/uiconfig/swxform/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: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:toolbarbreak/>
+ <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>
--- a/sw/uiconfig/swxform/toolbar/symbolshapes.xml
+++ b/sw/uiconfig/swxform/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: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:toolbaritem xlink:href=".uno:SymbolShapes.flower"/>
 <toolbar:toolbarbreak/>
- <toolbar:toolbaritem xlink:href=".uno:SymbolShapes.cloud"/>
+ <toolbar:toolbaritem xlink:href=".uno:SymbolShapes.flower"/>
 <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:toolbarbreak/>
 <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>
--- a/sw/uiconfig/swxform/toolbar/tableobjectbar.xml
+++ b/sw/uiconfig/swxform/toolbar/tableobjectbar.xml
@@ -18,33 +18,52 @@
 *   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:LineStyle"/>
- <toolbar:toolbaritem xlink:href=".uno:FrameLineColor"/>
+ <toolbar:toolbaritem xlink:href=".uno:InsertRowsBefore"/>
+ <toolbar:toolbaritem xlink:href=".uno:InsertRowsAfter"/>
+ <toolbar:toolbaritem xlink:href=".uno:InsertColumnsBefore"/>
+ <toolbar:toolbaritem xlink:href=".uno:InsertColumnsAfter"/>
 <toolbar:toolbarseparator/>
- <toolbar:toolbaritem xlink:href=".uno:SetBorderStyle"/>
- <toolbar:toolbaritem xlink:href=".uno:BackgroundColor"/>
+ <toolbar:toolbaritem xlink:href=".uno:DeleteRows"/>
+ <toolbar:toolbaritem xlink:href=".uno:DeleteColumns"/>
+ <toolbar:toolbaritem xlink:href=".uno:DeleteTable"/>
+ <toolbar:toolbarseparator/>
+ <toolbar:toolbaritem xlink:href=".uno:EntireCell"/>
+ <toolbar:toolbaritem xlink:href=".uno:EntireRow" toolbar:visible="false"/>
+ <toolbar:toolbaritem xlink:href=".uno:EntireColumn" toolbar:visible="false"/>
+ <toolbar:toolbaritem xlink:href=".uno:SelectTable"/>
 <toolbar:toolbarseparator/>
 <toolbar:toolbaritem xlink:href=".uno:MergeCells"/>
 <toolbar:toolbaritem xlink:href=".uno:SplitCell"/>
+ <toolbar:toolbaritem xlink:href=".uno:SplitTable"/>
+ <toolbar:toolbarseparator/>
 <toolbar:toolbaritem xlink:href=".uno:OptimizeTable"/>
- <toolbar:toolbarbreak/>
+ <toolbar:toolbarseparator/>
 <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:InsertRowsAfter"/>
- <toolbar:toolbaritem xlink:href=".uno:InsertColumnsAfter"/>
- <toolbar:toolbaritem xlink:href=".uno:DeleteRows"/>
- <toolbar:toolbaritem xlink:href=".uno:DeleteColumns"/>
+ <toolbar:toolbaritem xlink:href=".uno:TableCellBackgroundColor"/>
+ <toolbar:toolbaritem xlink:href=".uno:AutoFormat"/>
 <toolbar:toolbarseparator/>
- <toolbar:toolbaritem xlink:href=".uno:SelectTable" toolbar:visible="false"/>
- <toolbar:toolbaritem xlink:href=".uno:EntireColumn" toolbar:visible="false"/>
- <toolbar:toolbaritem xlink:href=".uno:EntireRow" toolbar:visible="false"/>
+ <toolbar:toolbaritem xlink:href=".uno:SetBorderStyle"/>
+ <toolbar:toolbaritem xlink:href=".uno:LineStyle"/>
+ <toolbar:toolbaritem xlink:href=".uno:FrameLineColor"/>
 <toolbar:toolbarseparator/>
- <toolbar:toolbaritem xlink:href=".uno:AutoFormat"/>
- <toolbar:toolbaritem xlink:href=".uno:TableDialog"/>
+ <toolbar:toolbaritem xlink:href=".uno:NumberFormatStandard" toolbar:visible="false"/>
+ <toolbar:toolbaritem xlink:href=".uno:NumberFormatCurrency"/>
+ <toolbar:toolbaritem xlink:href=".uno:NumberFormatPercent"/>
+ <toolbar:toolbaritem xlink:href=".uno:NumberFormatDecimal"/>
+ <toolbar:toolbaritem xlink:href=".uno:NumberFormatDate" toolbar:visible="false"/>
+ <toolbar:toolbaritem xlink:href=".uno:TableNumberFormatDialog"/>
 <toolbar:toolbarseparator/>
+ <toolbar:toolbaritem xlink:href=".uno:InsertCaptionDialog"/>
 <toolbar:toolbaritem xlink:href=".uno:TableSort"/>
 <toolbar:toolbarseparator/>
+ <toolbar:toolbaritem xlink:href=".uno:Protect"/>
+ <toolbar:toolbaritem xlink:href=".uno:UnsetCellsReadOnly"/>
+ <toolbar:toolbarseparator/>
 <toolbar:toolbaritem xlink:href=".uno:AutoSum"/>
+ <toolbar:toolbaritem xlink:href=".uno:InsertFormula"/>
+ <toolbar:toolbarseparator/>
+ <toolbar:toolbaritem xlink:href=".uno:TableDialog"/>
 </toolbar:toolbar>