[Libreoffice-commits] core.git: Branch 'feature/cib_contract57' - bridges/source

[Samuel Mehrbrodt]

 bridges/source/cpp_uno/msvc_win32_intel/cpp2uno.cxx  |    4 ++--
 bridges/source/cpp_uno/msvc_win32_x86-64/cpp2uno.cxx |    4 ++--
 2 files changed, 4 insertions(+), 4 deletions(-)

New commits:
commit 3208a9f9bb7b14bb627c3f493cff66e9a5a0d0fb
Author: Samuel Mehrbrodt <samuel.mehrbr...@cib.de>
Date:   Fri Jan 13 16:46:34 2017 +0100

    bridges: Log function names, not string pointers
    
    Change-Id: I5177dd4fbc8f1b638ceff14c5d88d19fff8076a3

diff --git a/bridges/source/cpp_uno/msvc_win32_intel/cpp2uno.cxx 
b/bridges/source/cpp_uno/msvc_win32_intel/cpp2uno.cxx
index e2f5976..930657f 100644
--- a/bridges/source/cpp_uno/msvc_win32_intel/cpp2uno.cxx
+++ b/bridges/source/cpp_uno/msvc_win32_intel/cpp2uno.cxx
@@ -246,7 +246,7 @@ static typelib_TypeClass __cdecl cpp_mediate(
             std::hex << pCallStack[0] << "," << pCallStack[1] << "," << 
pCallStack[2] << ",...]" <<
             ", pThis=" << pThis << ", pCppI=" << pCppI <<
             std::dec << ", nFunctionIndex=" << nFunctionIndex << ", 
nVtableOffset=" << nVtableOffset );
-    SAL_INFO( "bridges.win32", "name=" << pTypeDescr->aBase.pTypeName );
+    SAL_INFO( "bridges.win32", "name=" << 
OUString::unacquired(&pTypeDescr->aBase.pTypeName) );
 
     if (nFunctionIndex >= pTypeDescr->nMapFunctionIndexToMemberIndex)
     {
@@ -268,7 +268,7 @@ static typelib_TypeClass __cdecl cpp_mediate(
 
     TypeDescription aMemberDescr( pTypeDescr->ppAllMembers[nMemberPos] );
 
-    SAL_INFO( "bridges.win32", "Calling " << aMemberDescr.get()->pTypeName );
+    SAL_INFO( "bridges.win32", "Calling " << 
OUString::unacquired(&aMemberDescr.get()->pTypeName) );
 
     typelib_TypeClass eRet = typelib_TypeClass_VOID;
     switch (aMemberDescr.get()->eTypeClass)
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 14776e7..15c0551 100644
--- a/bridges/source/cpp_uno/msvc_win32_x86-64/cpp2uno.cxx
+++ b/bridges/source/cpp_uno/msvc_win32_x86-64/cpp2uno.cxx
@@ -244,7 +244,7 @@ extern "C" typelib_TypeClass cpp_vtable_call(
             std::hex << pStack[0] << "," << pStack[1] << "," << pStack[2] << 
",...]" <<
             ", pThis=" << pThis << ", pCppI=" << pCppI <<
             std::dec << ", nFunctionIndex=" << nFunctionIndex << ", 
nVtableOffset=" << nVtableOffset );
-    SAL_INFO( "bridges.win64", "name=" << pTD->aBase.pTypeName );
+    SAL_INFO( "bridges.win64", "name=" << 
OUString::unacquired(&pTD->aBase.pTypeName) );
 
     if ( nFunctionIndex >= pTD->nMapFunctionIndexToMemberIndex )
     {
@@ -266,7 +266,7 @@ extern "C" typelib_TypeClass cpp_vtable_call(
 
     TypeDescription aMemberDescr( pTD->ppAllMembers[nMemberPos] );
 
-    SAL_INFO( "bridges.win64", "Calling " << aMemberDescr.get()->pTypeName );
+    SAL_INFO( "bridges.win64", "Calling " << 
OUString::unacquired(&aMemberDescr.get()->pTypeName) );
 
     typelib_TypeClass eRet;
     switch ( aMemberDescr.get()->eTypeClass )
_______________________________________________
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits