[Libreoffice-commits] core.git: Branch 'libreoffice-4-0' - basic/source

[Caolán McNamara]

 basic/source/runtime/step2.cxx |   14 +++++++-------
 1 file changed, 7 insertions(+), 7 deletions(-)

New commits:
commit ddeec4b3a77806bb7993662887bf6cf3ad95891c
Author: Caolán McNamara <caolanm at redhat.com>
Date:   Fri Mar 15 20:49:11 2013 +0000

    WaE: Werror=shadow
    
    Change-Id: I7f1bddbed85076f1c909d0d9f4ecdd1cda6f1880
    (cherry picked from commit 4158ae52fb4a0d1141637593c47aed3bb5378e7e)
    Reviewed-on: https://gerrit.libreoffice.org/2861
    Reviewed-by: Eike Rathke <erack at redhat.com>
    Tested-by: Eike Rathke <erack at redhat.com>

diff --git a/basic/source/runtime/step2.cxx b/basic/source/runtime/step2.cxx
index cc2fff5..464a6d9 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;
                                     }
                                 }