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/gcc3_linux_sparc | |
parent | 4f2a236da4cb21b353baee2498a87bd08a1bfac5 (diff) |
Replace remaining getCppuType et al with cppu::UnoType
Change-Id: I37d1a939c1a98f77152ed90dfb201446101f3157
Diffstat (limited to 'bridges/source/cpp_uno/gcc3_linux_sparc')
-rw-r--r-- | bridges/source/cpp_uno/gcc3_linux_sparc/except.cxx | 4 | ||||
-rw-r--r-- | bridges/source/cpp_uno/gcc3_linux_sparc/uno2cpp.cxx | 2 |
2 files changed, 3 insertions, 3 deletions
diff --git a/bridges/source/cpp_uno/gcc3_linux_sparc/except.cxx b/bridges/source/cpp_uno/gcc3_linux_sparc/except.cxx index 5d3233e23f6e..720e4d617afb 100644 --- a/bridges/source/cpp_uno/gcc3_linux_sparc/except.cxx +++ b/bridges/source/cpp_uno/gcc3_linux_sparc/except.cxx @@ -268,7 +268,7 @@ void fillUnoException( __cxa_exception * header, uno_Any * pUnoExc, uno_Mapping if (! header) { RuntimeException aRE( "no exception header!" ); - Type const & rType = ::getCppuType( &aRE ); + Type const & rType = cppu::UnoType<decltype(aRE)>::get(); uno_type_any_constructAndConvert( pUnoExc, &aRE, rType.getTypeLibType(), pCpp2Uno ); SAL_WARN("bridges", aRE.Message); return; @@ -284,7 +284,7 @@ void fillUnoException( __cxa_exception * header, uno_Any * pUnoExc, uno_Mapping if (0 == pExcTypeDescr) { RuntimeException aRE( OUString("exception type not found: ") + unoName ); - Type const & rType = ::getCppuType( &aRE ); + Type const & rType = cppu::UnoType<decltype(aRE)>::get(); uno_type_any_constructAndConvert( pUnoExc, &aRE, rType.getTypeLibType(), pCpp2Uno ); SAL_WARN("bridges", aRE.Message); } diff --git a/bridges/source/cpp_uno/gcc3_linux_sparc/uno2cpp.cxx b/bridges/source/cpp_uno/gcc3_linux_sparc/uno2cpp.cxx index f3e47965e6fd..5f105abdd0cd 100644 --- a/bridges/source/cpp_uno/gcc3_linux_sparc/uno2cpp.cxx +++ b/bridges/source/cpp_uno/gcc3_linux_sparc/uno2cpp.cxx @@ -580,7 +580,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 ); } |