diff options
| author | Chr. Rossmanith <ChrRossmanith@gmx.de> | 2013-03-31 20:41:33 +0200 |
|---|---|---|
| committer | Christina Roßmanith <ChrRossmanith@web.de> | 2013-04-02 20:25:44 +0000 |
| commit | 7dac241ca0dd0e8c53c246d8490e954d5b594862 (patch) | |
| tree | 9a5e51a4dc4863d7db12ca48e4c52a97a02c2033 /bridges/source/cpp_uno/msvc_win32_x86-64 | |
| parent | 43d426aca1f5ef699db9efe8e370677be85165e5 (diff) | |
Remove RTL_CONSTASCII_(U)STRINGPARAM in bridges
Change-Id: Id8777ee7f587846399e95cf3b1b37d669a76bae5
Reviewed-on: https://gerrit.libreoffice.org/3139
Reviewed-by: Christina Roßmanith <ChrRossmanith@web.de>
Tested-by: Christina Roßmanith <ChrRossmanith@web.de>
Diffstat (limited to 'bridges/source/cpp_uno/msvc_win32_x86-64')
| -rw-r--r-- | bridges/source/cpp_uno/msvc_win32_x86-64/except.cxx | 17 |
1 files changed, 7 insertions, 10 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 5f47dc52d252..fa3f3ae8824b 100644 --- a/bridges/source/cpp_uno/msvc_win32_x86-64/except.cxx +++ b/bridges/source/cpp_uno/msvc_win32_x86-64/except.cxx @@ -285,7 +285,7 @@ static inline OUString toRTTIname( throw () { OUStringBuffer aRet( 64 ); - aRet.appendAscii( RTL_CONSTASCII_STRINGPARAM(".?AV") ); // class ".?AV"; struct ".?AU" + aRet.append( ".?AV" ); // class ".?AV"; struct ".?AU" sal_Int32 nPos = rUNOname.getLength(); while (nPos > 0) { @@ -776,15 +776,13 @@ int mscx_filterCppException( if (pExcTD == NULL) { OUStringBuffer buf; - buf.appendAscii( - RTL_CONSTASCII_STRINGPARAM( + buf.append( "[mscx_uno bridge error] UNO type of " - "C++ exception unknown: \"") ); + "C++ exception unknown: \"" ); buf.append( aUNOname ); - buf.appendAscii( RTL_CONSTASCII_STRINGPARAM( - "\", RTTI-name=\"") ); + buf.append( "\", RTTI-name=\"" ); buf.append( aRTTIname ); - buf.appendAscii( RTL_CONSTASCII_STRINGPARAM("\"!") ); + buf.append( "\"!" ); RuntimeException exc( buf.makeStringAndClear(), Reference< XInterface >() ); uno_type_any_constructAndConvert( @@ -807,9 +805,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( RTL_CONSTASCII_USTRINGPARAM( - "[mscx_uno bridge error] unexpected " - "C++ exception occurred!") ), + OUString( "[mscx_uno bridge error] unexpected " + "C++ exception occurred!" ), Reference< XInterface >() ); uno_type_any_constructAndConvert( pUnoExc, &exc, ::getCppuType( &exc ).getTypeLibType(), pCpp2Uno ); |