diff options
| author | Caolán McNamara <caolanm@redhat.com> | 2013-03-15 20:49:11 +0000 |
|---|---|---|
| committer | Eike Rathke <erack@redhat.com> | 2013-03-19 23:23:15 +0000 |
| commit | ddeec4b3a77806bb7993662887bf6cf3ad95891c (patch) | |
| tree | 23d4d1fd113897708b847f67c2af1f8722df15e2 /basic | |
| parent | 2c8202b611dcaab72c0ead20339ce4daacca0810 (diff) | |
WaE: Werror=shadow
Change-Id: I7f1bddbed85076f1c909d0d9f4ecdd1cda6f1880
(cherry picked from commit 4158ae52fb4a0d1141637593c47aed3bb5378e7e)
Reviewed-on: https://gerrit.libreoffice.org/2861
Reviewed-by: Eike Rathke <erack@redhat.com>
Tested-by: Eike Rathke <erack@redhat.com>
Diffstat (limited to 'basic')
| -rw-r--r-- | basic/source/runtime/step2.cxx | 14 |
1 files changed, 7 insertions, 7 deletions
diff --git a/basic/source/runtime/step2.cxx b/basic/source/runtime/step2.cxx index cc2fff502b01..464a6d950e60 100644 --- a/basic/source/runtime/step2.cxx +++ b/basic/source/runtime/step2.cxx @@ -617,16 +617,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; } } |