summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJeff Huang <jeff@mail.ossii.com.tw>2022-01-05 10:54:49 +0800
committerAdolfo Jayme Barrientos <fitojb@ubuntu.com>2022-01-18 03:13:11 +0100
commit1a78f2b7b79e94b770f1e642cc8c1a5f5cbc3327 (patch)
tree1c96d0fac2e192e0f8ad971d60e46768c0dc69fe
parent2492429199670e30d89a81e0e227ae894764baee (diff)
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>
-rw-r--r--sc/uiconfig/scalc/toolbar/graphicobjectbar.xml1
-rw-r--r--sc/uiconfig/scalc/ui/notebookbar_compact.ui37
-rw-r--r--sc/uiconfig/scalc/ui/notebookbar_groupedbar_full.ui26
-rw-r--r--sd/uiconfig/sdraw/ui/notebookbar_compact.ui37
-rw-r--r--sd/uiconfig/sdraw/ui/notebookbar_single.ui37
-rw-r--r--sd/uiconfig/simpress/ui/notebookbar_compact.ui37
-rw-r--r--sd/uiconfig/simpress/ui/notebookbar_single.ui37
7 files changed, 0 insertions, 212 deletions
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
@@ -9773,43 +9773,6 @@
</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>
<property name="can_focus">False</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>
diff --git a/sd/uiconfig/sdraw/ui/notebookbar_compact.ui b/sd/uiconfig/sdraw/ui/notebookbar_compact.ui
index 74d9cf9757c6..ebdb5b741396 100644
--- a/sd/uiconfig/sdraw/ui/notebookbar_compact.ui
+++ b/sd/uiconfig/sdraw/ui/notebookbar_compact.ui
@@ -12002,43 +12002,6 @@
</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>
- <child>
- <object class="sfxlo-NotebookbarToolBox" id="Graphic">
- <property name="visible">True</property>
- <property name="can_focus">False</property>
- <property name="valign">center</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>
<property name="can_focus">False</property>
diff --git a/sd/uiconfig/sdraw/ui/notebookbar_single.ui b/sd/uiconfig/sdraw/ui/notebookbar_single.ui
index ce096822ca5f..ccc2a2a9eef9 100644
--- a/sd/uiconfig/sdraw/ui/notebookbar_single.ui
+++ b/sd/uiconfig/sdraw/ui/notebookbar_single.ui
@@ -4070,43 +4070,6 @@
</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>
- <child>
- <object class="sfxlo-NotebookbarToolBox" id="Graphic">
- <property name="visible">True</property>
- <property name="can_focus">False</property>
- <property name="valign">center</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">25</property>
- </packing>
- </child>
- <child>
<object class="VclOptionalBox" id="Graphic-Section-GraphicFilterToolbox">
<property name="visible">True</property>
<property name="can_focus">False</property>
diff --git a/sd/uiconfig/simpress/ui/notebookbar_compact.ui b/sd/uiconfig/simpress/ui/notebookbar_compact.ui
index 21a90fc1d5fd..ce64d8ff67a2 100644
--- a/sd/uiconfig/simpress/ui/notebookbar_compact.ui
+++ b/sd/uiconfig/simpress/ui/notebookbar_compact.ui
@@ -11554,43 +11554,6 @@
</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>
- <child>
- <object class="sfxlo-NotebookbarToolBox" id="Graphic">
- <property name="visible">True</property>
- <property name="can_focus">False</property>
- <property name="valign">center</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>
<property name="can_focus">False</property>
diff --git a/sd/uiconfig/simpress/ui/notebookbar_single.ui b/sd/uiconfig/simpress/ui/notebookbar_single.ui
index 0299bd63790e..a5164383889a 100644
--- a/sd/uiconfig/simpress/ui/notebookbar_single.ui
+++ b/sd/uiconfig/simpress/ui/notebookbar_single.ui
@@ -3731,43 +3731,6 @@
</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>
- <child>
- <object class="sfxlo-NotebookbarToolBox" id="Graphic">
- <property name="visible">True</property>
- <property name="can_focus">False</property>
- <property name="valign">center</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">25</property>
- </packing>
- </child>
- <child>
<object class="VclOptionalBox" id="Graphic-Section-GraphicFilterToolbox">
<property name="visible">True</property>
<property name="can_focus">False</property>