summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorCaolán McNamara <caolanm@redhat.com>2013-03-15 20:49:11 +0000
committerNoel Power <noel.power@suse.com>2013-03-19 12:30:18 +0000
commitd203bd8ec95788e96a5a00719252339a0c147b31 (patch)
tree30f5c54e80ae7c88bdd6673cb14edb98f8ace03e
parent7263af3eee67b25a01ef4154e69eba728a2db190 (diff)
WaE: Werror=shadow
Change-Id: I7f1bddbed85076f1c909d0d9f4ecdd1cda6f1880
-rw-r--r--basic/source/runtime/step2.cxx14
1 files changed, 7 insertions, 7 deletions
diff --git a/basic/source/runtime/step2.cxx b/basic/source/runtime/step2.cxx
index 0edc546ed967..d5d34fcc87c7 100644
--- a/basic/source/runtime/step2.cxx
+++ b/basic/source/runtime/step2.cxx
@@ -573,16 +573,16 @@ SbxVariable* SbiRuntime::CheckArray( SbxVariable* pElem )
if ( pDflt )
{
pDflt->Broadcast( SBX_HINT_DATAWANTED );
- SbxBaseRef pObj = (SbxBase*)pDflt->GetObject();
- if( pObj )
+ SbxBaseRef pDfltObj = (SbxBase*)pDflt->GetObject();
+ if( pDfltObj )
{
- if( pObj->ISA(SbUnoObject) )
+ if( pDfltObj->ISA(SbUnoObject) )
{
- pUnoObj = (SbUnoObject*)(SbxBase*)pObj;
- Any aAny = pUnoObj->getUnoAny();
+ pUnoObj = (SbUnoObject*)(SbxBase*)pDfltObj;
+ Any aUnoAny = pUnoObj->getUnoAny();
- if( aAny.getValueType().getTypeClass() == TypeClass_INTERFACE )
- x = *(Reference< XInterface >*)aAny.getValue();
+ if( aUnoAny.getValueType().getTypeClass() == TypeClass_INTERFACE )
+ x = *(Reference< XInterface >*)aUnoAny.getValue();
pElem = pDflt;
}
}