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>

5 files changed, 71 insertions, 99 deletions

diff --git a/bridges/source/jni_uno/jni_data.cxx b/bridges/source/jni_uno/jni_data.cxx
index be63f0382462..b73866cbc76c 100644
--- a/bridges/source/jni_uno/jni_data.cxx
+++ b/bridges/source/jni_uno/jni_data.cxx
@@ -386,9 +386,9 @@ void Bridge::map_to_uno(
         if (0 == java_data.l)
         {
             OUStringBuffer buf( 128 );
-            buf.appendAscii( RTL_CONSTASCII_STRINGPARAM("[map_to_uno():") );
+            buf.append( "[map_to_uno():" );
             buf.append( OUString::unacquired( &type->pTypeName ) );
-            buf.appendAscii( RTL_CONSTASCII_STRINGPARAM("] null-ref given!") );
+            buf.append( "] null-ref given!" );
             buf.append( jni.get_stack_trace() );
             throw BridgeRuntimeError( buf.makeStringAndClear() );
         }
@@ -411,9 +411,9 @@ void Bridge::map_to_uno(
         if (0 == java_data.l)
         {
             OUStringBuffer buf( 128 );
-            buf.appendAscii( RTL_CONSTASCII_STRINGPARAM("[map_to_uno():") );
+            buf.append( "[map_to_uno():" );
             buf.append( OUString::unacquired( &type->pTypeName ) );
-            buf.appendAscii( RTL_CONSTASCII_STRINGPARAM("] null-ref given!") );
+            buf.append( "] null-ref given!" );
             buf.append( jni.get_stack_trace() );
             throw BridgeRuntimeError( buf.makeStringAndClear() );
         }
@@ -425,11 +425,10 @@ void Bridge::map_to_uno(
         if (! jo_type_name.is())
         {
             OUStringBuffer buf( 128 );
-            buf.appendAscii( RTL_CONSTASCII_STRINGPARAM("[map_to_uno():") );
+            buf.append( "[map_to_uno():" );
             buf.append( OUString::unacquired( &type->pTypeName ) );
-            buf.appendAscii(
-                RTL_CONSTASCII_STRINGPARAM("] incomplete type object: "
-                                           "no type name!") );
+            buf.append("] incomplete type object: "
+                       "no type name!" );
             buf.append( jni.get_stack_trace() );
             throw BridgeRuntimeError( buf.makeStringAndClear() );
         }
@@ -439,10 +438,9 @@ void Bridge::map_to_uno(
         if (! td.is())
         {
             OUStringBuffer buf( 128 );
-            buf.appendAscii( RTL_CONSTASCII_STRINGPARAM("[map_to_uno():") );
+            buf.append( "[map_to_uno():" );
             buf.append( OUString::unacquired( &type->pTypeName ) );
-            buf.appendAscii(
-                RTL_CONSTASCII_STRINGPARAM("] UNO type not found: ") );
+            buf.append( "] UNO type not found: " );
             buf.append( type_name );
             buf.append( jni.get_stack_trace() );
             throw BridgeRuntimeError( buf.makeStringAndClear() );
@@ -489,11 +487,9 @@ void Bridge::map_to_uno(
             if (! jo_type.is())
             {
                 OUStringBuffer buf( 128 );
-                buf.appendAscii( RTL_CONSTASCII_STRINGPARAM("[map_to_uno():") );
+                buf.append( "[map_to_uno():" );
                 buf.append( OUString::unacquired( &type->pTypeName ) );
-                buf.appendAscii(
-                    RTL_CONSTASCII_STRINGPARAM("] no type set at "
-                                               "com.sun.star.uno.Any!") );
+                buf.append( "] no type set at " "com.sun.star.uno.Any!" );
                 buf.append( jni.get_stack_trace() );
                 throw BridgeRuntimeError( buf.makeStringAndClear() );
             }
@@ -532,10 +528,9 @@ void Bridge::map_to_uno(
         if (! value_td.is())
         {
             OUStringBuffer buf( 128 );
-            buf.appendAscii( RTL_CONSTASCII_STRINGPARAM("[map_to_uno():") );
+            buf.append( "[map_to_uno():" );
             buf.append( OUString::unacquired( &type->pTypeName ) );
-            buf.appendAscii(
-                RTL_CONSTASCII_STRINGPARAM("] UNO type not found: ") );
+            buf.append( "] UNO type not found: " );
             buf.append( type_name );
             buf.append( jni.get_stack_trace() );
             throw BridgeRuntimeError( buf.makeStringAndClear() );
@@ -684,11 +679,9 @@ void Bridge::map_to_uno(
             default:
             {
                 OUStringBuffer buf( 128 );
-                buf.appendAscii( RTL_CONSTASCII_STRINGPARAM("[map_to_uno():") );
+                buf.append( "[map_to_uno():" );
                 buf.append( type_name );
-                buf.appendAscii(
-                    RTL_CONSTASCII_STRINGPARAM("] unsupported value type "
-                                               "of any!") );
+                buf.append( "] unsupported value type " "of any!" );
                 buf.append( jni.get_stack_trace() );
                 throw BridgeRuntimeError( buf.makeStringAndClear() );
             }
@@ -720,9 +713,9 @@ void Bridge::map_to_uno(
         if (0 == java_data.l)
         {
             OUStringBuffer buf( 128 );
-            buf.appendAscii( RTL_CONSTASCII_STRINGPARAM("[map_to_uno():") );
+            buf.append( "[map_to_uno():" );
             buf.append( OUString::unacquired( &type->pTypeName ) );
-            buf.appendAscii( RTL_CONSTASCII_STRINGPARAM("] null-ref given!") );
+            buf.append( "] null-ref given!" );
             buf.append( jni.get_stack_trace() );
             throw BridgeRuntimeError( buf.makeStringAndClear() );
         }
@@ -745,9 +738,9 @@ void Bridge::map_to_uno(
         if (0 == java_data.l)
         {
             OUStringBuffer buf( 128 );
-            buf.appendAscii( RTL_CONSTASCII_STRINGPARAM("[map_to_uno():") );
+            buf.append( "[map_to_uno():" );
             buf.append( OUString::unacquired( &type->pTypeName ) );
-            buf.appendAscii( RTL_CONSTASCII_STRINGPARAM("] null-ref given!") );
+            buf.append( "] null-ref given!" );
             buf.append( jni.get_stack_trace() );
             throw BridgeRuntimeError( buf.makeStringAndClear() );
         }
@@ -1017,9 +1010,9 @@ void Bridge::map_to_uno(
         if (0 == java_data.l)
         {
             OUStringBuffer buf( 128 );
-            buf.appendAscii( RTL_CONSTASCII_STRINGPARAM("[map_to_uno():") );
+            buf.append( "[map_to_uno():" );
             buf.append( OUString::unacquired( &type->pTypeName ) );
-            buf.appendAscii( RTL_CONSTASCII_STRINGPARAM("] null-ref given!") );
+            buf.append( "] null-ref given!" );
             buf.append( jni.get_stack_trace() );
             throw BridgeRuntimeError( buf.makeStringAndClear() );
         }
@@ -1155,11 +1148,9 @@ void Bridge::map_to_uno(
         default:
         {
             OUStringBuffer buf( 128 );
-            buf.appendAscii( RTL_CONSTASCII_STRINGPARAM("[map_to_uno():") );
+            buf.append( "[map_to_uno():" );
             buf.append( OUString::unacquired( &type->pTypeName ) );
-            buf.appendAscii(
-                RTL_CONSTASCII_STRINGPARAM("] unsupported sequence element"
-                                           " type: ") );
+            buf.append( "] unsupported sequence element" " type: " );
             buf.append( OUString::unacquired( &element_type->pTypeName ) );
             buf.append( jni.get_stack_trace() );
             throw BridgeRuntimeError( buf.makeStringAndClear() );
@@ -1212,9 +1203,9 @@ void Bridge::map_to_uno(
     default:
     {
         OUStringBuffer buf( 128 );
-        buf.appendAscii( RTL_CONSTASCII_STRINGPARAM("[map_to_uno():") );
+        buf.append( "[map_to_uno():" );
         buf.append( OUString::unacquired( &type->pTypeName ) );
-        buf.appendAscii( RTL_CONSTASCII_STRINGPARAM("] unsupported type!") );
+        buf.append( "] unsupported type!" );
         buf.append( jni.get_stack_trace() );
         throw BridgeRuntimeError( buf.makeStringAndClear() );
     }
@@ -1878,7 +1869,7 @@ void Bridge::map_to_java(
         {
             // call static <enum_class>.fromInt( int )
             OStringBuffer sig_buf( 5 + class_name.getLength() );
-            sig_buf.append( RTL_CONSTASCII_STRINGPARAM("(I)L") );
+            sig_buf.append( "(I)L" );
             sig_buf.append( class_name.replace( '.', '/' ) );
             sig_buf.append( ';' );
             OString sig( sig_buf.makeStringAndClear() );
@@ -2367,7 +2358,7 @@ void Bridge::map_to_java(
             {
                 // call static <enum_class>.fromInt( int )
                 OStringBuffer sig_buf( 5 + class_name.getLength() );
-                sig_buf.append( RTL_CONSTASCII_STRINGPARAM("(I)L") );
+                sig_buf.append( "(I)L" );
                 sig_buf.append( class_name.replace( '.', '/' ) );
                 sig_buf.append( ';' );
                 OString sig( sig_buf.makeStringAndClear() );
@@ -2486,10 +2477,9 @@ void Bridge::map_to_java(
         default:
         {
             OUStringBuffer buf( 128 );
-            buf.appendAscii( RTL_CONSTASCII_STRINGPARAM("[map_to_java():") );
+            buf.append( "[map_to_java():" );
             buf.append( OUString::unacquired( &type->pTypeName ) );
-            buf.appendAscii(
-                RTL_CONSTASCII_STRINGPARAM("] unsupported element type: ") );
+            buf.append( "] unsupported element type: " );
             buf.append( OUString::unacquired( &element_type->pTypeName ) );
             buf.append( jni.get_stack_trace() );
             throw BridgeRuntimeError( buf.makeStringAndClear() );
@@ -2568,9 +2558,9 @@ void Bridge::map_to_java(
     default:
     {
         OUStringBuffer buf( 128 );
-        buf.appendAscii( RTL_CONSTASCII_STRINGPARAM("[map_to_java():") );
+        buf.append( "[map_to_java():" );
         buf.append( OUString::unacquired( &type->pTypeName ) );
-        buf.appendAscii( RTL_CONSTASCII_STRINGPARAM("] unsupported type!") );
+        buf.appendAscii( "] unsupported type!" );
         buf.append( jni.get_stack_trace() );
         throw BridgeRuntimeError( buf.makeStringAndClear() );
     }
diff --git a/bridges/source/jni_uno/jni_info.cxx b/bridges/source/jni_uno/jni_info.cxx
index 61dd3e8420be..ad0b52b46368 100644
--- a/bridges/source/jni_uno/jni_info.cxx
+++ b/bridges/source/jni_uno/jni_info.cxx
@@ -46,8 +46,7 @@ JNI_type_info::JNI_type_info(
     if (! m_td.get()->bComplete)
     {
         OUStringBuffer buf( 128 );
-        buf.appendAscii(
-            RTL_CONSTASCII_STRINGPARAM("cannot make type complete: ") );
+        buf.append( "cannot make type complete: " );
         buf.append( OUString::unacquired( &m_td.get()->pTypeName ) );
         buf.append( jni.get_stack_trace() );
         throw BridgeRuntimeError( buf.makeStringAndClear() );
@@ -168,11 +167,11 @@ JNI_interface_type_info::JNI_interface_type_info(
                             &attribute_td->aBase.pMemberName );
 
                     // getter
-                    sig_buf.append( RTL_CONSTASCII_STRINGPARAM("()") );
+                    sig_buf.append( "()" );
                     sig_buf.append( type_sig );
                     OString method_signature( sig_buf.makeStringAndClear() );
                     OUStringBuffer name_buf( 3 + member_name.getLength() );
-                    name_buf.appendAscii( RTL_CONSTASCII_STRINGPARAM("get") );
+                    name_buf.append( "get" );
                     name_buf.append( member_name );
                     OString method_name(
                         OUStringToOString(
@@ -190,11 +189,10 @@ JNI_interface_type_info::JNI_interface_type_info(
                         sig_buf.ensureCapacity( 64 );
                         sig_buf.append( '(' );
                         sig_buf.append( type_sig );
-                        sig_buf.append( RTL_CONSTASCII_STRINGPARAM(")V") );
+                        sig_buf.append( ")V" );
                         method_signature = sig_buf.makeStringAndClear();
                         name_buf.ensureCapacity( 3 + member_name.getLength() );
-                        name_buf.appendAscii(
-                            RTL_CONSTASCII_STRINGPARAM("set") );
+                        name_buf.append( "set" );
                         name_buf.append( member_name );
                         method_name = OUStringToOString(
                             name_buf.makeStringAndClear(),
@@ -312,8 +310,7 @@ JNI_compound_type_info::JNI_compound_type_info(
                     && reinterpret_cast< typelib_StructTypeDescription * >(
                         td)->pParameterizedTypes[nPos])
                 {
-                    sig = OString(
-                        RTL_CONSTASCII_STRINGPARAM("Ljava/lang/Object;"));
+                    sig = OString( "Ljava/lang/Object;" );
                 } else {
                     OStringBuffer sig_buf( 32 );
                     JNI_info::append_sig( &sig_buf, td->ppTypeRefs[ nPos ] );
@@ -366,8 +363,7 @@ JNI_type_info const * JNI_info::create_type_info(
     default:
     {
         OUStringBuffer buf( 128 );
-        buf.appendAscii(
-            RTL_CONSTASCII_STRINGPARAM("type info not supported for ") );
+        buf.append( "type info not supported for " );
         buf.append( uno_name );
         buf.append( jni.get_stack_trace() );
         throw BridgeRuntimeError( buf.makeStringAndClear() );
@@ -466,8 +462,7 @@ JNI_type_info const * JNI_info::get_type_info(
         if (! td.is())
         {
             OUStringBuffer buf( 128 );
-            buf.appendAscii(
-                RTL_CONSTASCII_STRINGPARAM("UNO type not found: ") );
+            buf.append( "UNO type not found: " );
             buf.append( uno_name );
             buf.append( jni.get_stack_trace() );
             throw BridgeRuntimeError( buf.makeStringAndClear() );
@@ -756,7 +751,7 @@ JNI_info::JNI_info(
     OSL_ASSERT( 0 != m_field_JNI_proxy_m_oid );
 
     // get java env
-    OUString java_env_type_name( RTL_CONSTASCII_USTRINGPARAM(UNO_LB_JAVA) );
+    OUString java_env_type_name( UNO_LB_JAVA );
     JLocalAutoRef jo_java(
         jni, ustring_to_jstring( jni, java_env_type_name.pData ) );
     jvalue args[ 2 ];
diff --git a/bridges/source/jni_uno/jni_info.h b/bridges/source/jni_uno/jni_info.h
index de63914631a4..ecc1cc2d74e8 100644
--- a/bridges/source/jni_uno/jni_info.h
+++ b/bridges/source/jni_uno/jni_info.h
@@ -279,25 +279,23 @@ inline void JNI_info::append_sig(
         break;
     case typelib_TypeClass_STRING:
         if ( use_slashes ) {
-            buf->append( RTL_CONSTASCII_STRINGPARAM("Ljava/lang/String;") );
+            buf->append( "Ljava/lang/String;" );
         } else {
-            buf->append( RTL_CONSTASCII_STRINGPARAM("Ljava.lang.String;") );
+            buf->append( "Ljava.lang.String;" );
         }
         break;
     case typelib_TypeClass_TYPE:
         if ( use_slashes ) {
-            buf->append(
-                RTL_CONSTASCII_STRINGPARAM("Lcom/sun/star/uno/Type;") );
+            buf->append( "Lcom/sun/star/uno/Type;" );
         } else {
-            buf->append(
-                RTL_CONSTASCII_STRINGPARAM("Lcom.sun.star.uno.Type;") );
+            buf->append( "Lcom.sun.star.uno.Type;" );
         }
         break;
     case typelib_TypeClass_ANY:
         if ( use_slashes ) {
-            buf->append( RTL_CONSTASCII_STRINGPARAM("Ljava/lang/Object;") );
+            buf->append( "Ljava/lang/Object;" );
         } else {
-            buf->append( RTL_CONSTASCII_STRINGPARAM("Ljava.lang.Object;") );
+            buf->append( "Ljava.lang.Object;" );
         }
         break;
     case typelib_TypeClass_ENUM:
@@ -337,9 +335,9 @@ inline void JNI_info::append_sig(
         if (use_Object_for_type_XInterface && is_XInterface( type ))
         {
             if ( use_slashes ) {
-                buf->append( RTL_CONSTASCII_STRINGPARAM("Ljava/lang/Object;") );
+                buf->append( "Ljava/lang/Object;" );
             } else {
-                buf->append( RTL_CONSTASCII_STRINGPARAM("Ljava.lang.Object;") );
+                buf->append( "Ljava.lang.Object;" );
             }
         }
         else
diff --git a/bridges/source/jni_uno/jni_java2uno.cxx b/bridges/source/jni_uno/jni_java2uno.cxx
index 9107cc796b0d..b6a200ea46f5 100644
--- a/bridges/source/jni_uno/jni_java2uno.cxx
+++ b/bridges/source/jni_uno/jni_java2uno.cxx
@@ -97,10 +97,9 @@ void Bridge::handle_uno_exc( JNI_context const & jni, uno_Any * uno_exc ) const
 #if OSL_DEBUG_LEVEL > 1
         {
         OUStringBuffer buf( 128 );
-        buf.appendAscii(
-            RTL_CONSTASCII_STRINGPARAM("exception occurred java->uno: [") );
+        buf.append( "exception occurred java->uno: [" );
         buf.append( OUString::unacquired( &uno_exc->pType->pTypeName ) );
-        buf.appendAscii( RTL_CONSTASCII_STRINGPARAM("] ") );
+        buf.append( "] " );
         buf.append(
             reinterpret_cast< ::com::sun::star::uno::Exception const * >(
                 uno_exc->pData )->Message );
@@ -135,8 +134,7 @@ void Bridge::handle_uno_exc( JNI_context const & jni, uno_Any * uno_exc ) const
                     jo_exc.get(), m_jni_info->m_method_Object_toString, 0 ) );
             jni.ensure_no_exception();
             OUStringBuffer buf( 128 );
-            buf.appendAscii( RTL_CONSTASCII_STRINGPARAM(
-                                 "throwing java exception failed: ") );
+            buf.append( "throwing java exception failed: " );
             buf.append( jstring_to_oustring( jni, (jstring) jo_descr.get() ) );
             buf.append( jni.get_stack_trace() );
             throw BridgeRuntimeError( buf.makeStringAndClear() );
@@ -401,9 +399,9 @@ JNICALL Java_com_sun_star_bridges_jni_1uno_JNI_1proxy_dispatch_1call(
 #if OSL_DEBUG_LEVEL > 1
         {
         OUStringBuffer trace_buf( 64 );
-        trace_buf.appendAscii( RTL_CONSTASCII_STRINGPARAM("java->uno call: ") );
+        trace_buf.append( "java->uno call: " );
         trace_buf.append( method_name );
-        trace_buf.appendAscii( RTL_CONSTASCII_STRINGPARAM(" on oid ") );
+        trace_buf.append( " on oid " );
         JLocalAutoRef jo_oid(
             jni, jni->GetObjectField(
                 jo_proxy, jni_info->m_field_JNI_proxy_m_oid ) );
@@ -596,11 +594,10 @@ JNICALL Java_com_sun_star_bridges_jni_1uno_JNI_1proxy_dispatch_1call(
         }
         // the thing that should not be... no method info found!
         OUStringBuffer buf( 64 );
-        buf.appendAscii( RTL_CONSTASCII_STRINGPARAM(
-            "calling undeclared function on interface ") );
+        buf.append( "calling undeclared function on interface " );
         buf.append( OUString::unacquired(
                         &((typelib_TypeDescription *)td)->pTypeName ) );
-        buf.appendAscii( RTL_CONSTASCII_STRINGPARAM(": ") );
+        buf.append( ": " );
         buf.append( method_name );
         buf.append( jni.get_stack_trace() );
         throw BridgeRuntimeError( buf.makeStringAndClear() );
@@ -608,11 +605,9 @@ JNICALL Java_com_sun_star_bridges_jni_1uno_JNI_1proxy_dispatch_1call(
     catch (const BridgeRuntimeError & err)
     {
         OUStringBuffer buf( 128 );
-        buf.appendAscii(
-            RTL_CONSTASCII_STRINGPARAM("[jni_uno bridge error] "
-                                       "Java calling UNO method ") );
+        buf.append( "[jni_uno bridge error] " "Java calling UNO method " );
         buf.append( method_name );
-        buf.appendAscii( RTL_CONSTASCII_STRINGPARAM(": ") );
+        buf.append( ": " );
         buf.append( err.m_message );
         // notify RuntimeException
         OString cstr_msg(
@@ -629,9 +624,8 @@ JNICALL Java_com_sun_star_bridges_jni_1uno_JNI_1proxy_dispatch_1call(
     catch (const ::jvmaccess::VirtualMachine::AttachGuard::CreationException &)
     {
         OString cstr_msg(
-            OString( RTL_CONSTASCII_STRINGPARAM(
-                "[jni_uno bridge error] "
-                "attaching current thread to java failed!") ) +
+            OString( "[jni_uno bridge error] "
+                "attaching current thread to java failed!" ) +
             OUStringToOString(
                 jni.get_stack_trace(), RTL_TEXTENCODING_JAVA_UTF8 ) );
         OSL_FAIL( cstr_msg.getStr() );
diff --git a/bridges/source/jni_uno/jni_uno2java.cxx b/bridges/source/jni_uno/jni_uno2java.cxx
index 88922ca371fc..9ba852f1f7ac 100644
--- a/bridges/source/jni_uno/jni_uno2java.cxx
+++ b/bridges/source/jni_uno/jni_uno2java.cxx
@@ -88,8 +88,7 @@ void Bridge::handle_java_exc(
                 jo_exc.get(), m_jni_info->m_method_Object_toString, 0 ) );
         jni.ensure_no_exception();
         OUStringBuffer buf( 128 );
-        buf.appendAscii(
-            RTL_CONSTASCII_STRINGPARAM("non-UNO exception occurred: ") );
+        buf.append( "non-UNO exception occurred: " );
         buf.append( jstring_to_oustring( jni, (jstring) jo_descr.get() ) );
         buf.append( jni.get_stack_trace( jo_exc.get() ) );
         throw BridgeRuntimeError( buf.makeStringAndClear() );
@@ -116,10 +115,9 @@ void Bridge::handle_java_exc(
 
 #if OSL_DEBUG_LEVEL > 1
     OUStringBuffer trace_buf( 128 );
-    trace_buf.appendAscii(
-        RTL_CONSTASCII_STRINGPARAM("exception occurred uno->java: [") );
+    trace_buf.append( "exception occurred uno->java: [" );
     trace_buf.append( exc_name );
-    trace_buf.appendAscii( RTL_CONSTASCII_STRINGPARAM("] ") );
+    trace_buf.append( "] " );
     trace_buf.append(
         reinterpret_cast< ::com::sun::star::uno::Exception const * >(
             uno_exc->pData )->Message );
@@ -152,8 +150,7 @@ void Bridge::call_java(
         iface_holder.makeComplete();
         if (! iface_holder.get()->bComplete) {
             OUStringBuffer buf;
-            buf.appendAscii(
-                RTL_CONSTASCII_STRINGPARAM("cannot make type complete: ") );
+            buf.append( "cannot make type complete: " );
             buf.append( OUString::unacquired(&iface_holder.get()->pTypeName) );
             buf.append( jni.get_stack_trace() );
             throw BridgeRuntimeError( buf.makeStringAndClear() );
@@ -226,7 +223,7 @@ void Bridge::call_java(
 
 #if OSL_DEBUG_LEVEL > 1
     OUStringBuffer trace_buf( 128 );
-    trace_buf.appendAscii( RTL_CONSTASCII_STRINGPARAM("calling ") );
+    trace_buf.append( "calling " );
     JLocalAutoRef jo_method(
         jni, jni->ToReflectedMethod( info->m_class, method_id, JNI_FALSE ) );
     jni.ensure_no_exception();
@@ -235,20 +232,20 @@ void Bridge::call_java(
             jo_method.get(), m_jni_info->m_method_Object_toString, 0 ) );
     jni.ensure_no_exception();
     trace_buf.append( jstring_to_oustring( jni, (jstring) jo_descr.get() ) );
-    trace_buf.appendAscii( RTL_CONSTASCII_STRINGPARAM(" on ") );
+    trace_buf.append( " on " );
     jo_descr.reset(
         jni->CallObjectMethodA(
             javaI, m_jni_info->m_method_Object_toString, 0 ) );
     jni.ensure_no_exception();
     trace_buf.append( jstring_to_oustring( jni, (jstring) jo_descr.get() ) );
-    trace_buf.appendAscii( RTL_CONSTASCII_STRINGPARAM(" (") );
+    trace_buf.append( " (" );
     JLocalAutoRef jo_class( jni, jni->GetObjectClass( javaI ) );
     jo_descr.reset(
         jni->CallObjectMethodA(
             jo_class.get(), m_jni_info->m_method_Object_toString, 0 ) );
     jni.ensure_no_exception();
     trace_buf.append( jstring_to_oustring( jni, (jstring) jo_descr.get() ) );
-    trace_buf.appendAscii( RTL_CONSTASCII_STRINGPARAM(")") );
+    trace_buf.append( ")" );
     OString cstr_trace(
         OUStringToOString(
             trace_buf.makeStringAndClear(), RTL_TEXTENCODING_ASCII_US ) );
@@ -612,9 +609,9 @@ void SAL_CALL UNO_proxy_dispatch(
 
 #if OSL_DEBUG_LEVEL > 1
     OUStringBuffer trace_buf( 64 );
-    trace_buf.appendAscii( RTL_CONSTASCII_STRINGPARAM("uno->java call: ") );
+    trace_buf.append( "uno->java call: " );
     trace_buf.append( OUString::unacquired( &member_td->pTypeName ) );
-    trace_buf.appendAscii( RTL_CONSTASCII_STRINGPARAM(" on oid ") );
+    trace_buf.append( " on oid " );
     trace_buf.append( that->m_oid );
     OString cstr_msg(
         OUStringToOString(
@@ -815,9 +812,7 @@ void SAL_CALL UNO_proxy_dispatch(
     catch (BridgeRuntimeError & err)
     {
         OUStringBuffer buf( 128 );
-        buf.appendAscii(
-            RTL_CONSTASCII_STRINGPARAM(
-                "[jni_uno bridge error] UNO calling Java method ") );
+        buf.append( "[jni_uno bridge error] UNO calling Java method " );
         if (typelib_TypeClass_INTERFACE_METHOD == member_td->eTypeClass ||
             typelib_TypeClass_INTERFACE_ATTRIBUTE == member_td->eTypeClass)
         {
@@ -826,7 +821,7 @@ void SAL_CALL UNO_proxy_dispatch(
                             typelib_InterfaceMemberTypeDescription const * >(
                                 member_td )->pMemberName ) );
         }
-        buf.appendAscii( RTL_CONSTASCII_STRINGPARAM(": ") );
+        buf.append( ": " );
         buf.append( err.m_message );
         // binary identical struct
         ::com::sun::star::uno::RuntimeException exc(