From 365d1ec2782e5be83e99e6f676b8e248f6ebf16c Mon Sep 17 00:00:00 2001 From: Caolán McNamara Date: Sun, 9 Oct 2016 20:52:00 +0100 Subject: no ComboBoxes loaded from .src anymore Change-Id: Ic497dddfe326e9cc06e71c39284b2848d17ae0c8 --- include/tools/rcid.h | 1 - include/vcl/combobox.hxx | 2 -- rsc/inc/rscdb.hxx | 1 - rsc/source/parser/rscicpx.cxx | 26 -------------------------- rsc/source/parser/rscinit.cxx | 4 ---- tools/source/rc/resmgr.cxx | 1 - vcl/source/control/combobox.cxx | 30 ------------------------------ 7 files changed, 65 deletions(-) diff --git a/include/tools/rcid.h b/include/tools/rcid.h index 36839e5d0d83..d47b0e1495b3 100644 --- a/include/tools/rcid.h +++ b/include/tools/rcid.h @@ -55,7 +55,6 @@ #define RSC_EDIT (RSC_NOTYPE + 0x52) -#define RSC_COMBOBOX (RSC_NOTYPE + 0x54) #define RSC_LISTBOX (RSC_NOTYPE + 0x55) #define RSC_TEXT (RSC_NOTYPE + 0x57) diff --git a/include/vcl/combobox.hxx b/include/vcl/combobox.hxx index e67a4e247234..d4dcfb9ad915 100644 --- a/include/vcl/combobox.hxx +++ b/include/vcl/combobox.hxx @@ -43,7 +43,6 @@ protected: using Window::ImplInit; SAL_DLLPRIVATE void ImplInit( vcl::Window* pParent, WinBits nStyle ); SAL_DLLPRIVATE static WinBits ImplInitStyle( WinBits nStyle ); - SAL_DLLPRIVATE void ImplLoadRes( const ResId& rResId ); SAL_DLLPRIVATE void ImplCalcEditHeight(); SAL_DLLPRIVATE long getMaxWidthScrollBarAndDownButton() const; @@ -54,7 +53,6 @@ protected: public: explicit ComboBox( vcl::Window* pParent, WinBits nStyle = 0 ); - explicit ComboBox( vcl::Window* pParent, const ResId& ); virtual ~ComboBox() override; virtual void dispose() override; diff --git a/rsc/inc/rscdb.hxx b/rsc/inc/rscdb.hxx index 69a85ca5de65..a47de8513726 100644 --- a/rsc/inc/rscdb.hxx +++ b/rsc/inc/rscdb.hxx @@ -186,7 +186,6 @@ class RscTypCont RscEnum * pTriState ); RscTop * InitClassEdit( RscTop * pSuper ); RscTop * InitClassListBox( RscTop * pSuper, RscArray * pStrLst ); - RscTop * InitClassComboBox( RscTop * pSuper, RscArray * pStrLst ); RscTop * InitClassFixedText( RscTop * pSuper ); RscTop * InitClassFixedImage( RscTop * pSuper, RscTop * pClassImage ); RscTop * InitClassKeyCode( RscTop * pSuper, RscEnum * pKey ); diff --git a/rsc/source/parser/rscicpx.cxx b/rsc/source/parser/rscicpx.cxx index 85fd6a370d09..003555601ee1 100644 --- a/rsc/source/parser/rscicpx.cxx +++ b/rsc/source/parser/rscicpx.cxx @@ -403,32 +403,6 @@ RscTop * RscTypCont::InitClassListBox( RscTop * pSuper, RscArray * pStrLst ) return pClassListBox; } -RscTop * RscTypCont::InitClassComboBox( RscTop * pSuper, RscArray * pStrLst ) -{ - Atom nId; - RscTop * pClassComboBox; - - // initialize class - nId = pHS->getID( "ComboBox" ); - pClassComboBox = new RscClass( nId, RSC_COMBOBOX, pSuper ); - pClassComboBox->SetCallPar( *pWinPar1, *pWinPar2, *pWinParType ); - aNmTb.Put( nId, CLASSNAME, pClassComboBox ); - - // initialize variables - INS_WINBIT(pClassComboBox,DropDown) - INS_WINBIT(pClassComboBox,Sort) - INS_WINBIT(pClassComboBox,HScroll); - INS_WINBIT(pClassComboBox,VScroll); - INS_WINBIT(pClassComboBox,AutoSize) - INS_WINBIT(pClassComboBox,AutoHScroll) - INS_WINBIT(pClassComboBox,DDExtraWidth) - - nId = aNmTb.Put( "StringList", VARNAME ); - pClassComboBox->SetVariable( nId, pStrLst ); - - return pClassComboBox; -} - RscTop * RscTypCont::InitClassFixedText( RscTop * pSuper ) { Atom nId; diff --git a/rsc/source/parser/rscinit.cxx b/rsc/source/parser/rscinit.cxx index 2670ed31e1dd..f167cc8d69f2 100644 --- a/rsc/source/parser/rscinit.cxx +++ b/rsc/source/parser/rscinit.cxx @@ -68,7 +68,6 @@ void RscTypCont::Init() RscTop * pClassImageButton; RscTop * pClassEdit; RscTop * pClassListBox; - RscTop * pClassComboBox; RscTop * pClassFixedText; RscTop * pClassFixedImage; RscTop * pClassKeyCode; @@ -321,9 +320,6 @@ void RscTypCont::Init() pClassListBox = InitClassListBox( pClassControl, pLangStringLongTupelList ); pRoot->Insert( pClassListBox ); - pClassComboBox = InitClassComboBox( pClassEdit, pLangStringList ); - pRoot->Insert( pClassComboBox ); - pClassFixedText = InitClassFixedText( pClassControl ); pRoot->Insert( pClassFixedText ); diff --git a/tools/source/rc/resmgr.cxx b/tools/source/rc/resmgr.cxx index eec17191c343..473b900a6c5b 100644 --- a/tools/source/rc/resmgr.cxx +++ b/tools/source/rc/resmgr.cxx @@ -1425,7 +1425,6 @@ OString ResMgr::GetAutoHelpId() switch( pRC->pResource->GetRT() ) { case RSC_EDIT: aHID.append( "Edit" ); break; case RSC_LISTBOX: aHID.append( "ListBox" ); break; - case RSC_COMBOBOX: aHID.append( "ComboBox" ); break; case RSC_PUSHBUTTON: aHID.append( "PushButton" ); break; case RSC_SPINFIELD: aHID.append( "SpinField" ); break; case RSC_NUMERICFIELD: aHID.append( "NumericField" ); break; diff --git a/vcl/source/control/combobox.cxx b/vcl/source/control/combobox.cxx index c64e05d317fc..530f220fdae6 100644 --- a/vcl/source/control/combobox.cxx +++ b/vcl/source/control/combobox.cxx @@ -110,21 +110,6 @@ ComboBox::ComboBox(vcl::Window *const pParent, WinBits const nStyle) SetWidthInChars(-1); } -ComboBox::ComboBox(vcl::Window *const pParent, const ResId& rResId) - : Edit( WINDOW_COMBOBOX ) - , m_pImpl(new Impl(*this)) -{ - m_pImpl->ImplInitComboBoxData(); - rResId.SetRT( RSC_COMBOBOX ); - WinBits nStyle = ImplInitRes( rResId ); - ImplInit( pParent, nStyle ); - ImplLoadRes( rResId ); - - SetWidthInChars(-1); - if ( !(nStyle & WB_HIDE ) ) - Show(); -} - ComboBox::~ComboBox() { disposeOnce(); @@ -268,21 +253,6 @@ WinBits ComboBox::ImplInitStyle( WinBits nStyle ) return nStyle; } -void ComboBox::ImplLoadRes( const ResId& rResId ) -{ - Edit::ImplLoadRes( rResId ); - - sal_Int32 nNumber = ReadLongRes(); - - if( nNumber ) - { - for( sal_Int32 i = 0; i < nNumber; i++ ) - { - InsertEntry( ReadStringRes() ); - } - } -} - void ComboBox::EnableAutocomplete( bool bEnable, bool bMatchCase ) { m_pImpl->m_isMatchCase = bMatchCase; -- cgit