extras/source/glade/libreoffice-catalog.xml.in | 12 ------------
sc/uiconfig/scalc/ui/notebookbar_groups.ui | 11 -----------
sd/uiconfig/simpress/ui/notebookbar_groups.ui | 11 -----------
solenv/bin/native-code.py | 1 -
solenv/sanitizers/ui/modules/scalc.suppr | 1 -
solenv/sanitizers/ui/modules/simpress.suppr | 1 -
solenv/sanitizers/ui/modules/swriter.suppr | 1 -
svtools/source/control/ctrlbox.cxx | 14 --------------
sw/uiconfig/swriter/ui/notebookbar_groups.ui | 11 -----------
9 files changed, 63 deletions(-)
New commits:
commit b1095ac103db4fc62611233e6fed2054ff0d6817
Author: Caolán McNamara <caol...@redhat.com>
AuthorDate: Thu Feb 6 14:16:33 2020 +0000
Commit: Caolán McNamara <caol...@redhat.com>
CommitDate: Thu Feb 6 18:16:25 2020 +0100
no FontNameBox exists in any .ui file anymore
Change-Id: I9ca3a4da0cd9bcc2b528d5c761a55efd2a4de2f9
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/88106
Tested-by: Jenkins
Reviewed-by: Caolán McNamara <caol...@redhat.com>
diff --git a/extras/source/glade/libreoffice-catalog.xml.in
b/extras/source/glade/libreoffice-catalog.xml.in
index 7d3700349e61..0be42ad51e65 100644
--- a/extras/source/glade/libreoffice-catalog.xml.in
+++ b/extras/source/glade/libreoffice-catalog.xml.in
@@ -42,18 +42,6 @@
</properties>
</glade-widget-class>
- <glade-widget-class title="Font Name ListBox" name="svtlo-FontNameBox"
- generic-name="Font name ListBox" parent="GtkComboBox"
- icon-name="widget-gtk-combobox">
- <properties>
- <property save="True" query="False" id="dropdown" default="True"
name="Use DropDown">
- <parameter-spec>
- <type>GParamBoolean</type>
- </parameter-spec>
- </property>
- </properties>
- </glade-widget-class>
-
<glade-widget-class title="SvxColorValueSet"
name="svxcorelo-SvxColorValueSet"
generic-name="Set of Value Options"
parent="GtkDrawingArea"
icon-name="widget-gtk-drawingarea"/>
diff --git a/solenv/bin/native-code.py b/solenv/bin/native-code.py
index 747335aa6436..71b37c987e59 100755
--- a/solenv/bin/native-code.py
+++ b/solenv/bin/native-code.py
@@ -498,7 +498,6 @@ custom_widgets = [
'DataTreeListBox',
'DropdownBox',
'EmojiView',
- 'FontNameBox',
'IndexBox',
'IndexBox',
'ManagedMenuButton',
diff --git a/svtools/source/control/ctrlbox.cxx
b/svtools/source/control/ctrlbox.cxx
index 5324c98ee964..3b79d98abd52 100644
--- a/svtools/source/control/ctrlbox.cxx
+++ b/svtools/source/control/ctrlbox.cxx
@@ -337,20 +337,6 @@ FontNameBox::FontNameBox( vcl::Window* pParent, WinBits
nWinStyle ) :
InitFontMRUEntriesFile();
}
-extern "C" SAL_DLLPUBLIC_EXPORT void makeFontNameBox(VclPtr<vcl::Window> &
rRet, const VclPtr<vcl::Window> & pParent, VclBuilder::stringmap & rMap)
-{
-
static_assert(std::is_same_v<std::remove_pointer_t<VclBuilder::customMakeWidget>,
- decltype(makeFontNameBox)>);
- bool bDropdown = BuilderUtils::extractDropdown(rMap);
- WinBits nWinBits = WB_LEFT|WB_VCENTER|WB_3DLOOK|WB_TABSTOP;
- if (bDropdown)
- nWinBits |= WB_DROPDOWN;
- VclPtrInstance<FontNameBox> pListBox(pParent, nWinBits);
- if (bDropdown)
- pListBox->EnableAutoSize(true);
- rRet = pListBox;
-}
-
FontNameBox::~FontNameBox()
{
disposeOnce();
commit de665c0afc4a63837494d3044303561690d91ad5
Author: Caolán McNamara <caol...@redhat.com>
AuthorDate: Thu Feb 6 14:14:38 2020 +0000
Commit: Caolán McNamara <caol...@redhat.com>
CommitDate: Thu Feb 6 18:16:10 2020 +0100
the svtlo-FontNameBox entries are hidden
and nothing interacts with them so they can be removed from the
notebook .ui without effect
Change-Id: I85e46ee8539e83776c4ce107a715d9eeccf6222c
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/88105
Tested-by: Jenkins
Reviewed-by: Caolán McNamara <caol...@redhat.com>
diff --git a/sc/uiconfig/scalc/ui/notebookbar_groups.ui
b/sc/uiconfig/scalc/ui/notebookbar_groups.ui
index 0accdeca0c04..05454f188bb3 100644
--- a/sc/uiconfig/scalc/ui/notebookbar_groups.ui
+++ b/sc/uiconfig/scalc/ui/notebookbar_groups.ui
@@ -816,17 +816,6 @@
<property name="position">1</property>
</packing>
</child>
- <child>
- <object class="svtlo-FontNameBox" id="fontnamelist">
- <property name="height_request">36</property>
- <property name="can_focus">False</property>
- </object>
- <packing>
- <property name="expand">False</property>
- <property name="fill">True</property>
- <property name="position">2</property>
- </packing>
- </child>
</object>
<packing>
<property name="expand">True</property>
diff --git a/sd/uiconfig/simpress/ui/notebookbar_groups.ui
b/sd/uiconfig/simpress/ui/notebookbar_groups.ui
index fc4a75d874d0..93bb6aabd00b 100644
--- a/sd/uiconfig/simpress/ui/notebookbar_groups.ui
+++ b/sd/uiconfig/simpress/ui/notebookbar_groups.ui
@@ -749,17 +749,6 @@
<property name="position">0</property>
</packing>
</child>
- <child>
- <object class="svtlo-FontNameBox" id="fontnamelist">
- <property name="height_request">36</property>
- <property name="can_focus">False</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">True</property>
diff --git a/solenv/sanitizers/ui/modules/scalc.suppr
b/solenv/sanitizers/ui/modules/scalc.suppr
index 6556a7d6b2e7..be99b8f97249 100644
--- a/solenv/sanitizers/ui/modules/scalc.suppr
+++ b/solenv/sanitizers/ui/modules/scalc.suppr
@@ -98,7 +98,6 @@
sc/uiconfig/scalc/ui/integerdialog.ui://GtkSpinButton[@id='value'] no-labelled-b
sc/uiconfig/scalc/ui/namerangesdialog.ui://GtkEntry[@id='edassign']
no-labelled-by
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://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 8788119a70c9..637da5821bce 100644
--- a/solenv/sanitizers/ui/modules/simpress.suppr
+++ b/solenv/sanitizers/ui/modules/simpress.suppr
@@ -19,7 +19,6 @@
sd/uiconfig/simpress/ui/interactionpage.ui://GtkEntry[@id='macro'] no-labelled-b
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://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 194d0a2024d9..1678e515eed9 100644
--- a/solenv/sanitizers/ui/modules/swriter.suppr
+++ b/solenv/sanitizers/ui/modules/swriter.suppr
@@ -160,7 +160,6 @@
sw/uiconfig/swriter/ui/mmsalutationpage.ui://GtkLabel[@id='documentindex'] orpha
sw/uiconfig/swriter/ui/mmsalutationpage.ui://GtkLabel[@id='femalefi']
orphan-label
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://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 ab7e25f2488d..96626122e559 100644
--- a/sw/uiconfig/swriter/ui/notebookbar_groups.ui
+++ b/sw/uiconfig/swriter/ui/notebookbar_groups.ui
@@ -1005,17 +1005,6 @@
<property name="position">0</property>
</packing>
</child>
- <child>
- <object class="svtlo-FontNameBox" id="fontnamelist">
- <property name="height_request">36</property>
- <property name="can_focus">False</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">True</property>
_______________________________________________
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
