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

WaE: vs2015 shadow local

Browse Source 
Change-Id: Ia1cb87653775bf9226bac46842b309d55fbaf084
Reviewed-on: https://gerrit.libreoffice.org/22598
Reviewed-by: David Ostrovsky <david@ostrovsky.org>
Tested-by: Jenkins <ci@libreoffice.org>
This commit is contained in:
Norbert Thiebaud
2016-02-21 08:13:30 -08:00
parent 6d5eeb6af5
commit 8d17a0f71b
1 changed files with 7 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
bridges/source/cpp_uno/msvc_win32_x86-64/cpp2uno.cxx
View File

@@ -305,38 +305,38 @@ extern "C" typelib_TypeClass cpp_vtable_call(
break; break;
case 0: // queryInterface() opt case 0: // queryInterface() opt
{ {
typelib_TypeDescription * pTD = NULL; typelib_TypeDescription * pTD2 = NULL;
// the incoming C++ parameters are: The this // the incoming C++ parameters are: The this
// pointer, the hidden return value pointer, and // pointer, the hidden return value pointer, and
// then the actual queryInterface() only // then the actual queryInterface() only
// parameter. Thus pStack[4].. // parameter. Thus pStack[4]..
TYPELIB_DANGER_GET( &pTD, reinterpret_cast<Type *>( pStack[4] )->getTypeLibType() ); TYPELIB_DANGER_GET( &pTD2, reinterpret_cast<Type *>( pStack[4] )->getTypeLibType() );
if ( pTD ) if ( pTD2 )
{ {
XInterface * pInterface = NULL; XInterface * pInterface = NULL;
(*pCppI->getBridge()->getCppEnv()->getRegisteredInterface) (*pCppI->getBridge()->getCppEnv()->getRegisteredInterface)
( pCppI->getBridge()->getCppEnv(), ( pCppI->getBridge()->getCppEnv(),
(void **)&pInterface, (void **)&pInterface,
pCppI->getOid().pData, pCppI->getOid().pData,
reinterpret_cast<typelib_InterfaceTypeDescription *>( pTD ) ); reinterpret_cast<typelib_InterfaceTypeDescription *>( pTD2 ) );
if ( pInterface ) if ( pInterface )
{ {
// pStack[3] = hidden return value pointer // pStack[3] = hidden return value pointer
::uno_any_construct( reinterpret_cast<uno_Any *>( pStack[3] ), ::uno_any_construct( reinterpret_cast<uno_Any *>( pStack[3] ),
&pInterface, pTD, cpp_acquire ); &pInterface, pTD2, cpp_acquire );
pInterface->release(); pInterface->release();
TYPELIB_DANGER_RELEASE( pTD ); TYPELIB_DANGER_RELEASE( pTD2 );
pStack[0] = pStack[3]; pStack[0] = pStack[3];
eRet = typelib_TypeClass_ANY; eRet = typelib_TypeClass_ANY;
break; break;
} }
TYPELIB_DANGER_RELEASE( pTD ); TYPELIB_DANGER_RELEASE( pTD2 );
} }
} // Fall through! } // Fall through!
default: default: