[Libreoffice-commits] core.git: sc/uiconfig sd/uiconfig solenv/sanitizers sw/uiconfig
Caolán McNamara (via logerrit)
logerrit at kemper.freedesktop.org
Thu Feb 6 08:51:41 UTC 2020
sc/uiconfig/scalc/ui/notebookbar_groups.ui | 22 ++++------------------
sd/uiconfig/simpress/ui/notebookbar_groups.ui | 22 ++++------------------
solenv/sanitizers/ui/modules/scalc.suppr | 1 -
solenv/sanitizers/ui/modules/simpress.suppr | 1 -
solenv/sanitizers/ui/modules/swriter.suppr | 1 -
sw/uiconfig/swriter/ui/notebookbar_groups.ui | 22 ++++------------------
6 files changed, 12 insertions(+), 57 deletions(-)
New commits:
commit 11d4e93acfab8772238e383feb01d01c01901a9e
Author: Caolán McNamara <caolanm at redhat.com>
AuthorDate: Wed Feb 5 17:18:07 2020 +0000
Commit: Caolán McNamara <caolanm at redhat.com>
CommitDate: Thu Feb 6 09:51:01 2020 +0100
the "grouped" notebook svtlo-FontSizeBox's are all hidden
they don't appear in the notebook and there is nothing actually
using them
Change-Id: I570f156e937f1cbc12620da17d684e66c063425f
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/88062
Reviewed-by: Caolán McNamara <caolanm at redhat.com>
Tested-by: Caolán McNamara <caolanm at redhat.com>
diff --git a/sc/uiconfig/scalc/ui/notebookbar_groups.ui b/sc/uiconfig/scalc/ui/notebookbar_groups.ui
index 39f52a52f768..0accdeca0c04 100644
--- a/sc/uiconfig/scalc/ui/notebookbar_groups.ui
+++ b/sc/uiconfig/scalc/ui/notebookbar_groups.ui
@@ -841,20 +841,6 @@
<property name="valign">center</property>
<property name="hexpand">True</property>
<property name="spacing">4</property>
- <child>
- <object class="svtlo-FontSizeBox" id="fontsizelist">
- <property name="width_request">60</property>
- <property name="height_request">30</property>
- <property name="can_focus">False</property>
- <property name="halign">start</property>
- <property name="hexpand">True</property>
- </object>
- <packing>
- <property name="expand">False</property>
- <property name="fill">True</property>
- <property name="position">0</property>
- </packing>
- </child>
<child>
<object class="sfxlo-NotebookbarToolBox" id="numberformat1">
<property name="visible">True</property>
@@ -925,7 +911,7 @@
<packing>
<property name="expand">False</property>
<property name="fill">True</property>
- <property name="position">1</property>
+ <property name="position">0</property>
</packing>
</child>
<child>
@@ -964,7 +950,7 @@
<packing>
<property name="expand">False</property>
<property name="fill">True</property>
- <property name="position">2</property>
+ <property name="position">1</property>
</packing>
</child>
<child>
@@ -987,7 +973,7 @@
<packing>
<property name="expand">False</property>
<property name="fill">True</property>
- <property name="position">3</property>
+ <property name="position">2</property>
</packing>
</child>
<child>
@@ -1009,7 +995,7 @@
<packing>
<property name="expand">False</property>
<property name="fill">True</property>
- <property name="position">4</property>
+ <property name="position">3</property>
</packing>
</child>
</object>
diff --git a/sd/uiconfig/simpress/ui/notebookbar_groups.ui b/sd/uiconfig/simpress/ui/notebookbar_groups.ui
index a543fc644bab..fc4a75d874d0 100644
--- a/sd/uiconfig/simpress/ui/notebookbar_groups.ui
+++ b/sd/uiconfig/simpress/ui/notebookbar_groups.ui
@@ -773,20 +773,6 @@
<property name="can_focus">False</property>
<property name="valign">center</property>
<property name="spacing">4</property>
- <child>
- <object class="svtlo-FontSizeBox" id="fontsizelist">
- <property name="width_request">60</property>
- <property name="height_request">30</property>
- <property name="can_focus">False</property>
- <property name="halign">start</property>
- <property name="hexpand">True</property>
- </object>
- <packing>
- <property name="expand">False</property>
- <property name="fill">True</property>
- <property name="position">0</property>
- </packing>
- </child>
<child>
<object class="sfxlo-SidebarToolBox" id="fontheight">
<property name="visible">True</property>
@@ -809,7 +795,7 @@
<packing>
<property name="expand">False</property>
<property name="fill">True</property>
- <property name="position">1</property>
+ <property name="position">0</property>
</packing>
</child>
<child>
@@ -848,7 +834,7 @@
<packing>
<property name="expand">False</property>
<property name="fill">True</property>
- <property name="position">2</property>
+ <property name="position">1</property>
</packing>
</child>
<child>
@@ -871,7 +857,7 @@
<packing>
<property name="expand">False</property>
<property name="fill">True</property>
- <property name="position">3</property>
+ <property name="position">2</property>
</packing>
</child>
<child>
@@ -893,7 +879,7 @@
<packing>
<property name="expand">False</property>
<property name="fill">True</property>
- <property name="position">4</property>
+ <property name="position">3</property>
</packing>
</child>
</object>
diff --git a/solenv/sanitizers/ui/modules/scalc.suppr b/solenv/sanitizers/ui/modules/scalc.suppr
index bc40f73a89a3..6556a7d6b2e7 100644
--- a/solenv/sanitizers/ui/modules/scalc.suppr
+++ b/solenv/sanitizers/ui/modules/scalc.suppr
@@ -99,7 +99,6 @@ sc/uiconfig/scalc/ui/namerangesdialog.ui://GtkEntry[@id='edassign'] no-labelled-
sc/uiconfig/scalc/ui/notebookbar_groups.ui://GtkLabel[@id='filegrouplabel'] orphan-label
sc/uiconfig/scalc/ui/notebookbar_groups.ui://GtkLabel[@id='clipboardgrouplabel'] orphan-label
sc/uiconfig/scalc/ui/notebookbar_groups.ui://svtlo-FontNameBox[@id='fontnamelist'] no-labelled-by
-sc/uiconfig/scalc/ui/notebookbar_groups.ui://svtlo-FontSizeBox[@id='fontsizelist'] no-labelled-by
sc/uiconfig/scalc/ui/notebookbar_groups.ui://GtkLabel[@id='formatgrouplabel'] orphan-label
sc/uiconfig/scalc/ui/notebookbar_groups.ui://GtkLabel[@id='tablegrouplabel'] orphan-label
sc/uiconfig/scalc/ui/notebookbar_groups.ui://GtkLabel[@id='insertgrouplabel'] orphan-label
diff --git a/solenv/sanitizers/ui/modules/simpress.suppr b/solenv/sanitizers/ui/modules/simpress.suppr
index 2a8c37a1487d..8788119a70c9 100644
--- a/solenv/sanitizers/ui/modules/simpress.suppr
+++ b/solenv/sanitizers/ui/modules/simpress.suppr
@@ -20,7 +20,6 @@ sd/uiconfig/simpress/ui/layoutwindow.ui://GtkButton[@id='more'] button-no-label
sd/uiconfig/simpress/ui/notebookbar_groups.ui://GtkLabel[@id='filegrouplabel'] orphan-label
sd/uiconfig/simpress/ui/notebookbar_groups.ui://GtkLabel[@id='clipboardgrouplabel'] orphan-label
sd/uiconfig/simpress/ui/notebookbar_groups.ui://svtlo-FontNameBox[@id='fontnamelist'] no-labelled-by
-sd/uiconfig/simpress/ui/notebookbar_groups.ui://svtlo-FontSizeBox[@id='fontsizelist'] no-labelled-by
sd/uiconfig/simpress/ui/notebookbar_groups.ui://GtkLabel[@id='formatgrouplabel'] orphan-label
sd/uiconfig/simpress/ui/notebookbar_groups.ui://GtkLabel[@id='slidegrouplabel'] orphan-label
sd/uiconfig/simpress/ui/notebookbar_groups.ui://GtkLabel[@id='insertgrouplabel'] orphan-label
diff --git a/solenv/sanitizers/ui/modules/swriter.suppr b/solenv/sanitizers/ui/modules/swriter.suppr
index bbe52698d3b0..194d0a2024d9 100644
--- a/solenv/sanitizers/ui/modules/swriter.suppr
+++ b/solenv/sanitizers/ui/modules/swriter.suppr
@@ -161,7 +161,6 @@ sw/uiconfig/swriter/ui/mmsalutationpage.ui://GtkLabel[@id='femalefi'] orphan-lab
sw/uiconfig/swriter/ui/notebookbar_groups.ui://GtkLabel[@id='filegrouplabel'] orphan-label
sw/uiconfig/swriter/ui/notebookbar_groups.ui://GtkLabel[@id='clipboardgrouplabel'] orphan-label
sw/uiconfig/swriter/ui/notebookbar_groups.ui://svtlo-FontNameBox[@id='fontnamelist'] no-labelled-by
-sw/uiconfig/swriter/ui/notebookbar_groups.ui://svtlo-FontSizeBox[@id='fontsizelist'] no-labelled-by
sw/uiconfig/swriter/ui/notebookbar_groups.ui://GtkLabel[@id='formatgrouplabel'] orphan-label
sw/uiconfig/swriter/ui/notebookbar_groups.ui://GtkLabel[@id='insertgrouplabel'] orphan-label
sw/uiconfig/swriter/ui/notebookbar_groups.ui://GtkLabel[@id='tablegrouplabel'] orphan-label
diff --git a/sw/uiconfig/swriter/ui/notebookbar_groups.ui b/sw/uiconfig/swriter/ui/notebookbar_groups.ui
index d5169af73ca4..ab7e25f2488d 100644
--- a/sw/uiconfig/swriter/ui/notebookbar_groups.ui
+++ b/sw/uiconfig/swriter/ui/notebookbar_groups.ui
@@ -1029,20 +1029,6 @@
<property name="can_focus">False</property>
<property name="valign">center</property>
<property name="spacing">4</property>
- <child>
- <object class="svtlo-FontSizeBox" id="fontsizelist">
- <property name="width_request">60</property>
- <property name="height_request">30</property>
- <property name="can_focus">False</property>
- <property name="halign">start</property>
- <property name="hexpand">True</property>
- </object>
- <packing>
- <property name="expand">False</property>
- <property name="fill">True</property>
- <property name="position">0</property>
- </packing>
- </child>
<child>
<object class="sfxlo-SidebarToolBox" id="fontheight">
<property name="visible">True</property>
@@ -1065,7 +1051,7 @@
<packing>
<property name="expand">False</property>
<property name="fill">True</property>
- <property name="position">1</property>
+ <property name="position">0</property>
</packing>
</child>
<child>
@@ -1104,7 +1090,7 @@
<packing>
<property name="expand">False</property>
<property name="fill">True</property>
- <property name="position">2</property>
+ <property name="position">1</property>
</packing>
</child>
<child>
@@ -1127,7 +1113,7 @@
<packing>
<property name="expand">False</property>
<property name="fill">True</property>
- <property name="position">3</property>
+ <property name="position">2</property>
</packing>
</child>
<child>
@@ -1149,7 +1135,7 @@
<packing>
<property name="expand">False</property>
<property name="fill">True</property>
- <property name="position">4</property>
+ <property name="position">3</property>
</packing>
</child>
</object>
More information about the Libreoffice-commits
mailing list