diff --git a/include/svtools/ctrlbox.hxx b/include/svtools/ctrlbox.hxx index b068b556b5c2..68fef1251b41 100644 --- a/include/svtools/ctrlbox.hxx +++ b/include/svtools/ctrlbox.hxx @@ -153,7 +153,6 @@ class SVT_DLLPUBLIC ColorListBox : public ListBox public: ColorListBox( vcl::Window* pParent, WinBits nWinStyle = WB_BORDER ); - ColorListBox( vcl::Window* pParent, const ResId& rResId ); virtual ~ColorListBox() override; virtual void dispose() override; diff --git a/include/tools/rcid.h b/include/tools/rcid.h index 5c2ed2fffe50..ab3bd5967583 100644 --- a/include/tools/rcid.h +++ b/include/tools/rcid.h @@ -51,8 +51,6 @@ #define RSC_EDIT (RSC_NOTYPE + 0x52) -#define RSC_LISTBOX (RSC_NOTYPE + 0x55) - #define RSC_TEXT (RSC_NOTYPE + 0x57) #define RSC_STRINGARRAY (RSC_NOTYPE + 0x79) diff --git a/include/vcl/lstbox.hxx b/include/vcl/lstbox.hxx index 4c3b3bb398af..2d85a9389953 100644 --- a/include/vcl/lstbox.hxx +++ b/include/vcl/lstbox.hxx @@ -117,7 +117,6 @@ protected: public: explicit ListBox( vcl::Window* pParent, WinBits nStyle = WB_BORDER ); - explicit ListBox( vcl::Window* pParent, const ResId& ); virtual ~ListBox() override; virtual void dispose() override; diff --git a/rsc/inc/rscdb.hxx b/rsc/inc/rscdb.hxx index 4be970fb85f5..c7f719aa2446 100644 --- a/rsc/inc/rscdb.hxx +++ b/rsc/inc/rscdb.hxx @@ -177,7 +177,6 @@ class RscTypCont RscTop * InitClassControl( RscTop * pSuper ); RscTop * InitClassPushButton( RscTop * pSuper ); RscTop * InitClassEdit( RscTop * pSuper ); - RscTop * InitClassListBox( RscTop * pSuper, RscArray * pStrLst ); RscTop * InitClassFixedText( RscTop * pSuper ); RscTop * InitClassKeyCode( RscTop * pSuper, RscEnum * pKey ); RscTop * InitClassMenuItem( RscTop * pSuper ); diff --git a/rsc/source/parser/rscicpx.cxx b/rsc/source/parser/rscicpx.cxx index 01c310dc39b6..89b80748bc67 100644 --- a/rsc/source/parser/rscicpx.cxx +++ b/rsc/source/parser/rscicpx.cxx @@ -304,37 +304,6 @@ RscTop * RscTypCont::InitClassEdit( RscTop * pSuper ) return pClassEdit; } -RscTop * RscTypCont::InitClassListBox( RscTop * pSuper, RscArray * pStrLst ) -{ - Atom nId; - RscTop * pClassListBox; - - // initialize class - nId = pHS->getID( "ListBox" ); - pClassListBox = new RscClass( nId, RSC_LISTBOX, pSuper ); - pClassListBox->SetCallPar( *pWinPar1, *pWinPar2, *pWinParType ); - aNmTb.Put( nId, CLASSNAME, pClassListBox ); - - // initialize variables - INS_WINBIT(pClassListBox,Sort) - INS_WINBIT(pClassListBox,DropDown) - INS_WINBIT(pClassListBox,HScroll); - INS_WINBIT(pClassListBox,VScroll); - INS_WINBIT(pClassListBox,AutoSize) - INS_WINBIT(pClassListBox,AutoHScroll) - - { - RSCINST aDflt = aUShort.Create( nullptr, RSCINST() ); - aDflt.pClass->SetNumber( aDflt, (sal_uInt16)0xFFFF ); - nId = aNmTb.Put( "CurPos", VARNAME ); - pClassListBox->SetVariable( nId, &aUShort, &aDflt ); - } - nId = aNmTb.Put( "StringList", VARNAME ); - pClassListBox->SetVariable( nId, pStrLst ); - - return pClassListBox; -} - RscTop * RscTypCont::InitClassFixedText( RscTop * pSuper ) { Atom nId; diff --git a/rsc/source/parser/rscinit.cxx b/rsc/source/parser/rscinit.cxx index 7bd5ea75673c..4bdaf63a6ef1 100644 --- a/rsc/source/parser/rscinit.cxx +++ b/rsc/source/parser/rscinit.cxx @@ -66,7 +66,6 @@ void RscTypCont::Init() RscTop * pClassButton; RscTop * pClassPushButton; RscTop * pClassEdit; - RscTop * pClassListBox; RscTop * pClassFixedText; RscTop * pClassKeyCode; RscTop * pLangClassKeyCode; @@ -308,9 +307,6 @@ void RscTypCont::Init() pRoot->Insert( pClassEdit ); } { - pClassListBox = InitClassListBox( pClassControl, pLangStringLongTupelList ); - pRoot->Insert( pClassListBox ); - pClassFixedText = InitClassFixedText( pClassControl ); pRoot->Insert( pClassFixedText ); diff --git a/svtools/source/control/ctrlbox.cxx b/svtools/source/control/ctrlbox.cxx index 269abf707764..4c6b107b1025 100644 --- a/svtools/source/control/ctrlbox.cxx +++ b/svtools/source/control/ctrlbox.cxx @@ -93,13 +93,6 @@ ColorListBox::ColorListBox( vcl::Window* pParent, WinBits nWinStyle ) : SetEdgeBlending(true); } -ColorListBox::ColorListBox( vcl::Window* pParent, const ResId& rResId ) : - ListBox( pParent, rResId ) -{ - ImplInit(); - SetEdgeBlending(true); -} - VCL_BUILDER_DECL_FACTORY(ColorListBox) { bool bDropdown = VclBuilder::extractDropdown(rMap); diff --git a/vcl/source/control/listbox.cxx b/vcl/source/control/listbox.cxx index 0b0edf116913..b0ef4006fb0e 100644 --- a/vcl/source/control/listbox.cxx +++ b/vcl/source/control/listbox.cxx @@ -56,19 +56,6 @@ ListBox::ListBox( vcl::Window* pParent, WinBits nStyle ) : Control( WINDOW_LISTB ImplInit( pParent, nStyle ); } -ListBox::ListBox( vcl::Window* pParent, const ResId& rResId ) : - Control( WINDOW_LISTBOX ) -{ - rResId.SetRT( RSC_LISTBOX ); - WinBits nStyle = ImplInitRes( rResId ); - ImplInitListBoxData(); - ImplInit( pParent, nStyle ); - ImplLoadRes(); - - if ( !(nStyle & WB_HIDE ) ) - Show(); -} - ListBox::~ListBox() { disposeOnce();