[PATCH libreoffice-4-0] WaE: Werror=shadow

[Eike Rathke (via Code Review)]

Hi,

I have submitted a patch for review:

    https://gerrit.libreoffice.org/2861

To pull it, you can do:

    git pull ssh://gerrit.libreoffice.org:29418/core refs/changes/61/2861/1

WaE: Werror=shadow

Change-Id: I7f1bddbed85076f1c909d0d9f4ecdd1cda6f1880
(cherry picked from commit 4158ae52fb4a0d1141637593c47aed3bb5378e7e)
---
M basic/source/runtime/step2.cxx
1 file changed, 7 insertions(+), 7 deletions(-)



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 @@
                             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;
                                     }
                                 }

-- 
To view, visit https://gerrit.libreoffice.org/2861
To unsubscribe, visit https://gerrit.libreoffice.org/settings

Gerrit-MessageType: newchange
Gerrit-Change-Id: I7f1bddbed85076f1c909d0d9f4ecdd1cda6f1880
Gerrit-PatchSet: 1
Gerrit-Project: core
Gerrit-Branch: libreoffice-4-0
Gerrit-Owner: Eike Rathke <erack at redhat.com>
Gerrit-Reviewer: Caolán McNamara <caolanm at redhat.com>