diff options
| author | Noel Grandin <noel@peralex.com> | 2015-02-24 13:21:11 +0200 |
|---|---|---|
| committer | Noel Grandin <noel@peralex.com> | 2015-02-25 10:34:26 +0200 |
| commit | fcf339ca5f198529a1eaf70e2ec893f75a843558 (patch) | |
| tree | 97dd80e34cf4b7371b5ad210181fc5e1b5bce82f /idl/source | |
| parent | 1c4e95db104cd5f732bc41a539a7dc5fd9269ef6 (diff) | |
convert SFX_SLOT_ constants to enum class
Change-Id: Icc3aad14d9d0c59c1c1c8f124f0626a9f947b93f
Diffstat (limited to 'idl/source')
| -rw-r--r-- | idl/source/objects/object.cxx | 2 | ||||
| -rw-r--r-- | idl/source/objects/slot.cxx | 16 |
2 files changed, 9 insertions, 9 deletions
diff --git a/idl/source/objects/object.cxx b/idl/source/objects/object.cxx index 96bd62e91794..320faa9d3ffe 100644 --- a/idl/source/objects/object.cxx +++ b/idl/source/objects/object.cxx @@ -434,7 +434,7 @@ void SvMetaClass::WriteSfx( SvIdlDataBase & rBase, SvStream & rOutStm ) .WriteCharPtr( ", 0, 0, " ) .WriteCharPtr( "SFX_STUB_PTR_EXEC_NONE," ) .WriteCharPtr( "SFX_STUB_PTR_STATE_NONE," ) - .WriteCharPtr( "0, SfxVoidItem, 0, 0, \"\", 0 )" ) << endl; + .WriteCharPtr( "SfxSlotMode::NONE, SfxVoidItem, 0, 0, \"\", SfxSlotMode::NONE )" ) << endl; } rOutStm << endl; rOutStm.WriteCharPtr( "};" ) << endl; diff --git a/idl/source/objects/slot.cxx b/idl/source/objects/slot.cxx index f0853a7e86f1..e0a895399515 100644 --- a/idl/source/objects/slot.cxx +++ b/idl/source/objects/slot.cxx @@ -640,9 +640,9 @@ void SvMetaSlot::Insert( SvSlotElementList& rList, const OString& rPrefix, static OString MakeSlotName( SvStringHashEntry * pEntry ) { - OStringBuffer aName("SFX_SLOT_"); - aName.append(pEntry->GetName()); - return aName.makeStringAndClear().toAsciiUpperCase(); + OStringBuffer aName("SfxSlotMode::"); + aName.append(pEntry->GetName().toAsciiUpperCase()); + return aName.makeStringAndClear(); }; void SvMetaSlot::WriteSlotStubs( const OString& rShellName, @@ -882,7 +882,7 @@ void SvMetaSlot::WriteSlot( const OString& rShellName, sal_uInt16 nCount, rOutStm.WriteCharPtr( MakeSlotName( SvHash_ImageRotation() ).getStr() ).WriteChar( '|' ); if( GetImageReflection() ) rOutStm.WriteCharPtr( MakeSlotName( SvHash_ImageReflection() ).getStr() ).WriteChar( '|' ); - rOutStm.WriteChar( '0' ); + rOutStm.WriteCharPtr( "SfxSlotMode::NONE" ); rOutStm.WriteChar( ',' ) << endl; WriteTab( rOutStm, 4 ); @@ -949,15 +949,15 @@ void SvMetaSlot::WriteSlot( const OString& rShellName, sal_uInt16 nCount, // Method/Property flags if( IsMethod() ) - rOutStm.WriteCharPtr( "SFX_SLOT_METHOD|" ); + rOutStm.WriteCharPtr( "SfxSlotMode::METHOD|" ); if( IsVariable() ) { - rOutStm.WriteCharPtr( "SFX_SLOT_PROPGET|" ); + rOutStm.WriteCharPtr( "SfxSlotMode::PROPGET|" ); if( !GetReadonly() ) - rOutStm.WriteCharPtr( "SFX_SLOT_PROPSET|" ); + rOutStm.WriteCharPtr( "SfxSlotMode::PROPSET|" ); } - rOutStm.WriteChar( '0' ); + rOutStm.WriteCharPtr( "SfxSlotMode::NONE" ); } { |