From a78102d342a591e9f6103ce6479c1dcaade92c0c Mon Sep 17 00:00:00 2001
From: David Tardon <dtardon@redhat.com>
Date: Wed, 7 Mar 2012 18:24:05 +0100
Subject: WaE: declaration of 'hr' shadows a previous local

---
 embedserv/source/inprocserv/inprocembobj.cxx | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

(limited to 'embedserv')

diff --git a/embedserv/source/inprocserv/inprocembobj.cxx b/embedserv/source/inprocserv/inprocembobj.cxx
index a8b69fc3944e..3fbcbf689ff8 100644
--- a/embedserv/source/inprocserv/inprocembobj.cxx
+++ b/embedserv/source/inprocserv/inprocembobj.cxx
@@ -717,8 +717,8 @@ STDMETHODIMP InprocEmbedDocument_Impl::SetClientSite( IOleClientSite* pSite )
         ULONGGuard aGuard( &m_nCallsOnStack ); // avoid reentrance problem
         if ( SUCCEEDED( hr ) && pOleObject )
         {
-            HRESULT hr = pOleObject->SetClientSite( pSite );
-            if ( SUCCEEDED( hr ) )
+            HRESULT hr2 = pOleObject->SetClientSite( pSite );
+            if ( SUCCEEDED( hr2 ) )
             {
                 m_pClientSite = pSite;
 
@@ -733,7 +733,7 @@ STDMETHODIMP InprocEmbedDocument_Impl::SetClientSite( IOleClientSite* pSite )
                     m_pOleContainer->LockContainer( TRUE );
             }
 
-            return hr;
+            return hr2;
         }
     }
 
-- 
cgit