extras/source/glade/libreoffice-catalog.xml.in | 12 ------------
solenv/bin/native-code.py | 1 -
svtools/source/control/ctrlbox.cxx | 14 --------------
3 files changed, 27 deletions(-)
New commits:
commit 4eefad00d969555a13397061dd560e98534a2901
Author: Caolán McNamara <caol...@redhat.com>
AuthorDate: Wed Feb 5 19:43:09 2020 +0000
Commit: Caolán McNamara <caol...@redhat.com>
CommitDate: Thu Feb 6 12:18:08 2020 +0100
svtlo-FontSizeBox now appears in no .ui file
Change-Id: I711a5d1b7a6ced113ac0c671ea1ba868d70d6346
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/88063
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 b132e58b18f5..7d3700349e61 100644
--- a/extras/source/glade/libreoffice-catalog.xml.in
+++ b/extras/source/glade/libreoffice-catalog.xml.in
@@ -54,18 +54,6 @@
</properties>
</glade-widget-class>
- <glade-widget-class title="Font Size ListBox" name="svtlo-FontSizeBox"
- generic-name="Font Size 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 d7796260a283..747335aa6436 100755
--- a/solenv/bin/native-code.py
+++ b/solenv/bin/native-code.py
@@ -499,7 +499,6 @@ custom_widgets = [
'DropdownBox',
'EmojiView',
'FontNameBox',
- 'FontSizeBox',
'IndexBox',
'IndexBox',
'ManagedMenuButton',
diff --git a/svtools/source/control/ctrlbox.cxx
b/svtools/source/control/ctrlbox.cxx
index 5f2a1881cd94..b47b3ba74e2e 100644
--- a/svtools/source/control/ctrlbox.cxx
+++ b/svtools/source/control/ctrlbox.cxx
@@ -861,20 +861,6 @@ FontSizeBox::FontSizeBox( vcl::Window* pParent, WinBits
nWinSize ) :
ImplInit();
}
-extern "C" SAL_DLLPUBLIC_EXPORT void makeFontSizeBox(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(makeFontSizeBox)>);
- bool bDropdown = BuilderUtils::extractDropdown(rMap);
- WinBits nWinBits = WB_LEFT|WB_VCENTER|WB_3DLOOK|WB_TABSTOP;
- if (bDropdown)
- nWinBits |= WB_DROPDOWN;
- VclPtrInstance<FontSizeBox> pListBox(pParent, nWinBits);
- if (bDropdown)
- pListBox->EnableAutoSize(true);
- rRet = pListBox;
-}
-
void FontSizeBox::ImplInit()
{
EnableAutocomplete( false );
_______________________________________________
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
