extras/source/glade/libreoffice-catalog.xml.in | 4 ---- solenv/bin/native-code.py | 1 - svtools/source/control/inettbc.cxx | 12 ------------ 3 files changed, 17 deletions(-)
New commits: commit 783fec72977ffaa389629d9ecbc5576eb47f2188 Author: Caolán McNamara <caol...@redhat.com> AuthorDate: Thu Oct 24 17:24:32 2019 +0100 Commit: Caolán McNamara <caol...@redhat.com> CommitDate: Tue Oct 29 14:45:29 2019 +0100 SvtURLBox not used in any .ui files anymore Change-Id: I03802d3345ce29f52d026f2638cb19d6209cd9e2 Reviewed-on: https://gerrit.libreoffice.org/81495 Tested-by: Jenkins Reviewed-by: Caolán McNamara <caol...@redhat.com> Tested-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 415a010b90d8..7ba7ff42deaf 100644 --- a/extras/source/glade/libreoffice-catalog.xml.in +++ b/extras/source/glade/libreoffice-catalog.xml.in @@ -119,10 +119,6 @@ generic-name="Calc Column SpinButton" parent="GtkSpinButton" icon-name="widget-gtk-spinbutton"/> - <glade-widget-class title="SvtURLBox" name="svtlo-SvtURLBox" - generic-name="URLBox" parent="GtkComboBoxText" - icon-name="widget-gtk-comboboxtext"/> - <glade-widget-class title="PropertyControl" name="sdlo-PropertyControl" generic-name="PropertyControl" parent="GtkComboBoxText" icon-name="widget-gtk-comboboxtext"/> diff --git a/solenv/bin/native-code.py b/solenv/bin/native-code.py index d7671d8dfd47..8ad5f8ed8887 100755 --- a/solenv/bin/native-code.py +++ b/solenv/bin/native-code.py @@ -498,7 +498,6 @@ custom_widgets = [ 'SidebarDialControl', 'SidebarToolBox', 'SpacingListBox', - 'SvtURLBox', 'Svx3DPreviewControl', 'SvxCharViewControl', 'SvxColorListBox', diff --git a/svtools/source/control/inettbc.cxx b/svtools/source/control/inettbc.cxx index 0f68239194ff..27fb78651e3a 100644 --- a/svtools/source/control/inettbc.cxx +++ b/svtools/source/control/inettbc.cxx @@ -1413,18 +1413,6 @@ SvtURLBox::SvtURLBox( vcl::Window* pParent, WinBits _nStyle, INetProtocol eSmart Init(bSetDefaultHelpID); } -extern "C" SAL_DLLPUBLIC_EXPORT void makeSvtURLBox(VclPtr<vcl::Window> & rRet, const VclPtr<vcl::Window> & pParent, VclBuilder::stringmap &) -{ - static_assert(std::is_same_v<std::remove_pointer_t<VclBuilder::customMakeWidget>, - decltype(makeSvtURLBox)>); - WinBits nWinBits = WB_LEFT|WB_VCENTER|WB_3DLOOK|WB_TABSTOP| - WB_DROPDOWN|WB_AUTOHSCROLL; - VclPtrInstance<SvtURLBox> pListBox(pParent, nWinBits, INetProtocol::NotValid, false); - pListBox->EnableAutoSize(true); - rRet = pListBox; -} - - void SvtURLBox::Init(bool bSetDefaultHelpID) { pImpl.reset( new SvtURLBox_Impl ); _______________________________________________ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits