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