Kaydet (Commit) 1c13f9c2 authored tarafından Caolán McNamara's avatar Caolán McNamara

RSC_TRISTATEBOX is no longer used

Change-Id: Ib3f43db131cf5562ad011538873c2ee51839665c
üst b0da096c
...@@ -72,7 +72,7 @@ ...@@ -72,7 +72,7 @@
#define RSC_RADIOBUTTON (RSC_NOTYPE + 0x4e) #define RSC_RADIOBUTTON (RSC_NOTYPE + 0x4e)
#define RSC_CHECKBOX (RSC_NOTYPE + 0x50) #define RSC_CHECKBOX (RSC_NOTYPE + 0x50)
#define RSC_TRISTATEBOX (RSC_NOTYPE + 0x51)
#define RSC_EDIT (RSC_NOTYPE + 0x52) #define RSC_EDIT (RSC_NOTYPE + 0x52)
#define RSC_COMBOBOX (RSC_NOTYPE + 0x54) #define RSC_COMBOBOX (RSC_NOTYPE + 0x54)
......
...@@ -176,7 +176,6 @@ class RscTypCont ...@@ -176,7 +176,6 @@ class RscTypCont
RscTop * InitClassControl( RscTop * pSuper ); RscTop * InitClassControl( RscTop * pSuper );
RscTop * InitClassCheckBox( RscTop * pSuper ); RscTop * InitClassCheckBox( RscTop * pSuper );
RscTop * InitClassPushButton( RscTop * pSuper ); RscTop * InitClassPushButton( RscTop * pSuper );
RscTop * InitClassTriStateBox( RscTop * pSuper, RscEnum * pTriState );
RscTop * InitClassImageButton( RscTop * pSuper, RscTop * pClassImage, RscTop * InitClassImageButton( RscTop * pSuper, RscTop * pClassImage,
RscEnum * pTriState ); RscEnum * pTriState );
RscTop * InitClassEdit( RscTop * pSuper ); RscTop * InitClassEdit( RscTop * pSuper );
......
...@@ -432,26 +432,6 @@ RscTop * RscTypCont::InitClassPushButton( RscTop * pSuper ) ...@@ -432,26 +432,6 @@ RscTop * RscTypCont::InitClassPushButton( RscTop * pSuper )
return pClassPushButton; return pClassPushButton;
} }
RscTop * RscTypCont::InitClassTriStateBox( RscTop * pSuper,
RscEnum * pTriState )
{
Atom nId;
RscTop * pClassTriStateBox;
nId = pHS->getID( "TriStateBox" );
pClassTriStateBox = new RscClass( nId, RSC_TRISTATEBOX, pSuper );
pClassTriStateBox->SetCallPar( *pWinPar1, *pWinPar2, *pWinParType );
aNmTb.Put( nId, CLASSNAME, pClassTriStateBox );
// Variablen anlegen
nId = aNmTb.Put( "State", VARNAME );
pClassTriStateBox->SetVariable( nId, pTriState );
nId = aNmTb.Put( "TriStateDisable", VARNAME );
pClassTriStateBox->SetVariable( nId, &aBool );
return pClassTriStateBox;
}
RscTop * RscTypCont::InitClassImageButton( RscTop * pSuper, RscTop * RscTypCont::InitClassImageButton( RscTop * pSuper,
RscTop * pClassImage, RscTop * pClassImage,
RscEnum * pTriState ) RscEnum * pTriState )
......
...@@ -82,7 +82,6 @@ void RscTypCont::Init() ...@@ -82,7 +82,6 @@ void RscTypCont::Init()
RscTop * pClassHelpButton; RscTop * pClassHelpButton;
RscTop * pClassRadioButton; RscTop * pClassRadioButton;
RscTop * pClassImageButton; RscTop * pClassImageButton;
RscTop * pClassTriStateBox;
RscTop * pClassEdit; RscTop * pClassEdit;
RscTop * pClassListBox; RscTop * pClassListBox;
RscTop * pClassComboBox; RscTop * pClassComboBox;
...@@ -417,9 +416,6 @@ void RscTypCont::Init() ...@@ -417,9 +416,6 @@ void RscTypCont::Init()
pClassRadioButton = InitClassRadioButton( pClassButton ); pClassRadioButton = InitClassRadioButton( pClassButton );
pRoot->Insert( pClassRadioButton ); pRoot->Insert( pClassRadioButton );
pClassTriStateBox = InitClassTriStateBox( pClassControl, pTriState );
pRoot->Insert( pClassTriStateBox );
pClassImageButton = InitClassImageButton( pClassPushButton, pClassImageButton = InitClassImageButton( pClassPushButton,
pClassImage, pTriState ); pClassImage, pTriState );
pRoot->Insert( pClassImageButton ); pRoot->Insert( pClassImageButton );
......
...@@ -1481,7 +1481,6 @@ OString ResMgr::GetAutoHelpId() ...@@ -1481,7 +1481,6 @@ OString ResMgr::GetAutoHelpId()
switch( pRC->pResource->GetRT() ) { switch( pRC->pResource->GetRT() ) {
case RSC_RADIOBUTTON: aHID.append( "RadioButton" ); break; case RSC_RADIOBUTTON: aHID.append( "RadioButton" ); break;
case RSC_CHECKBOX: aHID.append( "CheckBox" ); break; case RSC_CHECKBOX: aHID.append( "CheckBox" ); break;
case RSC_TRISTATEBOX: aHID.append( "TriStateBox" ); break;
case RSC_EDIT: aHID.append( "Edit" ); break; case RSC_EDIT: aHID.append( "Edit" ); break;
case RSC_LISTBOX: aHID.append( "ListBox" ); break; case RSC_LISTBOX: aHID.append( "ListBox" ); break;
case RSC_COMBOBOX: aHID.append( "ComboBox" ); break; case RSC_COMBOBOX: aHID.append( "ComboBox" ); break;
......
...@@ -2984,13 +2984,10 @@ void CheckBox::ImplLoadRes( const ResId& rResId ) ...@@ -2984,13 +2984,10 @@ void CheckBox::ImplLoadRes( const ResId& rResId )
{ {
Button::ImplLoadRes( rResId ); Button::ImplLoadRes( rResId );
if ( rResId.GetRT() != RSC_TRISTATEBOX ) sal_uInt16 nChecked = ReadShortRes();
{ //anderer Wert als Default ?
sal_uInt16 nChecked = ReadShortRes(); if( nChecked )
//anderer Wert als Default ? Check( true );
if( nChecked )
Check( true );
}
} }
void CheckBox::ImplInvalidateOrDrawCheckBoxState() void CheckBox::ImplInvalidateOrDrawCheckBoxState()
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment