diff options
| author | Norbert Thiebaud <nthiebaud@gmail.com> | 2016-02-21 08:13:30 -0800 |
|---|---|---|
| committer | Michael Stahl <mstahl@redhat.com> | 2016-02-22 17:22:14 +0100 |
| commit | 9da978b5a6f10b8a2bdb16ebe08ae015494734c3 (patch) | |
| tree | 26f1bce64294202162dad03058d178c0bd5b16d8 /bridges | |
| parent | b697180db477a3d2fcefa39f39b8ea6e71ace0b5 (diff) | |
WaE: vs2015 shadow local
Change-Id: Ia1cb87653775bf9226bac46842b309d55fbaf084
Reviewed-on: https://gerrit.libreoffice.org/22598
Reviewed-by: David Ostrovsky <david@ostrovsky.org>
Tested-by: Jenkins <ci@libreoffice.org>
(cherry picked from commit 8d17a0f71b1fe6d90fe4ef5decd83f1285e2cb13)
Signed-off-by: Michael Stahl <mstahl@redhat.com>
Diffstat (limited to 'bridges')
| -rw-r--r-- | bridges/source/cpp_uno/msvc_win32_x86-64/cpp2uno.cxx | 14 |
1 files changed, 7 insertions, 7 deletions
diff --git a/bridges/source/cpp_uno/msvc_win32_x86-64/cpp2uno.cxx b/bridges/source/cpp_uno/msvc_win32_x86-64/cpp2uno.cxx index 7459dff852f7..a37b391168d2 100644 --- a/bridges/source/cpp_uno/msvc_win32_x86-64/cpp2uno.cxx +++ b/bridges/source/cpp_uno/msvc_win32_x86-64/cpp2uno.cxx @@ -305,38 +305,38 @@ extern "C" typelib_TypeClass cpp_vtable_call( break; case 0: // queryInterface() opt { - typelib_TypeDescription * pTD = NULL; + typelib_TypeDescription * pTD2 = NULL; // the incoming C++ parameters are: The this // pointer, the hidden return value pointer, and // then the actual queryInterface() only // 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; (*pCppI->getBridge()->getCppEnv()->getRegisteredInterface) ( pCppI->getBridge()->getCppEnv(), (void **)&pInterface, pCppI->getOid().pData, - reinterpret_cast<typelib_InterfaceTypeDescription *>( pTD ) ); + reinterpret_cast<typelib_InterfaceTypeDescription *>( pTD2 ) ); if ( pInterface ) { // pStack[3] = hidden return value pointer ::uno_any_construct( reinterpret_cast<uno_Any *>( pStack[3] ), - &pInterface, pTD, cpp_acquire ); + &pInterface, pTD2, cpp_acquire ); pInterface->release(); - TYPELIB_DANGER_RELEASE( pTD ); + TYPELIB_DANGER_RELEASE( pTD2 ); pStack[0] = pStack[3]; eRet = typelib_TypeClass_ANY; break; } - TYPELIB_DANGER_RELEASE( pTD ); + TYPELIB_DANGER_RELEASE( pTD2 ); } } // Fall through! default: |