summaryrefslogtreecommitdiff
path: root/idl/source
diff options
context:
space:
mode:
authorNoel Grandin <noel@peralex.com>2016-02-09 09:37:20 +0200
committerNoel Grandin <noel@peralex.com>2016-02-09 09:43:53 +0200
commit3c14d8fd4c0ca3fb034a137436d0b0e584e2ab2e (patch)
tree77aff62c0c6ea5157651c3a828a1824b44cbe1f9 /idl/source
parentcfa4ba4b2b7138f7b95fb725866ed37155ccceee (diff)
rename aAttrList to aSlotList
since that is a more accurate reflection of it's use Change-Id: Ic5933e5cdeefac7363975a5767be3ee5db99bd56
Diffstat (limited to 'idl/source')
-rw-r--r--idl/source/objects/module.cxx2
-rw-r--r--idl/source/objects/slot.cxx6
-rw-r--r--idl/source/prj/database.cxx20
3 files changed, 14 insertions, 14 deletions
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 );
}