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

Michael Stahl mstahl at redhat.com
Tue Mar 31 11:50:24 PDT 2015


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

New commits:
commit 9f2e07aadbf721488aadf19b4891829b7ebedb97
Author: Michael Stahl <mstahl at redhat.com>
Date:   Tue Mar 31 20:43:58 2015 +0200

    bridges: acquire is not a member of rtl::OUString
    
    Change-Id: Ie95f74966ff951b2b3161efeb073f0648c09ff3b

diff --git a/bridges/source/cpp_uno/msvc_win32_intel/except.cxx b/bridges/source/cpp_uno/msvc_win32_intel/except.cxx
index 8c24c0d..6c4596e 100644
--- a/bridges/source/cpp_uno/msvc_win32_intel/except.cxx
+++ b/bridges/source/cpp_uno/msvc_win32_intel/except.cxx
@@ -396,7 +396,7 @@ void * ExceptionInfos::getRaiseInfo( typelib_TypeDescription * pTypeDescr ) thro
 
     void * pRaiseInfo;
 
-    OUString const & rTypeName = OUString::acquire( &pTypeDescr->pTypeName );
+    OUString const & rTypeName = OUString::unacquired( &pTypeDescr->pTypeName );
     MutexGuard aGuard( s_pInfos->_aMutex );
     t_string2PtrMap::const_iterator const iFind(
         s_pInfos->_allRaiseInfos.find( rTypeName ) );
diff --git a/bridges/source/cpp_uno/msvc_win32_x86-64/except.cxx b/bridges/source/cpp_uno/msvc_win32_x86-64/except.cxx
index 6c23788..a11e9c92 100644
--- a/bridges/source/cpp_uno/msvc_win32_x86-64/except.cxx
+++ b/bridges/source/cpp_uno/msvc_win32_x86-64/except.cxx
@@ -755,7 +755,7 @@ RaiseInfo * ExceptionInfos::getRaiseInfo( typelib_TypeDescription * pTD ) throw
 
     RaiseInfo * pRaiseInfo;
 
-    OUString const & rTypeName = OUString::acquire( &pTD->pTypeName );
+    OUString const & rTypeName = OUString::unacquired( &pTD->pTypeName );
     MutexGuard aGuard( s_pInfos->_aMutex );
     t_string2PtrMap::const_iterator const iFind(
         s_pInfos->_allRaiseInfos.find( rTypeName ) );


More information about the Libreoffice-commits mailing list