diff options
author | Noel Grandin <noel@peralex.com> | 2014-05-23 12:03:21 +0200 |
---|---|---|
committer | Noel Grandin <noel@peralex.com> | 2014-05-23 15:06:00 +0200 |
commit | e7bc3cab019fbf040f9fb8b53ae2cf3f977d200b (patch) | |
tree | bc507bccee9fb71134e362b72d22991561e32aa0 /bridges/source/cpp_uno/msvc_win32_x86-64 | |
parent | c5d47c327a57df55fa3dac0fff6b65888d0345e4 (diff) |
remove boilerplate in UNO Exception constructor calls
Now that we have default values for Exception constructor params,
remove lots of boilerplate code.
Change-Id: I620bd641eecfed38e6123873b3b94aaf47922e74
Diffstat (limited to 'bridges/source/cpp_uno/msvc_win32_x86-64')
-rw-r--r-- | bridges/source/cpp_uno/msvc_win32_x86-64/except.cxx | 9 | ||||
-rw-r--r-- | bridges/source/cpp_uno/msvc_win32_x86-64/uno2cpp.cxx | 8 |
2 files changed, 5 insertions, 12 deletions
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 26688aa29d96..b449a28e20ee 100644 --- a/bridges/source/cpp_uno/msvc_win32_x86-64/except.cxx +++ b/bridges/source/cpp_uno/msvc_win32_x86-64/except.cxx @@ -783,8 +783,7 @@ int mscx_filterCppException( buf.append( "\", RTTI-name=\"" ); buf.append( aRTTIname ); buf.append( "\"!" ); - RuntimeException exc( - buf.makeStringAndClear(), Reference< XInterface >() ); + RuntimeException exc( buf.makeStringAndClear() ); uno_type_any_constructAndConvert( pUnoExc, &exc, ::getCppuType( &exc ).getTypeLibType(), pCpp2Uno ); @@ -804,10 +803,8 @@ int mscx_filterCppException( } // though this unknown exception leaks now, no user-defined exception // is ever thrown thru the binary C-UNO dispatcher call stack. - RuntimeException exc( - OUString( "[mscx_uno bridge error] unexpected " - "C++ exception occurred!" ), - Reference< XInterface >() ); + RuntimeException exc( "[mscx_uno bridge error] unexpected " + "C++ exception occurred!" ); uno_type_any_constructAndConvert( pUnoExc, &exc, ::getCppuType( &exc ).getTypeLibType(), pCpp2Uno ); return EXCEPTION_EXECUTE_HANDLER; diff --git a/bridges/source/cpp_uno/msvc_win32_x86-64/uno2cpp.cxx b/bridges/source/cpp_uno/msvc_win32_x86-64/uno2cpp.cxx index 67f2a0df99ce..7acf4505c489 100644 --- a/bridges/source/cpp_uno/msvc_win32_x86-64/uno2cpp.cxx +++ b/bridges/source/cpp_uno/msvc_win32_x86-64/uno2cpp.cxx @@ -411,9 +411,7 @@ void unoInterfaceProxyDispatch( ((typelib_InterfaceMethodTypeDescription *)pMemberTD)->pParams, pReturn, pArgs, ppException ) ) { - RuntimeException aExc( - OUString("Too many parameters!"), - Reference< XInterface >() ); + RuntimeException aExc( "Too many parameters!" ); Type const & rExcType = ::getCppuType( &aExc ); ::uno_type_any_construct( *ppException, &aExc, rExcType.getTypeLibType(), 0 ); @@ -423,9 +421,7 @@ void unoInterfaceProxyDispatch( } default: { - RuntimeException aExc( - OUString("Illegal member type description!"), - Reference< XInterface >() ); + RuntimeException aExc( "Illegal member type description!" ); Type const & rExcType = ::getCppuType( &aExc ); // Binary identical null reference (whatever that comment means...) |