Kaydet (Commit) 623445aa authored tarafından Noel Grandin's avatar Noel Grandin

convert PropertyMode to scoped enum

Change-Id: I9b0bbf6273aa18ae918d1d69af5dcc7652181f5c
üst 42f771d6
...@@ -227,15 +227,15 @@ void SbiCodeGen::Save() ...@@ -227,15 +227,15 @@ void SbiCodeGen::Save()
aProcName = aIfaceProcName; aProcName = aIfaceProcName;
} }
PropertyMode ePropMode = pProc->getPropertyMode(); PropertyMode ePropMode = pProc->getPropertyMode();
if( ePropMode != PROPERTY_MODE_NONE ) if( ePropMode != PropertyMode::NONE )
{ {
SbxDataType ePropType = SbxEMPTY; SbxDataType ePropType = SbxEMPTY;
switch( ePropMode ) switch( ePropMode )
{ {
case PROPERTY_MODE_GET: case PropertyMode::Get:
ePropType = pProc->GetType(); ePropType = pProc->GetType();
break; break;
case PROPERTY_MODE_LET: case PropertyMode::Let:
{ {
// type == type of first parameter // type == type of first parameter
ePropType = SbxVARIANT; // Default ePropType = SbxVARIANT; // Default
...@@ -250,7 +250,7 @@ void SbiCodeGen::Save() ...@@ -250,7 +250,7 @@ void SbiCodeGen::Save()
} }
break; break;
} }
case PROPERTY_MODE_SET: case PropertyMode::Set:
ePropType = SbxOBJECT; ePropType = SbxOBJECT;
break; break;
default: default:
......
...@@ -1172,21 +1172,21 @@ void SbiParser::DefProc( bool bStatic, bool bPrivate ) ...@@ -1172,21 +1172,21 @@ void SbiParser::DefProc( bool bStatic, bool bPrivate )
sal_uInt16 l1 = nLine; sal_uInt16 l1 = nLine;
bool bSub = ( eCurTok == SUB ); bool bSub = ( eCurTok == SUB );
bool bProperty = ( eCurTok == PROPERTY ); bool bProperty = ( eCurTok == PROPERTY );
PropertyMode ePropertyMode = PROPERTY_MODE_NONE; PropertyMode ePropertyMode = PropertyMode::NONE;
if( bProperty ) if( bProperty )
{ {
Next(); Next();
if( eCurTok == GET ) if( eCurTok == GET )
{ {
ePropertyMode = PROPERTY_MODE_GET; ePropertyMode = PropertyMode::Get;
} }
else if( eCurTok == LET ) else if( eCurTok == LET )
{ {
ePropertyMode = PROPERTY_MODE_LET; ePropertyMode = PropertyMode::Let;
} }
else if( eCurTok == SET ) else if( eCurTok == SET )
{ {
ePropertyMode = PROPERTY_MODE_SET; ePropertyMode = PropertyMode::Set;
} }
else else
{ {
...@@ -1222,7 +1222,7 @@ void SbiParser::DefProc( bool bStatic, bool bPrivate ) ...@@ -1222,7 +1222,7 @@ void SbiParser::DefProc( bool bStatic, bool bPrivate )
else if( pProc->IsUsedForProcDecl() ) else if( pProc->IsUsedForProcDecl() )
{ {
PropertyMode ePropMode = pDef->getPropertyMode(); PropertyMode ePropMode = pDef->getPropertyMode();
if( ePropMode == PROPERTY_MODE_NONE || ePropMode == pProc->getPropertyMode() ) if( ePropMode == PropertyMode::NONE || ePropMode == pProc->getPropertyMode() )
{ {
Error( SbERR_PROC_DEFINED, pDef->GetName() ); Error( SbERR_PROC_DEFINED, pDef->GetName() );
delete pDef; delete pDef;
......
...@@ -405,7 +405,7 @@ SbiProcDef::SbiProcDef( SbiParser* pParser, const OUString& rName, ...@@ -405,7 +405,7 @@ SbiProcDef::SbiProcDef( SbiParser* pParser, const OUString& rName,
pPool->SetParent( &aParams ); pPool->SetParent( &aParams );
nLine1 = nLine1 =
nLine2 = 0; nLine2 = 0;
mePropMode = PROPERTY_MODE_NONE; mePropMode = PropertyMode::NONE;
bPublic = true; bPublic = true;
bCdecl = false; bCdecl = false;
bStatic = false; bStatic = false;
...@@ -470,7 +470,7 @@ void SbiProcDef::Match( SbiProcDef* pOld ) ...@@ -470,7 +470,7 @@ void SbiProcDef::Match( SbiProcDef* pOld )
void SbiProcDef::setPropertyMode( PropertyMode ePropMode ) void SbiProcDef::setPropertyMode( PropertyMode ePropMode )
{ {
mePropMode = ePropMode; mePropMode = ePropMode;
if( mePropMode != PROPERTY_MODE_NONE ) if( mePropMode != PropertyMode::NONE )
{ {
// Prop name = original scanned procedure name // Prop name = original scanned procedure name
maPropName = aName; maPropName = aName;
...@@ -480,10 +480,10 @@ void SbiProcDef::setPropertyMode( PropertyMode ePropMode ) ...@@ -480,10 +480,10 @@ void SbiProcDef::setPropertyMode( PropertyMode ePropMode )
OUString aCompleteProcName = "Property "; OUString aCompleteProcName = "Property ";
switch( mePropMode ) switch( mePropMode )
{ {
case PROPERTY_MODE_GET: aCompleteProcName += "Get "; break; case PropertyMode::Get: aCompleteProcName += "Get "; break;
case PROPERTY_MODE_LET: aCompleteProcName += "Let "; break; case PropertyMode::Let: aCompleteProcName += "Let "; break;
case PROPERTY_MODE_SET: aCompleteProcName += "Set "; break; case PropertyMode::Set: aCompleteProcName += "Set "; break;
case PROPERTY_MODE_NONE: OSL_FAIL( "Illegal PropertyMode PROPERTY_MODE_NONE" ); break; case PropertyMode::NONE: OSL_FAIL( "Illegal PropertyMode PropertyMode::NONE" ); break;
} }
aCompleteProcName += aName; aCompleteProcName += aName;
aName = aCompleteProcName; aName = aCompleteProcName;
......
...@@ -55,12 +55,12 @@ BASIC_DLLPUBLIC void setBasicWatchMode( bool bOn ); ...@@ -55,12 +55,12 @@ BASIC_DLLPUBLIC void setBasicWatchMode( bool bOn );
#define SBX_HINT_BASICSTART SFX_HINT_USER04 #define SBX_HINT_BASICSTART SFX_HINT_USER04
#define SBX_HINT_BASICSTOP SFX_HINT_USER05 #define SBX_HINT_BASICSTOP SFX_HINT_USER05
enum PropertyMode enum class PropertyMode
{ {
PROPERTY_MODE_NONE, NONE,
PROPERTY_MODE_GET, Get,
PROPERTY_MODE_LET, Let,
PROPERTY_MODE_SET Set
}; };
#endif #endif
......
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