tdf#103170 Heikobar: hide list buttons and add third column to insert

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

1 files changed, 212 insertions, 155 deletions

diff --git a/sw/uiconfig/swriter/ui/notebookbar_groups.ui b/sw/uiconfig/swriter/ui/notebookbar_groups.ui
index c2b2a60f3be4..dd3b90617263 100644
--- a/sw/uiconfig/swriter/ui/notebookbar_groups.ui
+++ b/sw/uiconfig/swriter/ui/notebookbar_groups.ui
@@ -1,8 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!-- Generated with glade 3.18.3 -->
+<!-- Generated with glade 3.16.1 -->
 <interface>
   <requires lib="gtk+" version="3.12"/>
-  <requires lib="LibreOffice" version="1.0"/>
+  <!-- interface-requires LibreOffice 1.0 -->
   <!-- interface-local-resource-path ../../../icon-themes/galaxy/cmd/ -->
   <object class="GtkImage" id="boldi">
     <property name="visible">True</property>
@@ -19,11 +19,6 @@
     <property name="can_focus">False</property>
     <property name="pixbuf">cmd/sc_centerpara.png</property>
   </object>
-  <object class="GtkImage" id="charti">
-    <property name="visible">True</property>
-    <property name="can_focus">False</property>
-    <property name="pixbuf">cmd/sc_insertobjectchart.png</property>
-  </object>
   <object class="GtkImage" id="growi">
     <property name="visible">True</property>
     <property name="can_focus">False</property>
@@ -942,6 +937,7 @@
                         <property name="visible">True</property>
                         <property name="can_focus">False</property>
                         <property name="valign">center</property>
+                        <property name="orientation">vertical</property>
                         <child>
                           <object class="sfxlo-SidebarToolBox" id="font">
                             <property name="visible">True</property>
@@ -1263,18 +1259,18 @@
                     <property name="can_focus">False</property>
                     <property name="orientation">vertical</property>
                     <child>
-                      <object class="sfxlo-SidebarToolBox" id="colorbar_writer">
+                      <object class="sfxlo-SidebarToolBox" id="backgroundbox">
                         <property name="height_request">26</property>
                         <property name="visible">True</property>
                         <property name="can_focus">False</property>
                         <property name="show_arrow">False</property>
                         <child>
-                          <object class="GtkMenuToolButton" id="highlight">
+                          <object class="GtkMenuToolButton" id="backgroundcolor">
                             <property name="use_action_appearance">False</property>
                             <property name="visible">True</property>
                             <property name="can_focus">False</property>
                             <property name="is_important">True</property>
-                            <property name="action_name">.uno:BackColor</property>
+                            <property name="action_name">.uno:BackgroundColor</property>
                             <property name="use_underline">True</property>
                           </object>
                           <packing>
@@ -1291,18 +1287,18 @@
                       </packing>
                     </child>
                     <child>
-                      <object class="sfxlo-SidebarToolBox" id="colorbar_writer2">
+                      <object class="sfxlo-SidebarToolBox" id="highlightbox">
                         <property name="height_request">26</property>
                         <property name="visible">True</property>
                         <property name="can_focus">False</property>
                         <property name="show_arrow">False</property>
                         <child>
-                          <object class="GtkMenuToolButton" id="backgroundcolor">
+                          <object class="GtkMenuToolButton" id="highlight">
                             <property name="use_action_appearance">False</property>
                             <property name="visible">True</property>
                             <property name="can_focus">False</property>
                             <property name="is_important">True</property>
-                            <property name="action_name">.uno:BackgroundColor</property>
+                            <property name="action_name">.uno:BackColor</property>
                             <property name="use_underline">True</property>
                           </object>
                           <packing>
@@ -1315,11 +1311,11 @@
                         <property name="expand">False</property>
                         <property name="fill">True</property>
                         <property name="pack_type">end</property>
-                        <property name="position">0</property>
+                        <property name="position">1</property>
                       </packing>
                     </child>
                     <child>
-                      <object class="sfxlo-SidebarToolBox" id="colorbar_writer1">
+                      <object class="sfxlo-SidebarToolBox" id="colorbox">
                         <property name="height_request">26</property>
                         <property name="visible">True</property>
                         <property name="can_focus">False</property>
@@ -1343,7 +1339,7 @@
                         <property name="expand">False</property>
                         <property name="fill">True</property>
                         <property name="pack_type">end</property>
-                        <property name="position">1</property>
+                        <property name="position">2</property>
                       </packing>
                     </child>
                   </object>
@@ -1355,7 +1351,6 @@
                 </child>
                 <child>
                   <object class="GtkBox" id="box13">
-                    <property name="visible">True</property>
                     <property name="can_focus">False</property>
                     <property name="orientation">vertical</property>
                     <property name="spacing">3</property>
@@ -1426,7 +1421,7 @@
                 <property name="height_request">15</property>
                 <property name="visible">True</property>
                 <property name="can_focus">False</property>
-                <property name="label" translatable="yes">Format</property>
+                <property name="label" translatable="yes">Text</property>
                 <attributes>
                   <attribute name="font-desc" value="Noto Sans 9"/>
                   <attribute name="style" value="italic"/>
@@ -1463,160 +1458,141 @@
             <property name="can_focus">False</property>
             <property name="orientation">vertical</property>
             <child>
-              <object class="GtkBox" id="tablegroup">
+              <object class="GtkBox" id="insertgroup">
+                <property name="visible">True</property>
                 <property name="can_focus">False</property>
                 <property name="margin_top">3</property>
                 <property name="margin_bottom">3</property>
                 <property name="orientation">vertical</property>
                 <property name="spacing">5</property>
                 <child>
-                  <object class="GtkBox" id="tablegroupbuttons">
+                  <object class="GtkBox" id="insertgroupbuttons">
+                    <property name="height_request">78</property>
                     <property name="visible">True</property>
                     <property name="can_focus">False</property>
-                    <property name="spacing">6</property>
                     <child>
-                      <object class="GtkButton" id="tablestyleb:tablemenu">
-                        <property name="label" translatable="yes">Style</property>
-                        <property name="width_request">70</property>
-                        <property name="height_request">78</property>
+                      <object class="GtkBox" id="insertgrid1">
                         <property name="visible">True</property>
-                        <property name="can_focus">True</property>
-                        <property name="receives_default">True</property>
-                        <property name="image">tablestylei</property>
-                        <property name="relief">none</property>
-                        <property name="image_position">top</property>
-                      </object>
-                      <packing>
-                        <property name="expand">False</property>
-                        <property name="fill">True</property>
-                        <property name="position">0</property>
-                      </packing>
-                    </child>
-                    <child>
-                      <object class="GtkBox" id="tabelgrid2">
                         <property name="can_focus">False</property>
                         <property name="orientation">vertical</property>
                         <child>
-                          <object class="GtkButton" id="tablerowsb:trowmenu">
-                            <property name="label" translatable="yes">Rows</property>
+                          <object class="sfxlo-SidebarToolBox" id="tablebox">
+                            <property name="height_request">26</property>
+                            <property name="visible">True</property>
+                            <property name="can_focus">False</property>
+                            <property name="toolbar_style">both-horiz</property>
+                            <child>
+                              <object class="GtkToolButton" id="tableb">
+                                <property name="visible">True</property>
+                                <property name="can_focus">False</property>
+                                <property name="is_important">True</property>
+                                <property name="action_name">.uno:InsertTable</property>
+                              </object>
+                              <packing>
+                                <property name="expand">True</property>
+                                <property name="homogeneous">True</property>
+                              </packing>
+                            </child>
+                          </object>
+                          <packing>
+                            <property name="expand">False</property>
+                            <property name="fill">True</property>
+                            <property name="position">0</property>
+                          </packing>
+                        </child>
+                        <child>
+                          <object class="GtkButton" id="imageb">
+                            <property name="height_request">26</property>
                             <property name="visible">True</property>
                             <property name="can_focus">True</property>
                             <property name="receives_default">True</property>
-                            <property name="valign">center</property>
-                            <property name="vexpand">True</property>
-                            <property name="image">tablerowsi</property>
+                            <property name="action_name">.uno:InsertGraphic</property>
                             <property name="relief">none</property>
                             <property name="xalign">0</property>
                           </object>
                           <packing>
                             <property name="expand">False</property>
                             <property name="fill">True</property>
-                            <property name="position">0</property>
+                            <property name="position">1</property>
                           </packing>
                         </child>
                         <child>
-                          <object class="GtkButton" id="tablecolumnsb:tcolumnmenu">
-                            <property name="label" translatable="yes">Columns</property>
+                          <object class="GtkButton" id="textboxb">
+                            <property name="height_request">26</property>
                             <property name="visible">True</property>
                             <property name="can_focus">True</property>
                             <property name="receives_default">True</property>
-                            <property name="valign">center</property>
-                            <property name="vexpand">True</property>
-                            <property name="image">tablecolumnsi</property>
+                            <property name="action_name">.uno:DrawText</property>
                             <property name="relief">none</property>
                             <property name="xalign">0</property>
                           </object>
                           <packing>
                             <property name="expand">False</property>
                             <property name="fill">True</property>
-                            <property name="position">1</property>
+                            <property name="position">2</property>
                           </packing>
                         </child>
                       </object>
                       <packing>
                         <property name="expand">False</property>
                         <property name="fill">True</property>
-                        <property name="position">1</property>
+                        <property name="position">0</property>
                       </packing>
                     </child>
                     <child>
-                      <object class="GtkBox" id="tablegrid3">
+                      <object class="GtkBox" id="insertgrid2">
                         <property name="visible">True</property>
                         <property name="can_focus">False</property>
                         <property name="orientation">vertical</property>
                         <child>
-                          <object class="sfxlo-SidebarToolBox" id="tableborder1">
+                          <object class="GtkButton" id="linksb:linksmenu">
+                            <property name="label" translatable="yes">Links</property>
                             <property name="height_request">26</property>
                             <property name="visible">True</property>
-                            <property name="can_focus">False</property>
-                            <property name="show_arrow">False</property>
-                            <child>
-                              <object class="GtkMenuToolButton" id="borderstyleb">
-                                <property name="use_action_appearance">False</property>
-                                <property name="visible">True</property>
-                                <property name="can_focus">False</property>
-                                <property name="is_important">True</property>
-                                <property name="action_name">.uno:SetBorderStyle</property>
-                                <property name="use_underline">True</property>
-                              </object>
-                              <packing>
-                                <property name="expand">False</property>
-                                <property name="homogeneous">True</property>
-                              </packing>
-                            </child>
+                            <property name="can_focus">True</property>
+                            <property name="receives_default">True</property>
+                            <property name="image">linksi</property>
+                            <property name="relief">none</property>
+                            <property name="xalign">0</property>
                           </object>
                           <packing>
                             <property name="expand">False</property>
                             <property name="fill">True</property>
-                            <property name="pack_type">end</property>
                             <property name="position">0</property>
                           </packing>
                         </child>
                         <child>
-                          <object class="sfxlo-SidebarToolBox" id="tableborder2">
+                          <object class="GtkButton" id="commentb">
                             <property name="height_request">26</property>
                             <property name="visible">True</property>
-                            <property name="can_focus">False</property>
-                            <property name="show_arrow">False</property>
-                            <child>
-                              <object class="GtkMenuToolButton" id="borderlineb">
-                                <property name="use_action_appearance">False</property>
-                                <property name="visible">True</property>
-                                <property name="can_focus">False</property>
-                                <property name="is_important">True</property>
-                                <property name="action_name">.uno:LineStyle</property>
-                                <property name="use_underline">True</property>
-                              </object>
-                              <packing>
-                                <property name="expand">False</property>
-                                <property name="homogeneous">True</property>
-                              </packing>
-                            </child>
+                            <property name="can_focus">True</property>
+                            <property name="receives_default">True</property>
+                            <property name="action_name">.uno:InsertAnnotation</property>
+                            <property name="relief">none</property>
+                            <property name="xalign">0</property>
                           </object>
                           <packing>
                             <property name="expand">False</property>
                             <property name="fill">True</property>
-                            <property name="pack_type">end</property>
                             <property name="position">1</property>
                           </packing>
                         </child>
                         <child>
-                          <object class="sfxlo-SidebarToolBox" id="tableborder3">
+                          <object class="sfxlo-SidebarToolBox" id="shapesbox">
                             <property name="height_request">26</property>
                             <property name="visible">True</property>
                             <property name="can_focus">False</property>
-                            <property name="show_arrow">False</property>
+                            <property name="toolbar_style">both-horiz</property>
                             <child>
-                              <object class="GtkMenuToolButton" id="bordercolorb">
-                                <property name="use_action_appearance">False</property>
+                              <object class="GtkToolButton" id="shapesb">
                                 <property name="visible">True</property>
                                 <property name="can_focus">False</property>
                                 <property name="is_important">True</property>
-                                <property name="action_name">.uno:FrameLineColor</property>
-                                <property name="use_underline">True</property>
+                                <property name="action_name">.uno:BasicShapes</property>
+                                <property name="label" translatable="yes">Shapes</property>
                               </object>
                               <packing>
-                                <property name="expand">False</property>
+                                <property name="expand">True</property>
                                 <property name="homogeneous">True</property>
                               </packing>
                             </child>
@@ -1624,7 +1600,6 @@
                           <packing>
                             <property name="expand">False</property>
                             <property name="fill">True</property>
-                            <property name="pack_type">end</property>
                             <property name="position">2</property>
                           </packing>
                         </child>
@@ -1632,22 +1607,22 @@
                       <packing>
                         <property name="expand">False</property>
                         <property name="fill">True</property>
-                        <property name="position">2</property>
+                        <property name="position">1</property>
                       </packing>
                     </child>
                     <child>
-                      <object class="GtkBox" id="tablegrid4">
+                      <object class="GtkBox" id="insertgrid3">
                         <property name="visible">True</property>
                         <property name="can_focus">False</property>
                         <property name="orientation">vertical</property>
-                        <property name="spacing">1</property>
+                        <property name="spacing">3</property>
                         <child>
-                          <object class="GtkButton" id="topb">
-                            <property name="height_request">25</property>
+                          <object class="GtkButton" id="chartb">
+                            <property name="height_request">24</property>
                             <property name="visible">True</property>
                             <property name="can_focus">True</property>
                             <property name="receives_default">True</property>
-                            <property name="action_name">.uno:CellVertTop</property>
+                            <property name="action_name">.uno:InsertObjectChart</property>
                             <property name="relief">none</property>
                             <property name="xalign">0</property>
                           </object>
@@ -1658,12 +1633,12 @@
                           </packing>
                         </child>
                         <child>
-                          <object class="GtkButton" id="vcenterb">
-                            <property name="height_request">25</property>
+                          <object class="GtkButton" id="formulab">
+                            <property name="height_request">24</property>
                             <property name="visible">True</property>
                             <property name="can_focus">True</property>
                             <property name="receives_default">True</property>
-                            <property name="action_name">.uno:CellVertCenter</property>
+                            <property name="action_name">.uno:InsertObjectStarMath</property>
                             <property name="relief">none</property>
                             <property name="xalign">0</property>
                           </object>
@@ -1674,12 +1649,12 @@
                           </packing>
                         </child>
                         <child>
-                          <object class="GtkButton" id="bottomb">
-                            <property name="height_request">25</property>
+                          <object class="GtkButton" id="trackchangeb">
+                            <property name="height_request">24</property>
                             <property name="visible">True</property>
                             <property name="can_focus">True</property>
                             <property name="receives_default">True</property>
-                            <property name="action_name">.uno:CellVertBottom</property>
+                            <property name="action_name">.uno:TrackChanges</property>
                             <property name="relief">none</property>
                             <property name="xalign">0</property>
                           </object>
@@ -1693,7 +1668,7 @@
                       <packing>
                         <property name="expand">False</property>
                         <property name="fill">True</property>
-                        <property name="position">3</property>
+                        <property name="position">2</property>
                       </packing>
                     </child>
                   </object>
@@ -1704,7 +1679,7 @@
                   </packing>
                 </child>
                 <child>
-                  <object class="GtkSeparator" id="separator12">
+                  <object class="GtkSeparator" id="separator7">
                     <property name="height_request">2</property>
                     <property name="visible">True</property>
                     <property name="can_focus">False</property>
@@ -1716,11 +1691,11 @@
                   </packing>
                 </child>
                 <child>
-                  <object class="GtkLabel" id="tablegrouplabel">
+                  <object class="GtkLabel" id="insertgrouplabel">
                     <property name="height_request">15</property>
                     <property name="visible">True</property>
                     <property name="can_focus">False</property>
-                    <property name="label" translatable="yes">Table</property>
+                    <property name="label" translatable="yes">Insert</property>
                     <attributes>
                       <attribute name="font-desc" value="Noto Sans 9"/>
                       <attribute name="style" value="italic"/>
@@ -1733,7 +1708,7 @@
                   </packing>
                 </child>
                 <style>
-                  <class name="context-Table"/>
+                  <class name="context-Text"/>
                 </style>
               </object>
               <packing>
@@ -1743,38 +1718,104 @@
               </packing>
             </child>
             <child>
-              <object class="GtkBox" id="insertgroup">
-                <property name="visible">True</property>
+              <object class="GtkBox" id="tablegroup">
                 <property name="can_focus">False</property>
                 <property name="margin_top">3</property>
                 <property name="margin_bottom">3</property>
                 <property name="orientation">vertical</property>
                 <property name="spacing">5</property>
                 <child>
-                  <object class="GtkBox" id="insertgroupbuttons">
-                    <property name="height_request">78</property>
+                  <object class="GtkBox" id="tablegroupbuttons">
                     <property name="visible">True</property>
                     <property name="can_focus">False</property>
+                    <property name="spacing">6</property>
                     <child>
-                      <object class="GtkBox" id="box15">
+                      <object class="GtkButton" id="tablestyleb:tablemenu">
+                        <property name="label" translatable="yes">Style</property>
+                        <property name="width_request">70</property>
+                        <property name="height_request">78</property>
                         <property name="visible">True</property>
+                        <property name="can_focus">True</property>
+                        <property name="receives_default">True</property>
+                        <property name="image">tablestylei</property>
+                        <property name="relief">none</property>
+                        <property name="image_position">top</property>
+                      </object>
+                      <packing>
+                        <property name="expand">False</property>
+                        <property name="fill">True</property>
+                        <property name="position">0</property>
+                      </packing>
+                    </child>
+                    <child>
+                      <object class="GtkBox" id="tabelgrid2">
                         <property name="can_focus">False</property>
                         <property name="orientation">vertical</property>
                         <child>
-                          <object class="sfxlo-SidebarToolBox" id="tablebox">
+                          <object class="GtkButton" id="tablerowsb:trowmenu">
+                            <property name="label" translatable="yes">Rows</property>
+                            <property name="visible">True</property>
+                            <property name="can_focus">True</property>
+                            <property name="receives_default">True</property>
+                            <property name="valign">center</property>
+                            <property name="vexpand">True</property>
+                            <property name="image">tablerowsi</property>
+                            <property name="relief">none</property>
+                            <property name="xalign">0</property>
+                          </object>
+                          <packing>
+                            <property name="expand">False</property>
+                            <property name="fill">True</property>
+                            <property name="position">0</property>
+                          </packing>
+                        </child>
+                        <child>
+                          <object class="GtkButton" id="tablecolumnsb:tcolumnmenu">
+                            <property name="label" translatable="yes">Columns</property>
+                            <property name="visible">True</property>
+                            <property name="can_focus">True</property>
+                            <property name="receives_default">True</property>
+                            <property name="valign">center</property>
+                            <property name="vexpand">True</property>
+                            <property name="image">tablecolumnsi</property>
+                            <property name="relief">none</property>
+                            <property name="xalign">0</property>
+                          </object>
+                          <packing>
+                            <property name="expand">False</property>
+                            <property name="fill">True</property>
+                            <property name="position">1</property>
+                          </packing>
+                        </child>
+                      </object>
+                      <packing>
+                        <property name="expand">False</property>
+                        <property name="fill">True</property>
+                        <property name="position">1</property>
+                      </packing>
+                    </child>
+                    <child>
+                      <object class="GtkBox" id="tablegrid3">
+                        <property name="visible">True</property>
+                        <property name="can_focus">False</property>
+                        <property name="orientation">vertical</property>
+                        <child>
+                          <object class="sfxlo-SidebarToolBox" id="tableborder1">
                             <property name="height_request">26</property>
                             <property name="visible">True</property>
                             <property name="can_focus">False</property>
-                            <property name="toolbar_style">both-horiz</property>
+                            <property name="show_arrow">False</property>
                             <child>
-                              <object class="GtkToolButton" id="tableb">
+                              <object class="GtkMenuToolButton" id="borderstyleb">
+                                <property name="use_action_appearance">False</property>
                                 <property name="visible">True</property>
                                 <property name="can_focus">False</property>
                                 <property name="is_important">True</property>
-                                <property name="action_name">.uno:InsertTable</property>
+                                <property name="action_name">.uno:SetBorderStyle</property>
+                                <property name="use_underline">True</property>
                               </object>
                               <packing>
-                                <property name="expand">True</property>
+                                <property name="expand">False</property>
                                 <property name="homogeneous">True</property>
                               </packing>
                             </child>
@@ -1782,25 +1823,27 @@
                           <packing>
                             <property name="expand">False</property>
                             <property name="fill">True</property>
+                            <property name="pack_type">end</property>
                             <property name="position">0</property>
                           </packing>
                         </child>
                         <child>
-                          <object class="sfxlo-SidebarToolBox" id="shapesbox">
+                          <object class="sfxlo-SidebarToolBox" id="tableborder2">
                             <property name="height_request">26</property>
                             <property name="visible">True</property>
                             <property name="can_focus">False</property>
-                            <property name="toolbar_style">both-horiz</property>
+                            <property name="show_arrow">False</property>
                             <child>
-                              <object class="GtkToolButton" id="shapesb">
+                              <object class="GtkMenuToolButton" id="borderlineb">
+                                <property name="use_action_appearance">False</property>
                                 <property name="visible">True</property>
                                 <property name="can_focus">False</property>
                                 <property name="is_important">True</property>
-                                <property name="action_name">.uno:BasicShapes</property>
-                                <property name="label" translatable="yes">Shapes</property>
+                                <property name="action_name">.uno:LineStyle</property>
+                                <property name="use_underline">True</property>
                               </object>
                               <packing>
-                                <property name="expand">True</property>
+                                <property name="expand">False</property>
                                 <property name="homogeneous">True</property>
                               </packing>
                             </child>
@@ -1808,23 +1851,35 @@
                           <packing>
                             <property name="expand">False</property>
                             <property name="fill">True</property>
+                            <property name="pack_type">end</property>
                             <property name="position">1</property>
                           </packing>
                         </child>
                         <child>
-                          <object class="GtkButton" id="linksb:linksmenu">
-                            <property name="label" translatable="yes">Links</property>
+                          <object class="sfxlo-SidebarToolBox" id="tableborder3">
                             <property name="height_request">26</property>
                             <property name="visible">True</property>
-                            <property name="can_focus">True</property>
-                            <property name="receives_default">True</property>
-                            <property name="image">linksi</property>
-                            <property name="relief">none</property>
-                            <property name="xalign">0</property>
+                            <property name="can_focus">False</property>
+                            <property name="show_arrow">False</property>
+                            <child>
+                              <object class="GtkMenuToolButton" id="bordercolorb">
+                                <property name="use_action_appearance">False</property>
+                                <property name="visible">True</property>
+                                <property name="can_focus">False</property>
+                                <property name="is_important">True</property>
+                                <property name="action_name">.uno:FrameLineColor</property>
+                                <property name="use_underline">True</property>
+                              </object>
+                              <packing>
+                                <property name="expand">False</property>
+                                <property name="homogeneous">True</property>
+                              </packing>
+                            </child>
                           </object>
                           <packing>
                             <property name="expand">False</property>
                             <property name="fill">True</property>
+                            <property name="pack_type">end</property>
                             <property name="position">2</property>
                           </packing>
                         </child>
@@ -1832,22 +1887,22 @@
                       <packing>
                         <property name="expand">False</property>
                         <property name="fill">True</property>
-                        <property name="position">0</property>
+                        <property name="position">2</property>
                       </packing>
                     </child>
                     <child>
-                      <object class="GtkBox" id="box16">
+                      <object class="GtkBox" id="tablegrid4">
                         <property name="visible">True</property>
                         <property name="can_focus">False</property>
                         <property name="orientation">vertical</property>
-                        <property name="spacing">3</property>
+                        <property name="spacing">1</property>
                         <child>
-                          <object class="GtkButton" id="imageb">
-                            <property name="height_request">24</property>
+                          <object class="GtkButton" id="topb">
+                            <property name="height_request">25</property>
                             <property name="visible">True</property>
                             <property name="can_focus">True</property>
                             <property name="receives_default">True</property>
-                            <property name="action_name">.uno:InsertGraphic</property>
+                            <property name="action_name">.uno:CellVertTop</property>
                             <property name="relief">none</property>
                             <property name="xalign">0</property>
                           </object>
@@ -1858,13 +1913,12 @@
                           </packing>
                         </child>
                         <child>
-                          <object class="GtkButton" id="chartb">
-                            <property name="height_request">24</property>
+                          <object class="GtkButton" id="vcenterb">
+                            <property name="height_request">25</property>
                             <property name="visible">True</property>
                             <property name="can_focus">True</property>
                             <property name="receives_default">True</property>
-                            <property name="action_name">.uno:InsertObjectChart</property>
-                            <property name="image">charti</property>
+                            <property name="action_name">.uno:CellVertCenter</property>
                             <property name="relief">none</property>
                             <property name="xalign">0</property>
                           </object>
@@ -1875,12 +1929,12 @@
                           </packing>
                         </child>
                         <child>
-                          <object class="GtkButton" id="commentb">
-                            <property name="height_request">24</property>
+                          <object class="GtkButton" id="bottomb">
+                            <property name="height_request">25</property>
                             <property name="visible">True</property>
                             <property name="can_focus">True</property>
                             <property name="receives_default">True</property>
-                            <property name="action_name">.uno:InsertAnnotation</property>
+                            <property name="action_name">.uno:CellVertBottom</property>
                             <property name="relief">none</property>
                             <property name="xalign">0</property>
                           </object>
@@ -1894,7 +1948,7 @@
                       <packing>
                         <property name="expand">False</property>
                         <property name="fill">True</property>
-                        <property name="position">1</property>
+                        <property name="position">3</property>
                       </packing>
                     </child>
                   </object>
@@ -1905,7 +1959,7 @@
                   </packing>
                 </child>
                 <child>
-                  <object class="GtkSeparator" id="separator7">
+                  <object class="GtkSeparator" id="separator12">
                     <property name="height_request">2</property>
                     <property name="visible">True</property>
                     <property name="can_focus">False</property>
@@ -1917,11 +1971,11 @@
                   </packing>
                 </child>
                 <child>
-                  <object class="GtkLabel" id="insertgrouplabel">
+                  <object class="GtkLabel" id="tablegrouplabel">
                     <property name="height_request">15</property>
                     <property name="visible">True</property>
                     <property name="can_focus">False</property>
-                    <property name="label" translatable="yes">Insert</property>
+                    <property name="label" translatable="yes">Table</property>
                     <attributes>
                       <attribute name="font-desc" value="Noto Sans 9"/>
                       <attribute name="style" value="italic"/>
@@ -1934,7 +1988,7 @@
                   </packing>
                 </child>
                 <style>
-                  <class name="context-Text"/>
+                  <class name="context-Table"/>
                 </style>
               </object>
               <packing>
@@ -1958,6 +2012,7 @@
                     <child>
                       <object class="GtkButton" id="imagestyleb:imagestylemenu">
                         <property name="label" translatable="yes">Style</property>
+                        <property name="width_request">70</property>
                         <property name="height_request">78</property>
                         <property name="visible">True</property>
                         <property name="can_focus">True</property>
@@ -2152,6 +2207,8 @@
       <packing>
         <property name="left_attach">0</property>
         <property name="top_attach">0</property>
+        <property name="width">1</property>
+        <property name="height">1</property>
       </packing>
     </child>
   </object>