tdf#103733 Unify master doc menu and toolbars with writer

Change-Id: I1f6ce6c98cd7087ccb874001c29a8532cd7ed360
Reviewed-on: https://gerrit.libreoffice.org/42108Reviewed-by: Yousuf Philips <philipz85@hotmail.com>
Tested-by: Yousuf Philips <philipz85@hotmail.com>

officecfg/registry/data/org/openoffice/Office/UI/WriterGlobalWindowState.xcu

@@ -441,10 +441,10 @@
       </node>
       <node oor:name="private:resource/toolbar/graphicobjectbar" oor:op="replace">
         <prop oor:name="DockPos" oor:type="xs:string">
-          <value>z,0</value>
+          <value>1,1</value>
         </prop>
         <prop oor:name="DockingArea" oor:type="xs:int">
-          <value>1</value>
+          <value>0</value>
         </prop>
         <prop oor:name="Docked" oor:type="xs:boolean">
           <value>true</value>
@@ -774,6 +774,23 @@
           <value>true</value>
         </prop>
       </node>
+      <node oor:name="private:resource/toolbar/changes" oor:op="replace">
+        <prop oor:name="DockPos" oor:type="xs:string">
+          <value>1,2</value>
+        </prop>
+        <prop oor:name="DockingArea" oor:type="xs:int">
+          <value>1</value>
+        </prop>
+        <prop oor:name="UIName" oor:type="xs:string">
+          <value xml:lang="en-US">Track Changes</value>
+        </prop>
+        <prop oor:name="Docked" oor:type="xs:boolean">
+          <value>true</value>
+        </prop>
+        <prop oor:name="Visible" oor:type="xs:boolean">
+          <value>false</value>
+        </prop>
+      </node>
     </node>
   </node>
 </oor:component-data>

sw/uiconfig/sglobal/toolbar/changes.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:ShowTrackedChanges"/>
+ <toolbar:toolbaritem xlink:href=".uno:TrackChanges"/>
+ <toolbar:toolbarseparator/>
+ <toolbar:toolbaritem xlink:href=".uno:PreviousTrackedChange"/>
+ <toolbar:toolbaritem xlink:href=".uno:NextTrackedChange"/>
+ <toolbar:toolbaritem xlink:href=".uno:AcceptTrackedChange"/>
+ <toolbar:toolbaritem xlink:href=".uno:RejectTrackedChange"/>
+ <toolbar:toolbaritem xlink:href=".uno:AcceptTrackedChanges"/>
+ <toolbar:toolbarseparator/>
+ <toolbar:toolbaritem xlink:href=".uno:InsertAnnotation"/>
+ <toolbar:toolbaritem xlink:href=".uno:CommentChangeTracking"/>
+ <toolbar:toolbarseparator/>
+ <toolbar:toolbaritem xlink:href=".uno:ProtectTraceChangeMode"/>
+ <toolbar:toolbaritem xlink:href=".uno:CompareDocuments"/>
+ <toolbar:toolbaritem xlink:href=".uno:MergeDocuments"/>
+</toolbar:toolbar>

sw/uiconfig/sglobal/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>

sw/uiconfig/sglobal/toolbar/drawingobjectbar.xml

@@ -18,40 +18,49 @@
  *   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:FormatLine"/>
- <toolbar:toolbaritem xlink:href=".uno:LineEndStyle"/>
+ <toolbar:toolbaritem xlink:href=".uno:XLineColor"/>
  <toolbar:toolbarseparator/>
+ <toolbar:toolbaritem xlink:href=".uno:LineEndStyle"/>
  <toolbar:toolbaritem xlink:href=".uno:XLineStyle"/>
  <toolbar:toolbarseparator/>
  <toolbar:toolbaritem xlink:href=".uno:LineWidth"/>
  <toolbar:toolbarseparator/>
- <toolbar:toolbaritem xlink:href=".uno:XLineColor"/>
- <toolbar:toolbarseparator/>
- <toolbar:toolbaritem xlink:href=".uno:FormatArea"/>
+ <toolbar:toolbaritem xlink:href=".uno:FillColor"/>
  <toolbar:toolbarseparator/>
  <toolbar:toolbaritem xlink:href=".uno:FillStyle"/>
  <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:AnchorMenu"/>
  <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:WrapOff"/>
+ <toolbar:toolbaritem xlink:href=".uno:WrapOn"/>
+ <toolbar:toolbaritem xlink:href=".uno:WrapIdeal"/>
  <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:WrapThrough"/>
  <toolbar:toolbaritem xlink:href=".uno:WrapContour" toolbar:visible="false"/>
  <toolbar:toolbarseparator/>
- <toolbar:toolbaritem xlink:href=".uno:SetObjectToForeground"/>
- <toolbar:toolbaritem xlink:href=".uno:SetObjectToBackground"/>
+ <toolbar:toolbaritem xlink:href=".uno:ToggleObjectRotateMode"/>
+ <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:toolbaritem xlink:href=".uno:ObjectAlign"/>
  <toolbar:toolbarseparator/>
- <toolbar:toolbaritem xlink:href=".uno:AnchorMenu"/>
+ <toolbar:toolbaritem xlink:href=".uno:SetObjectToForeground"/>
+ <toolbar:toolbaritem xlink:href=".uno:SetObjectToBackground"/>
  <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:EnterGroup"/>
+ <toolbar:toolbaritem xlink:href=".uno:LeaveGroup"/>
+ <toolbar:toolbaritem xlink:href=".uno:FormatUngroup"/>
+ <toolbar:toolbarseparator/>
+ <toolbar:toolbaritem xlink:href=".uno:InsertCaptionDialog"/>
+ <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:FormatLine" toolbar:visible="false"/>
+ <toolbar:toolbaritem xlink:href=".uno:FormatArea" toolbar:visible="false"/>
+</toolbar:toolbar>

sw/uiconfig/sglobal/toolbar/frameobjectbar.xml

@@ -18,11 +18,13 @@
  *   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:StyleApply"/>
+ <toolbar:toolbaritem xlink:href=".uno:StyleApply" toolbar:visible="false"/>
+ <toolbar:toolbarseparator/>
+ <toolbar:toolbaritem xlink:href=".uno:AnchorMenu"/>
  <toolbar:toolbarseparator/>
  <toolbar:toolbaritem xlink:href=".uno:WrapOff"/>
  <toolbar:toolbaritem xlink:href=".uno:WrapOn"/>
- <toolbar:toolbaritem xlink:href=".uno:WrapIdeal" toolbar:visible="false"/>
+ <toolbar:toolbaritem xlink:href=".uno:WrapIdeal"/>
  <toolbar:toolbaritem xlink:href=".uno:WrapLeft" toolbar:visible="false"/>
  <toolbar:toolbaritem xlink:href=".uno:WrapRight" toolbar:visible="false"/>
  <toolbar:toolbaritem xlink:href=".uno:WrapThrough"/>
@@ -35,17 +37,21 @@
  <toolbar:toolbaritem xlink:href=".uno:AlignVerticalCenter"/>
  <toolbar:toolbaritem xlink:href=".uno:AlignBottom"/>
  <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:visible="false"/>
+ <toolbar:toolbaritem xlink:href=".uno:SetObjectToBackground" toolbar:visible="false"/>
+ <toolbar:toolbarseparator/>
  <toolbar:toolbaritem xlink:href=".uno:SetBorderStyle"/>
  <toolbar:toolbaritem xlink:href=".uno:LineStyle"/>
  <toolbar:toolbaritem xlink:href=".uno:FrameLineColor"/>
  <toolbar:toolbaritem xlink:href=".uno:BackgroundColor"/>
  <toolbar:toolbarseparator/>
- <toolbar:toolbaritem xlink:href=".uno:FrameDialog"/>
- <toolbar:toolbarseparator/>
- <toolbar:toolbaritem xlink:href=".uno:BringToFront"/>
- <toolbar:toolbaritem xlink:href=".uno:SendToBack"/>
- <toolbar:toolbaritem xlink:href=".uno:AnchorMenu"/>
- <toolbar:toolbarseparator/>
  <toolbar:toolbaritem xlink:href=".uno:ChainFrames"/>
  <toolbar:toolbaritem xlink:href=".uno:UnhainFrames"/>
-</toolbar:toolbar>
\ No newline at end of file
+ <toolbar:toolbarseparator/>
+ <toolbar:toolbaritem xlink:href=".uno:FrameDialog" toolbar:visible="false"/>
+</toolbar:toolbar>

sw/uiconfig/sglobal/toolbar/graphicobjectbar.xml

@@ -22,16 +22,18 @@
  <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:Rotate180"/>
- <toolbar:toolbaritem xlink:href=".uno:Crop"/>
+ <toolbar:toolbaritem xlink:href=".uno:Rotate180" toolbar:visible="false"/>
+ <toolbar:toolbarseparator/>
+ <toolbar:toolbaritem xlink:href=".uno:GrafTransparence"/>
+ <toolbar:toolbarseparator/>
+ <toolbar:toolbaritem xlink:href=".uno:ColorSettings"/>
  <toolbar:toolbarseparator/>
- <toolbar:toolbaritem xlink:href=".uno:FrameDialog"/>
+ <toolbar:toolbaritem xlink:href=".uno:InsertCaptionDialog" toolbar:visible="false"/>
+ <toolbar:toolbaritem xlink:href=".uno:GraphicDialog" toolbar:visible="false"/>
 </toolbar:toolbar>

sw/uiconfig/sglobal/toolbar/insertbar.xml

@@ -29,7 +29,7 @@
  <toolbar:toolbaritem xlink:href=".uno:InsertBookmark"/>
  <toolbar:toolbaritem xlink:href=".uno:InsertReferenceField" toolbar:visible="false"/>
  <toolbar:toolbarseparator/>
- <toolbar:toolbaritem xlink:href=".uno:InsertDoc"/>
+ <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:InsertFieldCtrl"/>
@@ -44,3 +44,4 @@
  <toolbar:toolbaritem xlink:href=".uno:InsertMultiIndex"/>
  <toolbar:toolbaritem xlink:href=".uno:InsertIndexesEntry"/>
 </toolbar:toolbar>
+

sw/uiconfig/sglobal/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>

sw/uiconfig/sglobal/toolbar/oleobjectbar.xml

@@ -18,7 +18,16 @@
  *   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:StyleApply"/>
+ <toolbar:toolbaritem xlink:href=".uno:StyleApply" toolbar:visible="false"/>
+ <toolbar:toolbarseparator/>
+ <toolbar:toolbaritem xlink:href=".uno:AnchorMenu"/>
+ <toolbar:toolbarseparator/>
+ <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:visible="false"/>
+ <toolbar:toolbaritem xlink:href=".uno:WrapRight" toolbar:visible="false"/>
+ <toolbar:toolbaritem xlink:href=".uno:WrapThrough"/>
  <toolbar:toolbarseparator/>
  <toolbar:toolbaritem xlink:href=".uno:AlignLeft"/>
  <toolbar:toolbaritem xlink:href=".uno:AlignHorizontalCenter"/>
@@ -28,20 +37,15 @@
  <toolbar:toolbaritem xlink:href=".uno:AlignVerticalCenter"/>
  <toolbar:toolbaritem xlink:href=".uno:AlignBottom"/>
  <toolbar:toolbarseparator/>
- <toolbar:toolbaritem xlink:href=".uno:WrapLeft" toolbar:visible="false"/>
- <toolbar:toolbaritem xlink:href=".uno:WrapRight" toolbar:visible="false"/>
- <toolbar:toolbaritem xlink:href=".uno:WrapOff"/>
- <toolbar:toolbaritem xlink:href=".uno:WrapOn"/>
- <toolbar:toolbaritem xlink:href=".uno:WrapThrough"/>
- <toolbar:toolbaritem xlink:href=".uno:WrapIdeal" toolbar:visible="false"/>
- <toolbar:toolbarseparator/>
- <toolbar:toolbaritem xlink:href=".uno:FrameDialog"/>
- <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:toolbaritem xlink:href=".uno:AnchorMenu"/>
  <toolbar:toolbarseparator/>
  <toolbar:toolbaritem xlink:href=".uno:SetBorderStyle"/>
  <toolbar:toolbaritem xlink:href=".uno:LineStyle"/>
  <toolbar:toolbaritem xlink:href=".uno:FrameLineColor"/>
-</toolbar:toolbar>
\ No newline at end of file
+ <toolbar:toolbaritem xlink:href=".uno:BackgroundColor"/>
+ <toolbar:toolbarseparator/>
+ <toolbar:toolbaritem xlink:href=".uno:FrameDialog" toolbar:visible="false"/>
+</toolbar:toolbar>

sw/uiconfig/sglobal/toolbar/standardbar.xml

@@ -22,6 +22,7 @@
  <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"/>
@@ -30,29 +31,58 @@
  <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:SpellingAndGrammarDialog"/>
- <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:EmojiControl" toolbar:visible="false"/>
+ <toolbar:toolbaritem xlink:href=".uno:InsertSymbol"/>
+ <toolbar:toolbaritem xlink:href=".uno:CharmapControl" 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>

sw/uiconfig/sglobal/toolbar/textobjectbar.xml

@@ -21,39 +21,63 @@
  <toolbar:toolbaritem xlink:href=".uno:DesignerDialog" toolbar:visible="false"/>
  <toolbar:toolbarseparator/>
  <toolbar:toolbaritem xlink:href=".uno:StyleApply"/>
+ <toolbar:toolbaritem xlink:href=".uno:StyleUpdateByExample"/>
+ <toolbar:toolbaritem xlink:href=".uno:StyleNewByExample"/>
+ <toolbar:toolbaritem xlink:href=".uno:EditStyle" toolbar:visible="false"/>
  <toolbar:toolbarseparator/>
  <toolbar:toolbaritem xlink:href=".uno:CharFontName"/>
  <toolbar:toolbarseparator/>
  <toolbar:toolbaritem xlink:href=".uno:FontHeight"/>
+ <toolbar:toolbaritem xlink:href=".uno:Grow" toolbar:visible="false"/>
+ <toolbar:toolbaritem xlink:href=".uno:Shrink" toolbar:visible="false"/>
  <toolbar:toolbarseparator/>
  <toolbar:toolbaritem xlink:href=".uno:Bold"/>
  <toolbar:toolbaritem xlink:href=".uno:Italic"/>
- <toolbar:toolbaritem xlink:href=".uno:Underline"/>
- <toolbar:toolbaritem xlink:href=".uno:SuperScript" toolbar:visible="false"/>
- <toolbar:toolbaritem xlink:href=".uno:SubScript" toolbar:visible="false"/>
+ <toolbar:toolbaritem xlink:href=".uno:UnderlineSimple"/>
+ <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:visible="false"/>
+ <toolbar:toolbaritem xlink:href=".uno:OutlineFont" toolbar:visible="false"/>
+ <toolbar:toolbaritem xlink:href=".uno:ResetAttributes"/>
+ <toolbar:toolbarseparator/>
+ <toolbar:toolbaritem xlink:href=".uno:ChangeCaseToLower" toolbar:visible="false"/>
+ <toolbar:toolbaritem xlink:href=".uno:ChangeCaseToUpper" toolbar:visible="false"/>
+ <toolbar:toolbaritem xlink:href=".uno:SmallCaps" toolbar:visible="false"/>
+ <toolbar:toolbarseparator/>
+ <toolbar:toolbaritem xlink:href=".uno:Color"/>
+ <toolbar:toolbaritem xlink:href=".uno:BackColor"/>
+ <toolbar:toolbaritem xlink:href=".uno:BackgroundColor" toolbar:visible="false"/>
+ <toolbar:toolbarseparator/>
+ <toolbar:toolbaritem xlink:href=".uno:DefaultBullet"/>
+ <toolbar:toolbaritem xlink:href=".uno:DefaultNumbering"/>
+ <toolbar:toolbaritem xlink:href=".uno:SetOutline" toolbar:visible="false"/>
  <toolbar:toolbarseparator/>
  <toolbar:toolbaritem xlink:href=".uno:LeftPara"/>
  <toolbar:toolbaritem xlink:href=".uno:CenterPara"/>
  <toolbar:toolbaritem xlink:href=".uno:RightPara"/>
  <toolbar:toolbaritem xlink:href=".uno:JustifyPara"/>
  <toolbar:toolbarseparator/>
- <toolbar:toolbaritem xlink:href=".uno:ParaLeftToRight"/>
- <toolbar:toolbaritem xlink:href=".uno:ParaRightToLeft"/>
+ <toolbar:toolbaritem xlink:href=".uno:CellVertTop" toolbar:visible="false"/>
+ <toolbar:toolbaritem xlink:href=".uno:CellVertCenter" toolbar:visible="false"/>
+ <toolbar:toolbaritem xlink:href=".uno:CellVertBottom" toolbar:visible="false"/>
  <toolbar:toolbarseparator/>
- <toolbar:toolbaritem xlink:href=".uno:SpacePara1" toolbar:visible="false"/>
- <toolbar:toolbaritem xlink:href=".uno:SpacePara15" toolbar:visible="false"/>
- <toolbar:toolbaritem xlink:href=".uno:SpacePara2" toolbar:visible="false"/>
+ <toolbar:toolbaritem xlink:href=".uno:LineSpacing"/>
+ <toolbar:toolbaritem xlink:href=".uno:Spacing" toolbar:visible="false"/>
+ <toolbar:toolbaritem xlink:href=".uno:ParaspaceIncrease"/>
+ <toolbar:toolbaritem xlink:href=".uno:ParaspaceDecrease"/>
  <toolbar:toolbarseparator/>
- <toolbar:toolbaritem xlink:href=".uno:DefaultNumbering"/>
- <toolbar:toolbaritem xlink:href=".uno:DefaultBullet"/>
- <toolbar:toolbaritem xlink:href=".uno:DecrementIndent"/>
  <toolbar:toolbaritem xlink:href=".uno:IncrementIndent"/>
- <toolbar:toolbaritem xlink:href=".uno:Grow" toolbar:visible="false"/>
- <toolbar:toolbaritem xlink:href=".uno:Shrink" toolbar:visible="false"/>
+ <toolbar:toolbaritem xlink:href=".uno:DecrementIndent"/>
  <toolbar:toolbarseparator/>
- <toolbar:toolbaritem xlink:href=".uno:FontColor"/>
- <toolbar:toolbaritem xlink:href=".uno:BackColor"/>
- <toolbar:toolbaritem xlink:href=".uno:BackgroundColor"/>
+ <toolbar:toolbaritem xlink:href=".uno:ParaLeftToRight"/>
+ <toolbar:toolbaritem xlink:href=".uno:ParaRightToLeft"/>
+ <toolbar:toolbarseparator/>
+ <toolbar:toolbaritem xlink:href=".uno:Orientation" toolbar:visible="false"/>
  <toolbar:toolbarseparator/>
  <toolbar:toolbaritem xlink:href=".uno:SelectAll" toolbar:visible="false"/>
  <toolbar:toolbaritem xlink:href=".uno:FontDialog" toolbar:visible="false"/>