mir/libreoffice
2
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

WaE: declaration of 'hr' shadows a previous local

Browse Source
This commit is contained in:
David Tardon 2012-03-07 18:24:05 +01:00
parent 7419e0e00c
commit a78102d342
1 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
embedserv/source/inprocserv/inprocembobj.cxx
View File

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