mir/libreoffice
2
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

no ComboBoxes loaded from .src anymore

Browse Source 
Change-Id: Ic497dddfe326e9cc06e71c39284b2848d17ae0c8
This commit is contained in:
Caolán McNamara
2016-10-09 20:52:00 +01:00
parent 1bfb59ba81
commit 365d1ec278
7 changed files with 0 additions and 65 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
include/tools/rcid.h
View File

@@ -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)

2
include/vcl/combobox.hxx
View File

@@ -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;

1
rsc/inc/rscdb.hxx
View File

@@ -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 );

26
rsc/source/parser/rscicpx.cxx
View File

@@ -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;

4
rsc/source/parser/rscinit.cxx
View File

@@ -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 );

1
tools/source/rc/resmgr.cxx
View File

@@ -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;

30
vcl/source/control/combobox.cxx
View File

@@ -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;