[Libreoffice-commits] core.git: bridges/source

[Norbert Thiebaud]

 bridges/source/cpp_uno/msvc_win32_x86-64/cpp2uno.cxx |   14 +++++++-------
 1 file changed, 7 insertions(+), 7 deletions(-)

New commits:
commit 8d17a0f71b1fe6d90fe4ef5decd83f1285e2cb13
Author: Norbert Thiebaud <nthieb...@gmail.com>
Date:   Sun Feb 21 08:13:30 2016 -0800

    WaE: vs2015 shadow local
    
    Change-Id: Ia1cb87653775bf9226bac46842b309d55fbaf084
    Reviewed-on: https://gerrit.libreoffice.org/22598
    Reviewed-by: David Ostrovsky <da...@ostrovsky.org>
    Tested-by: Jenkins <c...@libreoffice.org>

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 7459dff..a37b391 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:
_______________________________________________
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits