From 1a78f2b7b79e94b770f1e642cc8c1a5f5cbc3327 Mon Sep 17 00:00:00 2001
From: Jeff Huang <jeff@mail.ossii.com.tw>
Date: Wed, 5 Jan 2022 10:54:49 +0800
Subject: tdf#136362 Remove unnecessary blank area and option in some image
 toolbar

Only in Calc, Draw and Impress.

Change-Id: I944aad875fedd1dd19657c49b059e33fd6e9d3f9
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/127984
Tested-by: Jenkins
Reviewed-by: Heiko Tietze <heiko.tietze@documentfoundation.org>
(cherry picked from commit 0596ef354ee8d40976c6be044a646757240f7921)
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/128443
Reviewed-by: Po-Yen Huang <jeff@mail.ossii.com.tw>
Reviewed-by: Adolfo Jayme Barrientos <fitojb@ubuntu.com>
---
 sc/uiconfig/scalc/toolbar/graphicobjectbar.xml     |  1 -
 sc/uiconfig/scalc/ui/notebookbar_compact.ui        | 37 ----------------------
 .../scalc/ui/notebookbar_groupedbar_full.ui        | 26 ---------------
 3 files changed, 64 deletions(-)

(limited to 'sc')

diff --git a/sc/uiconfig/scalc/toolbar/graphicobjectbar.xml b/sc/uiconfig/scalc/toolbar/graphicobjectbar.xml
index f9f5e97a6e71..9e58a2ef02b3 100644
--- a/sc/uiconfig/scalc/toolbar/graphicobjectbar.xml
+++ b/sc/uiconfig/scalc/toolbar/graphicobjectbar.xml
@@ -60,7 +60,6 @@
  <toolbar:toolbarseparator/>
  <toolbar:toolbaritem xlink:href=".uno:ColorSettings"/>
  <toolbar:toolbarseparator/>
- <toolbar:toolbaritem xlink:href=".uno:GraphicDialog"/>
  <toolbar:toolbaritem xlink:href=".uno:FormatLine" toolbar:visible="false"/>
  <toolbar:toolbaritem xlink:href=".uno:FormatArea" toolbar:visible="false"/>
 </toolbar:toolbar>
diff --git a/sc/uiconfig/scalc/ui/notebookbar_compact.ui b/sc/uiconfig/scalc/ui/notebookbar_compact.ui
index 972d54078d96..02c3004c3e35 100644
--- a/sc/uiconfig/scalc/ui/notebookbar_compact.ui
+++ b/sc/uiconfig/scalc/ui/notebookbar_compact.ui
@@ -9772,43 +9772,6 @@
                         <property name="position">21</property>
                       </packing>
                     </child>
-                    <child>
-                      <object class="VclOptionalBox" id="Graphic-Section-GraphicDialog">
-                        <property name="visible">True</property>
-                        <property name="can_focus">False</property>
-                        <property name="valign">center</property>
-                        <property name="vexpand">True</property>
-                        <child>
-                          <object class="sfxlo-NotebookbarToolBox" id="Graphic">
-                            <property name="visible">True</property>
-                            <property name="can_focus">False</property>
-                            <property name="show_arrow">False</property>
-                            <child>
-                              <object class="GtkToolButton" id="Graphic-GraphicDialog">
-                                <property name="visible">True</property>
-                                <property name="visible_horizontal">False</property>
-                                <property name="action_name">.uno:GraphicDialog</property>
-                                <property name="icon_name">sfx2/res/symphony/open_more.png</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="position">0</property>
-                          </packing>
-                        </child>
-                      </object>
-                      <packing>
-                        <property name="expand">False</property>
-                        <property name="fill">True</property>
-                        <property name="position">22</property>
-                      </packing>
-                    </child>
                     <child>
                       <object class="VclOptionalBox" id="Graphic-Section-GraphicFilterToolbox">
                         <property name="visible">True</property>
diff --git a/sc/uiconfig/scalc/ui/notebookbar_groupedbar_full.ui b/sc/uiconfig/scalc/ui/notebookbar_groupedbar_full.ui
index 8487e79ac448..4d7f120090f0 100644
--- a/sc/uiconfig/scalc/ui/notebookbar_groupedbar_full.ui
+++ b/sc/uiconfig/scalc/ui/notebookbar_groupedbar_full.ui
@@ -5699,32 +5699,6 @@
                                         <property name="position">0</property>
                                       </packing>
                                     </child>
-                                    <child>
-                                      <object class="sfxlo-NotebookbarToolBox" id="third3Ext1">
-                                        <property name="visible">True</property>
-                                        <property name="can_focus">True</property>
-                                        <property name="halign">end</property>
-                                        <property name="hexpand">True</property>
-                                        <property name="toolbar_style">icons</property>
-                                        <property name="show_arrow">False</property>
-                                        <property name="icon_size">1</property>
-                                        <child>
-                                          <object class="GtkToolButton" id="GraphicDialog">
-                                            <property name="visible">True</property>
-                                            <property name="action_name">.uno:GraphicDialog</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="position">1</property>
-                                      </packing>
-                                    </child>
                                   </object>
                                   <packing>
                                     <property name="expand">False</property>
-- 
cgit