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

no ListBox loaded from .src now

Browse Source 
Change-Id: I7d30c38777f6a36c991271a3617d3f75c83cd490
This commit is contained in:
Caolán McNamara
2016-10-24 17:07:59 +01:00
parent 7549878fd6
commit 30a458d7e1
8 changed files with 0 additions and 60 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
include/svtools/ctrlbox.hxx
View File

@@ -153,7 +153,6 @@ class SVT_DLLPUBLIC ColorListBox : public ListBox
public: public:
ColorListBox( vcl::Window* pParent, ColorListBox( vcl::Window* pParent,
WinBits nWinStyle = WB_BORDER ); WinBits nWinStyle = WB_BORDER );
ColorListBox( vcl::Window* pParent, const ResId& rResId );
virtual ~ColorListBox() override; virtual ~ColorListBox() override;
virtual void dispose() override; virtual void dispose() override;

2
include/tools/rcid.h
View File

@@ -51,8 +51,6 @@
#define RSC_EDIT (RSC_NOTYPE + 0x52) #define RSC_EDIT (RSC_NOTYPE + 0x52)
#define RSC_LISTBOX (RSC_NOTYPE + 0x55)
#define RSC_TEXT (RSC_NOTYPE + 0x57) #define RSC_TEXT (RSC_NOTYPE + 0x57)
#define RSC_STRINGARRAY (RSC_NOTYPE + 0x79) #define RSC_STRINGARRAY (RSC_NOTYPE + 0x79)

1
include/vcl/lstbox.hxx
View File

@@ -117,7 +117,6 @@ protected:
public: public:
explicit ListBox( vcl::Window* pParent, WinBits nStyle = WB_BORDER ); explicit ListBox( vcl::Window* pParent, WinBits nStyle = WB_BORDER );
explicit ListBox( vcl::Window* pParent, const ResId& );
virtual ~ListBox() override; virtual ~ListBox() override;
virtual void dispose() override; virtual void dispose() override;

1
rsc/inc/rscdb.hxx
View File

@@ -177,7 +177,6 @@ class RscTypCont
RscTop * InitClassControl( RscTop * pSuper ); RscTop * InitClassControl( RscTop * pSuper );
RscTop * InitClassPushButton( RscTop * pSuper ); RscTop * InitClassPushButton( RscTop * pSuper );
RscTop * InitClassEdit( RscTop * pSuper ); RscTop * InitClassEdit( RscTop * pSuper );
RscTop * InitClassListBox( RscTop * pSuper, RscArray * pStrLst );
RscTop * InitClassFixedText( RscTop * pSuper ); RscTop * InitClassFixedText( RscTop * pSuper );
RscTop * InitClassKeyCode( RscTop * pSuper, RscEnum * pKey ); RscTop * InitClassKeyCode( RscTop * pSuper, RscEnum * pKey );
RscTop * InitClassMenuItem( RscTop * pSuper ); RscTop * InitClassMenuItem( RscTop * pSuper );

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

@@ -304,37 +304,6 @@ RscTop * RscTypCont::InitClassEdit( RscTop * pSuper )
return pClassEdit; 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 ) RscTop * RscTypCont::InitClassFixedText( RscTop * pSuper )
{ {
Atom nId; Atom nId;

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

@@ -66,7 +66,6 @@ void RscTypCont::Init()
RscTop * pClassButton; RscTop * pClassButton;
RscTop * pClassPushButton; RscTop * pClassPushButton;
RscTop * pClassEdit; RscTop * pClassEdit;
RscTop * pClassListBox;
RscTop * pClassFixedText; RscTop * pClassFixedText;
RscTop * pClassKeyCode; RscTop * pClassKeyCode;
RscTop * pLangClassKeyCode; RscTop * pLangClassKeyCode;
@@ -308,9 +307,6 @@ void RscTypCont::Init()
pRoot->Insert( pClassEdit ); pRoot->Insert( pClassEdit );
} }
{ {
pClassListBox = InitClassListBox( pClassControl, pLangStringLongTupelList );
pRoot->Insert( pClassListBox );
pClassFixedText = InitClassFixedText( pClassControl ); pClassFixedText = InitClassFixedText( pClassControl );
pRoot->Insert( pClassFixedText ); pRoot->Insert( pClassFixedText );

7
svtools/source/control/ctrlbox.cxx
View File

@@ -93,13 +93,6 @@ ColorListBox::ColorListBox( vcl::Window* pParent, WinBits nWinStyle ) :
SetEdgeBlending(true); SetEdgeBlending(true);
} }
ColorListBox::ColorListBox( vcl::Window* pParent, const ResId& rResId ) :
ListBox( pParent, rResId )
{
ImplInit();
SetEdgeBlending(true);
}
VCL_BUILDER_DECL_FACTORY(ColorListBox) VCL_BUILDER_DECL_FACTORY(ColorListBox)
{ {
bool bDropdown = VclBuilder::extractDropdown(rMap); bool bDropdown = VclBuilder::extractDropdown(rMap);

13
vcl/source/control/listbox.cxx
View File

@@ -56,19 +56,6 @@ ListBox::ListBox( vcl::Window* pParent, WinBits nStyle ) : Control( WINDOW_LISTB
ImplInit( pParent, nStyle ); 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() ListBox::~ListBox()
{ {
disposeOnce(); disposeOnce();