diff options
Diffstat (limited to 'idl')
| -rw-r--r-- | idl/inc/database.hxx | 12 | ||||
| -rw-r--r-- | idl/source/objects/module.cxx | 2 | ||||
| -rw-r--r-- | idl/source/objects/slot.cxx | 6 | ||||
| -rw-r--r-- | idl/source/prj/database.cxx | 20 |
4 files changed, 20 insertions, 20 deletions
diff --git a/idl/inc/database.hxx b/idl/inc/database.hxx index e0bb7e2ace83..680f569c882a 100644 --- a/idl/inc/database.hxx +++ b/idl/inc/database.hxx @@ -65,7 +65,7 @@ class SvIdlDataBase SvRefMemberList<SvMetaType *> aTypeList; SvRefMemberList<SvMetaClass *> aClassList; SvRefMemberList<SvMetaModule *> aModuleList; - SvRefMemberList<SvMetaAttribute *> aAttrList; + SvRefMemberList<SvMetaSlot *> aSlotList; SvRefMemberList<SvMetaType *> aTmpTypeList; // not persistent SvRefMemberList<SvMetaObject *> aContextStack; @@ -84,10 +84,10 @@ public: explicit SvIdlDataBase( const SvCommand& rCmd ); ~SvIdlDataBase(); - SvRefMemberList<SvMetaAttribute *>& GetAttrList() { return aAttrList; } - SvRefMemberList<SvMetaType *>& GetTypeList(); - SvRefMemberList<SvMetaClass *>& GetClassList() { return aClassList; } - SvRefMemberList<SvMetaModule *>& GetModuleList() { return aModuleList; } + SvRefMemberList<SvMetaSlot *>& GetSlotList() { return aSlotList; } + SvRefMemberList<SvMetaType *>& GetTypeList(); + SvRefMemberList<SvMetaClass *>& GetClassList() { return aClassList; } + SvRefMemberList<SvMetaModule *>& GetModuleList() { return aModuleList; } // list of used types while writing SvRefMemberList<SvMetaType *> aUsedTypes; @@ -96,7 +96,7 @@ public: void StartNewFile( const OUString& rName ); void SetExportFile( const OUString& rName ) { aExportFile = rName; } - void AppendAttr( SvMetaAttribute *pSlot ); + void AppendSlot( SvMetaSlot *pSlot ); const SvIdlError & GetError() const { return aError; } void SetError( const SvIdlError & r ) { aError = r; } diff --git a/idl/source/objects/module.cxx b/idl/source/objects/module.cxx index 524a6d788a85..ad339b7c6055 100644 --- a/idl/source/objects/module.cxx +++ b/idl/source/objects/module.cxx @@ -154,7 +154,7 @@ void SvMetaModule::ReadContextSvIdl( SvIdlDataBase & rBase, if( xSlot->Test( rBase, rInStm ) ) { // announce globally - rBase.AppendAttr( xSlot ); + rBase.AppendSlot( xSlot ); } } } diff --git a/idl/source/objects/slot.cxx b/idl/source/objects/slot.cxx index 06b06955c1d8..4717f5d6d60d 100644 --- a/idl/source/objects/slot.cxx +++ b/idl/source/objects/slot.cxx @@ -502,9 +502,9 @@ void SvMetaSlot::Insert( SvSlotElementList& rList, const OString& rPrefix, OString aSId = aBuf.makeStringAndClear(); xEnumSlot = nullptr; - for( m=0; m<rBase.GetAttrList().size(); m++ ) + for( m=0; m<rBase.GetSlotList().size(); m++ ) { - SvMetaAttribute * pAttr = rBase.GetAttrList()[m]; + SvMetaSlot * pAttr = rBase.GetSlotList()[m]; if (aSId.equals(pAttr->GetSlotId().getString())) { SvMetaSlot& rSlot = dynamic_cast<SvMetaSlot&>(*pAttr); @@ -513,7 +513,7 @@ void SvMetaSlot::Insert( SvSlotElementList& rList, const OString& rPrefix, } } - if ( m == rBase.GetAttrList().size() ) + if ( m == rBase.GetSlotList().size() ) { OSL_FAIL("Invalid EnumSlot!"); xEnumSlot = Clone(); diff --git a/idl/source/prj/database.cxx b/idl/source/prj/database.cxx index 52f375118463..865ad4778250 100644 --- a/idl/source/prj/database.cxx +++ b/idl/source/prj/database.cxx @@ -332,11 +332,11 @@ SvMetaAttribute * SvIdlDataBase::ReadKnownAttr sal_uLong n; if( FindId( pTok->GetString(), &n ) ) { - for( sal_uLong i = 0; i < aAttrList.size(); i++ ) + for( sal_uLong i = 0; i < aSlotList.size(); i++ ) { - SvMetaAttribute * pAttr = aAttrList[i]; - if( pAttr->GetSlotId().getString().equals(pTok->GetString()) ) - return pAttr; + SvMetaSlot * pSlot = aSlotList[i]; + if( pSlot->GetSlotId().getString().equals(pTok->GetString()) ) + return pSlot; } } @@ -358,11 +358,11 @@ SvMetaAttribute* SvIdlDataBase::SearchKnownAttr sal_uLong n; if( FindId( rId.getString(), &n ) ) { - for( sal_uLong i = 0; i < aAttrList.size(); i++ ) + for( sal_uLong i = 0; i < aSlotList.size(); i++ ) { - SvMetaAttribute * pAttr = aAttrList[i]; - if( pAttr->GetSlotId().getString() == rId.getString() ) - return pAttr; + SvMetaSlot * pSlot = aSlotList[i]; + if( pSlot->GetSlotId().getString() == rId.getString() ) + return pSlot; } } @@ -572,9 +572,9 @@ void SvIdlDataBase::StartNewFile( const OUString& rName ) assert ( !bExport ); } -void SvIdlDataBase::AppendAttr( SvMetaAttribute *pAttr ) +void SvIdlDataBase::AppendSlot( SvMetaSlot *pSlot ) { - aAttrList.push_back( pAttr ); + aSlotList.push_back( pSlot ); assert ( !bExport ); } |