tdf#81475 Improvements to writer's toolbars

Hide entries in the standard and table toolbars and add useful entries into the formatting, object, and bullets toolbars. Also make bullets and table toolbars appear on a different line than the drawing toolbar.

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

9 files changed, 31 insertions, 14 deletions

diff --git a/officecfg/registry/data/org/openoffice/Office/UI/GenericCommands.xcu b/officecfg/registry/data/org/openoffice/Office/UI/GenericCommands.xcu
index 65306fbf2838..29e005da39a8 100644
--- a/officecfg/registry/data/org/openoffice/Office/UI/GenericCommands.xcu
+++ b/officecfg/registry/data/org/openoffice/Office/UI/GenericCommands.xcu
@@ -2176,6 +2176,9 @@
       </node>
       <node oor:name=".uno:ToggleObjectBezierMode" oor:op="replace">
         <prop oor:name="Label" oor:type="xs:string">
+          <value xml:lang="en-US">Edit Points</value>
+        </prop>
+        <prop oor:name="ContextLabel" oor:type="xs:string">
           <value xml:lang="en-US">Poi~nts</value>
         </prop>
         <prop oor:name="Properties" oor:type="xs:int">
@@ -2697,7 +2700,7 @@
       </node>
       <node oor:name=".uno:StyleNewByExample" oor:op="replace">
         <prop oor:name="Label" oor:type="xs:string">
-          <value xml:lang="en-US">~New Style from Selection...</value>
+          <value xml:lang="en-US">~New Style...</value>
         </prop>
         <prop oor:name="Properties" oor:type="xs:int">
           <value>1</value>
diff --git a/officecfg/registry/data/org/openoffice/Office/UI/WriterCommands.xcu b/officecfg/registry/data/org/openoffice/Office/UI/WriterCommands.xcu
index 632fcc411d4c..3981ce1fbd7f 100644
--- a/officecfg/registry/data/org/openoffice/Office/UI/WriterCommands.xcu
+++ b/officecfg/registry/data/org/openoffice/Office/UI/WriterCommands.xcu
@@ -1052,7 +1052,7 @@
       </node>
       <node oor:name=".uno:AlignTop" oor:op="replace">
         <prop oor:name="Label" oor:type="xs:string">
-          <value xml:lang="en-US">Align Top</value>
+          <value xml:lang="en-US">Align Top to Anchor</value>
         </prop>
         <prop oor:name="Properties" oor:type="xs:int">
           <value>1</value>
@@ -1060,7 +1060,7 @@
       </node>
       <node oor:name=".uno:AlignBottom" oor:op="replace">
         <prop oor:name="Label" oor:type="xs:string">
-          <value xml:lang="en-US">Align Bottom</value>
+          <value xml:lang="en-US">Align Bottom to Anchor</value>
         </prop>
         <prop oor:name="Properties" oor:type="xs:int">
           <value>1</value>
@@ -1068,7 +1068,7 @@
       </node>
       <node oor:name=".uno:AlignVerticalCenter" oor:op="replace">
         <prop oor:name="Label" oor:type="xs:string">
-          <value xml:lang="en-US">Align Vertical Center</value>
+          <value xml:lang="en-US">Align Middle to Anchor</value>
         </prop>
         <prop oor:name="Properties" oor:type="xs:int">
           <value>1</value>
@@ -1261,7 +1261,7 @@
       </node>
       <node oor:name=".uno:OptimizeTable" oor:op="replace">
         <prop oor:name="Label" oor:type="xs:string">
-          <value xml:lang="en-US">Optimize</value>
+          <value xml:lang="en-US">Optimize Size</value>
         </prop>
         <prop oor:name="Properties" oor:type="xs:int">
           <value>1</value>
diff --git a/officecfg/registry/data/org/openoffice/Office/UI/WriterWindowState.xcu b/officecfg/registry/data/org/openoffice/Office/UI/WriterWindowState.xcu
index d710e22bc89d..add0851302fe 100644
--- a/officecfg/registry/data/org/openoffice/Office/UI/WriterWindowState.xcu
+++ b/officecfg/registry/data/org/openoffice/Office/UI/WriterWindowState.xcu
@@ -99,7 +99,7 @@
       </node>
       <node oor:name="private:resource/toolbar/tableobjectbar" oor:op="replace">
         <prop oor:name="DockPos" oor:type="xs:string">
-          <value>0,0</value>
+          <value>0,1</value>
         </prop>
         <prop oor:name="DockingArea" oor:type="xs:int">
           <value>1</value>
@@ -119,7 +119,7 @@
       </node>
       <node oor:name="private:resource/toolbar/numobjectbar" oor:op="replace">
         <prop oor:name="DockPos" oor:type="xs:string">
-          <value>0,0</value>
+          <value>0,2</value>
         </prop>
         <prop oor:name="DockingArea" oor:type="xs:int">
           <value>1</value>
diff --git a/sw/uiconfig/swriter/toolbar/drawingobjectbar.xml b/sw/uiconfig/swriter/toolbar/drawingobjectbar.xml
index 308c8b191ab2..2c3ba2aa17c1 100644
--- a/sw/uiconfig/swriter/toolbar/drawingobjectbar.xml
+++ b/sw/uiconfig/swriter/toolbar/drawingobjectbar.xml
@@ -51,8 +51,12 @@
  <toolbar:toolbaritem xlink:href=".uno:SetObjectToBackground" toolbar:helpid="10282"/>
  <toolbar:toolbarseparator/>
  <toolbar:toolbaritem xlink:href=".uno:FormatGroup" toolbar:helpid="10454"/>
+ <toolbar:toolbaritem xlink:href=".uno:EnterGroup"/>
+ <toolbar:toolbaritem xlink:href=".uno:LeaveGroup"/>
  <toolbar:toolbaritem xlink:href=".uno:FormatUngroup" toolbar:helpid="10455"/>
  <toolbar:toolbarseparator/>
+ <toolbar:toolbaritem xlink:href=".uno:InsertCaptionDialog"/>
+ <toolbar:toolbarseparator/>
  <toolbar:toolbaritem xlink:href=".uno:GridVisible" toolbar:visible="false" toolbar:helpid="27322"/>
  <toolbar:toolbaritem xlink:href=".uno:GridUse" toolbar:visible="false" toolbar:helpid="27154"/>
  <toolbar:toolbaritem xlink:href=".uno:HelplinesMove" toolbar:visible="false" toolbar:helpid="27153"/>
diff --git a/sw/uiconfig/swriter/toolbar/numobjectbar.xml b/sw/uiconfig/swriter/toolbar/numobjectbar.xml
index f5b49ee38c67..13119f138fd2 100644
--- a/sw/uiconfig/swriter/toolbar/numobjectbar.xml
+++ b/sw/uiconfig/swriter/toolbar/numobjectbar.xml
@@ -31,5 +31,13 @@
  <toolbar:toolbaritem xlink:href=".uno:InsertNeutralParagraph" toolbar:helpid="20136"/>
  <toolbar:toolbaritem xlink:href=".uno:NumberingStart" toolbar:helpid="21738"/>
  <toolbar:toolbarseparator/>
- <toolbar:toolbaritem xlink:href=".uno:BulletsAndNumberingDialog" toolbar:helpid="20121" toolbar:visible="false"/>
+ <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:helpid="20121"/>
 </toolbar:toolbar>
diff --git a/sw/uiconfig/swriter/toolbar/oleobjectbar.xml b/sw/uiconfig/swriter/toolbar/oleobjectbar.xml
index dc1cce5eafef..941ba4f3b8f3 100644
--- a/sw/uiconfig/swriter/toolbar/oleobjectbar.xml
+++ b/sw/uiconfig/swriter/toolbar/oleobjectbar.xml
@@ -47,5 +47,5 @@
  <toolbar:toolbaritem xlink:href=".uno:FrameLineColor" toolbar:helpid="10201"/>
  <toolbar:toolbaritem xlink:href=".uno:BackgroundColor"/>
  <toolbar:toolbarseparator/>
- <toolbar:toolbaritem xlink:href=".uno:FrameDialog" toolbar:helpid="20456"/>
+ <toolbar:toolbaritem xlink:href=".uno:FrameDialog" toolbar:helpid="20456" toolbar:visible="false"/>
 </toolbar:toolbar>
diff --git a/sw/uiconfig/swriter/toolbar/standardbar.xml b/sw/uiconfig/swriter/toolbar/standardbar.xml
index 533ef8ddf357..6d36cc0f2583 100644
--- a/sw/uiconfig/swriter/toolbar/standardbar.xml
+++ b/sw/uiconfig/swriter/toolbar/standardbar.xml
@@ -61,7 +61,7 @@
  <toolbar:toolbarseparator/>
  <toolbar:toolbaritem xlink:href=".uno:HyperlinkDialog" toolbar:helpid="5678"/>
  <toolbar:toolbaritem xlink:href=".uno:InsertFootnote" toolbar:helpid="20399"/>
- <toolbar:toolbaritem xlink:href=".uno:InsertEndnote"/>
+ <toolbar:toolbaritem xlink:href=".uno:InsertEndnote" toolbar:visible="false"/>
  <toolbar:toolbaritem xlink:href=".uno:InsertBookmark"/>
  <toolbar:toolbaritem xlink:href=".uno:InsertReferenceField" toolbar:visible="false"/>
  <toolbar:toolbaritem xlink:href=".uno:InsertIndexesEntry" toolbar:visible="false"/>
diff --git a/sw/uiconfig/swriter/toolbar/tableobjectbar.xml b/sw/uiconfig/swriter/toolbar/tableobjectbar.xml
index 549fc9e2eb65..51abbde7cb8d 100644
--- a/sw/uiconfig/swriter/toolbar/tableobjectbar.xml
+++ b/sw/uiconfig/swriter/toolbar/tableobjectbar.xml
@@ -28,8 +28,8 @@
  <toolbar:toolbaritem xlink:href=".uno:DeleteTable"/>
  <toolbar:toolbarseparator/>
  <toolbar:toolbaritem xlink:href=".uno:EntireCell"/>
- <toolbar:toolbaritem xlink:href=".uno:EntireRow"/>
- <toolbar:toolbaritem xlink:href=".uno:EntireColumn"/>
+ <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"/>
diff --git a/sw/uiconfig/swriter/toolbar/textobjectbar.xml b/sw/uiconfig/swriter/toolbar/textobjectbar.xml
index 974eca0b49d6..d4957fcf91f7 100644
--- a/sw/uiconfig/swriter/toolbar/textobjectbar.xml
+++ b/sw/uiconfig/swriter/toolbar/textobjectbar.xml
@@ -21,6 +21,8 @@
  <toolbar:toolbaritem xlink:href=".uno:DesignerDialog" toolbar:visible="false" toolbar:helpid="5539"/>
  <toolbar:toolbarseparator/>
  <toolbar:toolbaritem xlink:href=".uno:StyleApply"/>
+ <toolbar:toolbaritem xlink:href=".uno:StyleUpdateByExample"/>
+ <toolbar:toolbaritem xlink:href=".uno:StyleNewByExample"/>
  <toolbar:toolbarseparator/>
  <toolbar:toolbaritem xlink:href=".uno:CharFontName"/>
  <toolbar:toolbarseparator/>
@@ -38,8 +40,8 @@
  <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: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"/>