diff options
| author | David Tardon <dtardon@redhat.com> | 2012-03-07 18:24:05 +0100 |
|---|---|---|
| committer | David Tardon <dtardon@redhat.com> | 2012-03-12 08:53:19 +0100 |
| commit | a78102d342a591e9f6103ce6479c1dcaade92c0c (patch) | |
| tree | 0d3cf245416950ffb704744061621e93d8e7faf3 /embedserv | |
| parent | 7419e0e00cfc2589d1fe171c73b4de7c8c6d7065 (diff) | |
WaE: declaration of 'hr' shadows a previous local
Diffstat (limited to 'embedserv')
| -rw-r--r-- | embedserv/source/inprocserv/inprocembobj.cxx | 6 |
1 files changed, 3 insertions, 3 deletions
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; } } |