diff options
| author | Stephan Bergmann <sbergman@redhat.com> | 2015-04-01 08:35:33 +0200 |
|---|---|---|
| committer | Stephan Bergmann <sbergman@redhat.com> | 2015-04-01 08:35:33 +0200 |
| commit | fb088cdd8d6aed2f82b13b03d8ddb6f7901c5ef2 (patch) | |
| tree | a1be19894c8574a84cd9da75648cc971fe4d2b42 /bridges/source/cpp_uno/msvc_win32_intel | |
| parent | 4f2a236da4cb21b353baee2498a87bd08a1bfac5 (diff) | |
Replace remaining getCppuType et al with cppu::UnoType
Change-Id: I37d1a939c1a98f77152ed90dfb201446101f3157
Diffstat (limited to 'bridges/source/cpp_uno/msvc_win32_intel')
| -rw-r--r-- | bridges/source/cpp_uno/msvc_win32_intel/except.cxx | 4 | ||||
| -rw-r--r-- | bridges/source/cpp_uno/msvc_win32_intel/uno2cpp.cxx | 2 |
2 files changed, 3 insertions, 3 deletions
diff --git a/bridges/source/cpp_uno/msvc_win32_intel/except.cxx b/bridges/source/cpp_uno/msvc_win32_intel/except.cxx index 6c4596e016c2..bcf95af9bc64 100644 --- a/bridges/source/cpp_uno/msvc_win32_intel/except.cxx +++ b/bridges/source/cpp_uno/msvc_win32_intel/except.cxx @@ -536,7 +536,7 @@ int msci_filterCppException( RuntimeException exc( buf.makeStringAndClear() ); uno_type_any_constructAndConvert( pUnoExc, &exc, - ::getCppuType( &exc ).getTypeLibType(), pCpp2Uno ); + cppu::UnoType<decltype(exc)>::get().getTypeLibType(), pCpp2Uno ); // msvcr80.dll cleans up, different from former msvcrs // if (! rethrow): // though this unknown exception leaks now, no user-defined @@ -561,7 +561,7 @@ int msci_filterCppException( RuntimeException exc( "[msci_uno bridge error] unexpected " "C++ exception occurred!" ); uno_type_any_constructAndConvert( - pUnoExc, &exc, ::getCppuType( &exc ).getTypeLibType(), pCpp2Uno ); + pUnoExc, &exc, cppu::UnoType<decltype(exc)>::get().getTypeLibType(), pCpp2Uno ); return EXCEPTION_EXECUTE_HANDLER; } diff --git a/bridges/source/cpp_uno/msvc_win32_intel/uno2cpp.cxx b/bridges/source/cpp_uno/msvc_win32_intel/uno2cpp.cxx index 53730f210fab..f1007dd55aec 100644 --- a/bridges/source/cpp_uno/msvc_win32_intel/uno2cpp.cxx +++ b/bridges/source/cpp_uno/msvc_win32_intel/uno2cpp.cxx @@ -442,7 +442,7 @@ void unoInterfaceProxyDispatch( OUString("illegal member type description!"), ::com::sun::star::uno::Reference< ::com::sun::star::uno::XInterface >() ); - Type const & rExcType = ::getCppuType( &aExc ); + Type const & rExcType = cppu::UnoType<decltype(aExc)>::get(); // binary identical null reference ::uno_type_any_construct( *ppException, &aExc, rExcType.getTypeLibType(), 0 ); } |