remove unnecessary RTL_CONSTASCII_STRINGPARAM in appendAscii calls

Convert code like: aStrBuf.appendAscii( RTL_CONSTASCII_STRINGPARAM( "ln(x)" )); to: aStrBuf.append( "ln(x)" ); which compiles down to the same code. Change-Id: I24c7cb45ceb32fd7cd6ec7ed203c2a5d746f1c5c
author: Noel Grandin <noel@peralex.com> 2013-11-19 17:06:06 +0200
committer: Noel Grandin <noel@peralex.com> 2013-11-20 10:07:32 +0200
commit: 52bbd9cc00b5a1e15e4f96b5c5fa5e75855692c1 (patch)
tree: 72d0d1d16806f1c785a4f79ea2c0cdfe54bb8101
parent: 3af99e4d59d89c343965a928681a30f36b1007d2 (diff)
65 files changed, 354 insertions, 389 deletions
diff --git a/chart2/source/tools/LogarithmicRegressionCurveCalculator.cxx b/chart2/source/tools/LogarithmicRegressionCurveCalculator.cxx
index e3b5ab4d80e5..58e92a1e3330 100644
--- a/chart2/source/tools/LogarithmicRegressionCurveCalculator.cxx
+++ b/chart2/source/tools/LogarithmicRegressionCurveCalculator.cxx
@@ -148,7 +148,7 @@ OUString LogarithmicRegressionCurveCalculator::ImplGetRepresentation(
             aBuf.append( getFormattedString( xNumFormatter, nNumberFormatKey, m_fSlope ));
             aBuf.append( UC_SPACE );
         }
-        aBuf.appendAscii( RTL_CONSTASCII_STRINGPARAM( "ln(x)" ));
+        aBuf.append( "ln(x)" );
         bHaveSlope = true;
     }
 
@@ -163,7 +163,7 @@ OUString LogarithmicRegressionCurveCalculator::ImplGetRepresentation(
         }
         else if( m_fIntercept > 0.0 )
         {
-            aBuf.appendAscii( RTL_CONSTASCII_STRINGPARAM( " + " ));
+            aBuf.append( " + " );
             aBuf.append( getFormattedString( xNumFormatter, nNumberFormatKey, m_fIntercept ));
         }
     }
diff --git a/chart2/source/tools/PotentialRegressionCurveCalculator.cxx b/chart2/source/tools/PotentialRegressionCurveCalculator.cxx
index d22138c3640e..0d0898008fbf 100644
--- a/chart2/source/tools/PotentialRegressionCurveCalculator.cxx
+++ b/chart2/source/tools/PotentialRegressionCurveCalculator.cxx
@@ -153,7 +153,7 @@ OUString PotentialRegressionCurveCalculator::ImplGetRepresentation(
         }
         if( m_fSlope != 0.0 )
         {
-            aBuf.appendAscii( RTL_CONSTASCII_STRINGPARAM( "x^" ));
+            aBuf.append( "x^" );
             aBuf.append( getFormattedString( xNumFormatter, nNumberFormatKey, m_fSlope ));
         }
     }
diff --git a/cli_ure/source/climaker/climaker_app.cxx b/cli_ure/source/climaker/climaker_app.cxx
index 12c63a7b8bc7..e11aee5855ce 100644
--- a/cli_ure/source/climaker/climaker_app.cxx
+++ b/cli_ure/source/climaker/climaker_app.cxx
@@ -378,12 +378,9 @@ SAL_IMPLEMENT_MAIN()
                         if (option_info == 0)
                         {
                             OUStringBuffer buf;
-                            buf.appendAscii(
-                                RTL_CONSTASCII_STRINGPARAM("unknown option ") );
+                            buf.append("unknown option ");
                             buf.append( cmd_arg );
-                            buf.appendAscii( RTL_CONSTASCII_STRINGPARAM(
-                                                 "!  Use climaker --help "
-                                                 "to print all options.") );
+                            buf.append( "!  Use climaker --help to print all options." );
                             throw RuntimeException(
                                 buf.makeStringAndClear(),
                                 css::uno::Reference< XInterface >() );
diff --git a/cli_ure/source/climaker/climaker_emit.cxx b/cli_ure/source/climaker/climaker_emit.cxx
index fcefc2637572..628547135df9 100644
--- a/cli_ure/source/climaker/climaker_emit.cxx
+++ b/cli_ure/source/climaker/climaker_emit.cxx
@@ -43,7 +43,7 @@ static inline ::System::String ^ to_cts_name(
     OUString const & uno_name )
 {
     OUStringBuffer buf( 7 + uno_name.getLength() );
-    buf.appendAscii( RTL_CONSTASCII_STRINGPARAM("unoidl.") );
+    buf.append( "unoidl." );
     buf.append( uno_name );
     return ustring_to_String( buf.makeStringAndClear() );
 }
diff --git a/cli_ure/source/uno_bridge/cli_data.cxx b/cli_ure/source/uno_bridge/cli_data.cxx
index d6b7000359d9..219438a2fb66 100644
--- a/cli_ure/source/uno_bridge/cli_data.cxx
+++ b/cli_ure/source/uno_bridge/cli_data.cxx
@@ -444,9 +444,7 @@ typelib_TypeDescriptionReference* mapCliType(System::Type^ cliType)
     if (retVal == NULL)
     {
         OUStringBuffer buf( 128 );
-        buf.appendAscii(
-            RTL_CONSTASCII_STRINGPARAM("[cli_uno bridge] mapCliType():"
-                                       "could not map type: ") );
+        buf.append( "[cli_uno bridge] mapCliType():could not map type: " );
         buf.append(mapCliString(cliType->FullName));
         throw BridgeRuntimeError( buf.makeStringAndClear() );
     }
@@ -978,9 +976,9 @@ void Bridge::map_to_uno(void * uno_data, System::Object^ cli_data,
                 default:
                 {
                     OUStringBuffer buf( 128 );
-                    buf.appendAscii( RTL_CONSTASCII_STRINGPARAM("[map_to_uno():") );
+                    buf.append( "[map_to_uno():" );
                     buf.append(value_td.getTypeName());
-                    buf.appendAscii( RTL_CONSTASCII_STRINGPARAM("] unsupported value type of any!") );
+                    buf.append( "] unsupported value type of any!" );
                     throw BridgeRuntimeError( buf.makeStringAndClear() );
                 }
                 }
@@ -991,12 +989,11 @@ void Bridge::map_to_uno(void * uno_data, System::Object^ cli_data,
                 if (assign)
                     uno_any_construct( pAny, 0, 0, 0 ); // restore some valid any
                 OUStringBuffer buf( 256 );
-                buf.appendAscii( RTL_CONSTASCII_STRINGPARAM("[map_to_uno():Any") );
+                buf.append( "[map_to_uno():Any" );
                 buf.append(value_td.getTypeName());
-                buf.appendAscii( RTL_CONSTASCII_STRINGPARAM("]The Any type "));
+                buf.append( "]The Any type ");
                 buf.append(value_td.getTypeName());
-                buf.appendAscii( RTL_CONSTASCII_STRINGPARAM(" does not correspont  "
-                                                            "to its value type: ") );
+                buf.append( " does not correspond to its value type: " );
                 if(aAny.Value != nullptr)
                 {
                     css::uno::Type td(mapCliType(aAny.Value->GetType()), SAL_NO_ACQUIRE);
@@ -1093,7 +1090,7 @@ void Bridge::map_to_uno(void * uno_data, System::Object^ cli_data,
                             else
                             {
                                 OUStringBuffer buf(512);
-                                buf.appendAscii(RTL_CONSTASCII_STRINGPARAM("[map_to_uno(): Member: "));
+                                buf.append("[map_to_uno(): Member: ");
                                 buf.append(comp_td->ppMemberNames[nPos]);
                                 throw BridgeRuntimeError(buf.makeStringAndClear());
                             }
@@ -1191,13 +1188,13 @@ void Bridge::map_to_uno(void * uno_data, System::Object^ cli_data,
             {
                 bException= true;
                 OUStringBuffer buf(512);
-                buf.appendAscii(RTL_CONSTASCII_STRINGPARAM("[map_to_uno():"));
+                buf.append("[map_to_uno():");
                 if (cliType)
                 {
                     buf.append(mapCliString(cliType->FullName));
-                    buf.appendAscii(RTL_CONSTASCII_STRINGPARAM("."));
+                    buf.append(".");
                     buf.append(comp_td->ppMemberNames[nPos]);
-                    buf.appendAscii(RTL_CONSTASCII_STRINGPARAM(" "));
+                    buf.append(" ");
                 }
                 buf.append(e.m_message);
                 throw BridgeRuntimeError(buf.makeStringAndClear());
@@ -1206,14 +1203,14 @@ void Bridge::map_to_uno(void * uno_data, System::Object^ cli_data,
             {
                 bException= true;
                 OUStringBuffer buf( 256 );
-                buf.appendAscii( RTL_CONSTASCII_STRINGPARAM("[map_to_uno():") );
+                buf.append( "[map_to_uno():" );
                 if (cliType)
                 {
                     buf.append(mapCliString(cliType->FullName));
-                    buf.appendAscii( RTL_CONSTASCII_STRINGPARAM("."));
+                    buf.append( "." );
                     buf.append(comp_td->ppMemberNames[nPos]);
                 }
-                buf.appendAscii( RTL_CONSTASCII_STRINGPARAM("] Value has not the required type."));
+                buf.append( "] Value has not the required type." );
                 throw BridgeRuntimeError(buf.makeStringAndClear());
             }
             catch (...)
@@ -1379,9 +1376,9 @@ void Bridge::map_to_uno(void * uno_data, System::Object^ cli_data,
                     default:
                     {
                         OUStringBuffer buf( 128 );
-                        buf.appendAscii( RTL_CONSTASCII_STRINGPARAM("[map_to_uno():") );
+                        buf.append( "[map_to_uno():" );
                         buf.append( *reinterpret_cast< OUString const * >( &type->pTypeName ) );
-                        buf.appendAscii( RTL_CONSTASCII_STRINGPARAM("] unsupported sequence element type: ") );
+                        buf.append( "] unsupported sequence element type: " );
                         buf.append( *reinterpret_cast< OUString const * >( &element_type->pTypeName ) );
                         throw BridgeRuntimeError( buf.makeStringAndClear() );
                     }
@@ -1390,9 +1387,9 @@ void Bridge::map_to_uno(void * uno_data, System::Object^ cli_data,
                 catch (BridgeRuntimeError& e)
                 {
                     OUStringBuffer buf( 128 );
-                    buf.appendAscii( RTL_CONSTASCII_STRINGPARAM("[map_to_uno():") );
+                    buf.append( "[map_to_uno():" );
                     buf.append( *reinterpret_cast< OUString const * >( &type->pTypeName ));
-                    buf.appendAscii( RTL_CONSTASCII_STRINGPARAM("] conversion failed\n "));
+                    buf.append( "] conversion failed\n ");
                     buf.append(e.m_message);
                     throw BridgeRuntimeError(buf.makeStringAndClear());
                 }
@@ -1400,9 +1397,9 @@ void Bridge::map_to_uno(void * uno_data, System::Object^ cli_data,
                 {
                     // Ok, checked
                     OUStringBuffer buf( 128 );
-                    buf.appendAscii( RTL_CONSTASCII_STRINGPARAM("[map_to_uno():") );
+                    buf.append( "[map_to_uno():" );
                     buf.append( *reinterpret_cast< OUString const * >( &type->pTypeName) );
-                    buf.appendAscii( RTL_CONSTASCII_STRINGPARAM("] could not convert sequence element type: ") );
+                    buf.append( "] could not convert sequence element type: " );
                     buf.append( *reinterpret_cast< OUString const * >( &element_type->pTypeName ) );
                     throw BridgeRuntimeError( buf.makeStringAndClear() );
                 }
@@ -1448,9 +1445,9 @@ void Bridge::map_to_uno(void * uno_data, System::Object^ cli_data,
         {
             //ToDo check
             OUStringBuffer buf( 128 );
-            buf.appendAscii( RTL_CONSTASCII_STRINGPARAM("[map_to_uno():") );
+            buf.append( "[map_to_uno():" );
             buf.append( *reinterpret_cast< OUString const * >( &type->pTypeName ) );
-            buf.appendAscii( RTL_CONSTASCII_STRINGPARAM("] unsupported type!") );
+            buf.append( "] unsupported type!" );
             throw BridgeRuntimeError( buf.makeStringAndClear() );
         }
         }
@@ -1460,16 +1457,15 @@ void Bridge::map_to_uno(void * uno_data, System::Object^ cli_data,
     {
         //ToDo check
         OUStringBuffer buf( 128 );
-        buf.appendAscii( RTL_CONSTASCII_STRINGPARAM("[map_to_uno():") );
+        buf.append( "[map_to_uno():" );
         buf.append( *reinterpret_cast< OUString const * >( &type->pTypeName ) );
-        buf.appendAscii( RTL_CONSTASCII_STRINGPARAM("] could not convert type!") );
+        buf.append( "] could not convert type!" );
         throw BridgeRuntimeError( buf.makeStringAndClear() );
     }
     catch (System::NullReferenceException ^ e)
     {
         OUStringBuffer buf(512);
-        buf.appendAscii(RTL_CONSTASCII_STRINGPARAM(
-                             "[map_to_uno()] Illegal null reference passed!\n"));
+        buf.append( "[map_to_uno()] Illegal null reference passed!\n" );
         buf.append(mapCliString(e->StackTrace));
         throw BridgeRuntimeError( buf.makeStringAndClear() );
     }
@@ -1955,9 +1951,9 @@ void Bridge::map_to_cli(
         default:
         {
             OUStringBuffer buf( 128 );
-            buf.appendAscii( RTL_CONSTASCII_STRINGPARAM("[map_to_cli():") );
+            buf.append( "[map_to_cli():" );
             buf.append( *reinterpret_cast< OUString const * >( &type->pTypeName ) );
-            buf.appendAscii( RTL_CONSTASCII_STRINGPARAM("] unsupported element type: ") );
+            buf.append( "] unsupported element type: " );
             buf.append( *reinterpret_cast< OUString const * >( &element_type->pTypeName ) );
             throw BridgeRuntimeError( buf.makeStringAndClear() );
         }
@@ -1981,9 +1977,9 @@ void Bridge::map_to_cli(
     {
         //ToDo check this exception. The String is probably crippled
         OUStringBuffer buf( 128 );
-        buf.appendAscii( RTL_CONSTASCII_STRINGPARAM("[map_to_cli():") );
+        buf.append( "[map_to_cli():" );
         buf.append( *reinterpret_cast< OUString const * >( &type->pTypeName ) );
-        buf.appendAscii( RTL_CONSTASCII_STRINGPARAM("] unsupported type!") );
+        buf.append( "] unsupported type!" );
         throw BridgeRuntimeError( buf.makeStringAndClear() );
     }
     } //switch
diff --git a/cli_ure/source/uno_bridge/cli_proxy.cxx b/cli_ure/source/uno_bridge/cli_proxy.cxx
index f7f865f4b802..09bfe60931e8 100644
--- a/cli_ure/source/uno_bridge/cli_proxy.cxx
+++ b/cli_ure/source/uno_bridge/cli_proxy.cxx
@@ -80,8 +80,7 @@ UnoInterfaceInfo::UnoInterfaceInfo(Bridge const * bridge, uno_Interface* unoI,
         if( ! bComplete)
         {
             OUStringBuffer buf( 128 );
-            buf.appendAscii(RTL_CONSTASCII_STRINGPARAM(
-                                 "cannot make type complete: ") );
+            buf.append( "cannot make type complete: " );
             buf.append( *reinterpret_cast< OUString const * >(
                             & m_typeDesc->aBase.pTypeName));
             throw BridgeRuntimeError(buf.makeStringAndClear());
@@ -198,11 +197,11 @@ void UnoInterfaceProxy::addUnoInterface(uno_Interface* pUnoI,
         // add to the string that contains all interface names
          _numInterfaces ++;
          OUStringBuffer buf(512);
-        buf.appendAscii("\t");
+        buf.append("\t");
         buf.append( OUString::valueOf((sal_Int32)_numInterfaces));
-        buf.appendAscii(". ");
+        buf.append(". ");
         buf.append(mapCliString(sInterfaceName));
-        buf.appendAscii("\n");
+        buf.append("\n");
         OUString _sNewInterface = buf.makeStringAndClear();
         rtl_uString * __pin * pp_sInterfaces = & _sInterfaces;
         rtl_uString_newConcat( pp_sInterfaces, * pp_sInterfaces,
@@ -551,12 +550,10 @@ srrm::IMessage^ UnoInterfaceProxy::Invoke(srrm::IMessage^ callmsg)
         // ToDo check if the message of the exception is not crippled
         // the thing that should not be... no method info found!
         OUStringBuffer buf( 64 );
-        buf.appendAscii(RTL_CONSTASCII_STRINGPARAM(
-                        "[cli_uno bridge]calling undeclared function on "
-                        "interface ") );
+        buf.append( "[cli_uno bridge]calling undeclared function on interface " );
         buf.append( *reinterpret_cast< OUString const * >(
                   & ((typelib_TypeDescription *)info->m_typeDesc)->pTypeName));
-        buf.appendAscii( RTL_CONSTASCII_STRINGPARAM(": ") );
+        buf.append( ": " );
         buf.append( usMethodName );
         throw BridgeRuntimeError( buf.makeStringAndClear() );
     }
@@ -762,11 +759,9 @@ void CliProxy::makeMethodInfos()
     catch (System::InvalidCastException^ )
     {
         OUStringBuffer buf( 128 );
-        buf.appendAscii(RTL_CONSTASCII_STRINGPARAM(
-                            "[cli_uno bridge] preparing proxy for "
-                            "cli interface: ") );
+        buf.append( "[cli_uno bridge] preparing proxy for cli interface: " );
         buf.append(mapCliString(m_type->ToString() ));
-        buf.appendAscii(RTL_CONSTASCII_STRINGPARAM(" \nfailed!"));
+        buf.append( " \nfailed!" );
         throw BridgeRuntimeError( buf.makeStringAndClear() );
     }
 }
@@ -840,9 +835,8 @@ sr::MethodInfo^ CliProxy::getMethodInfo(int nUnoFunctionPos,
         if (indexCliMethod == -1)
         {
             OUStringBuffer buf(256);
-            buf.appendAscii(RTL_CONSTASCII_STRINGPARAM(
-                                "[cli_uno bridge] CliProxy::getMethodInfo():"
-                                "cli object does not implement interface method: "));
+            buf.append( "[cli_uno bridge] CliProxy::getMethodInfo():"
+                        "cli object does not implement interface method: " );
             buf.append(usMethodName);
             throw BridgeRuntimeError(buf.makeStringAndClear());
         }
diff --git a/cli_ure/source/uno_bridge/cli_uno.cxx b/cli_ure/source/uno_bridge/cli_uno.cxx
index c1598d98f376..e705de141d8d 100644
--- a/cli_ure/source/uno_bridge/cli_uno.cxx
+++ b/cli_ure/source/uno_bridge/cli_uno.cxx
@@ -230,9 +230,8 @@ void Bridge::call_cli(
     catch (System::Exception^ e)
     {
         OUStringBuffer buf( 128 );
-        buf.appendAscii( RTL_CONSTASCII_STRINGPARAM(
-                             "Unexspected exception during invocation of cli object. "
-                             "Original message is: \n") );
+        buf.append( "Unexpected exception during invocation of cli object. "
+                    "Original message is: \n" );
         buf.append(mapCliString(e->Message));
         throw BridgeRuntimeError( buf.makeStringAndClear() );
     }
diff --git a/connectivity/source/drivers/postgresql/pq_array.cxx b/connectivity/source/drivers/postgresql/pq_array.cxx
index ca0d0ae50861..4f69d158c9cf 100644
--- a/connectivity/source/drivers/postgresql/pq_array.cxx
+++ b/connectivity/source/drivers/postgresql/pq_array.cxx
@@ -116,11 +116,11 @@ void Array::checkRange( sal_Int32 index, sal_Int32 count )
     if( index >= 1 && index -1 + count <= m_data.getLength() )
         return;
     OUStringBuffer buf;
-    buf.appendAscii( RTL_CONSTASCII_STRINGPARAM( "Array::getArrayAtIndex(): allowed range for index + count " ) );
+    buf.append( "Array::getArrayAtIndex(): allowed range for index + count " );
     buf.append( m_data.getLength() );
-    buf.appendAscii( ", got " );
+    buf.append( ", got " );
     buf.append( index );
-    buf.appendAscii( " + " );
+    buf.append( " + " );
     buf.append( count );
 
     throw SQLException( buf.makeStringAndClear() , *this, OUString(), 1, Any());
diff --git a/connectivity/source/drivers/postgresql/pq_databasemetadata.cxx b/connectivity/source/drivers/postgresql/pq_databasemetadata.cxx
index 69d764427945..9a502a07e7e4 100644
--- a/connectivity/source/drivers/postgresql/pq_databasemetadata.cxx
+++ b/connectivity/source/drivers/postgresql/pq_databasemetadata.cxx
@@ -1431,7 +1431,7 @@ static void columnMetaData2DatabaseTypeDescription(
     Reference< XRow > row( rs, UNO_QUERY_THROW );
     int domains = 0;
     OUStringBuffer queryBuf(128);
-    queryBuf.appendAscii( RTL_CONSTASCII_STRINGPARAM( "SELECT oid,typtype,typname FROM pg_TYPE WHERE " ) );
+    queryBuf.append( "SELECT oid,typtype,typname FROM pg_TYPE WHERE " );
     while( rs->next() )
     {
         if( row->getString( 9 ) == "d" && oidMap.find( row->getInt( 12 ) ) == oidMap.end() )
diff --git a/connectivity/source/drivers/postgresql/pq_statement.cxx b/connectivity/source/drivers/postgresql/pq_statement.cxx
index f8e25652eb97..47697d1990f5 100644
--- a/connectivity/source/drivers/postgresql/pq_statement.cxx
+++ b/connectivity/source/drivers/postgresql/pq_statement.cxx
@@ -749,12 +749,12 @@ Reference< XResultSet > getGeneratedValuesFromLastInsert(
     if( nLastOid && lastTableInserted.getLength() )
     {
         OUStringBuffer buf( 128 );
-        buf.appendAscii( RTL_CONSTASCII_STRINGPARAM( "SELECT * FROM " ) );
+        buf.append( "SELECT * FROM " );
         if( schemaName.getLength() )
             bufferQuoteQualifiedIdentifier(buf, schemaName, tableName, pConnectionSettings );
         else
             bufferQuoteIdentifier( buf, lastTableInserted, pConnectionSettings );
-        buf.appendAscii( RTL_CONSTASCII_STRINGPARAM( " WHERE oid = " ) );
+        buf.append( " WHERE oid = " );
         buf.append( nLastOid , 10 );
         query = buf.makeStringAndClear();
     }
@@ -786,9 +786,9 @@ Reference< XResultSet > getGeneratedValuesFromLastInsert(
         if( keyColumnNames.getLength() )
         {
             OUStringBuffer buf( 128 );
-            buf.appendAscii( RTL_CONSTASCII_STRINGPARAM( "SELECT * FROM " ) );
+            buf.append( "SELECT * FROM " );
             bufferQuoteQualifiedIdentifier(buf, schemaName, tableName, pConnectionSettings );
-            buf.appendAscii( RTL_CONSTASCII_STRINGPARAM( " WHERE " ) );
+            buf.append( " WHERE " );
             bool additionalCondition = false;
             String2StringMap autoValues;
             for( int i = 0 ; i < keyColumnNames.getLength() ; i ++ )
@@ -829,7 +829,7 @@ Reference< XResultSet > getGeneratedValuesFromLastInsert(
                             {
                                 // retrieve current sequence value:
                                 OUStringBuffer myBuf(128 );
-                                myBuf.appendAscii( RTL_CONSTASCII_STRINGPARAM( "SELECT currval(" ) );
+                                myBuf.append( "SELECT currval(" );
                                 myBuf.appendAscii( &(j->second.getStr()[8]));
                                 value = querySingleValue( connection, myBuf.makeStringAndClear() );
                             }
@@ -846,9 +846,9 @@ Reference< XResultSet > getGeneratedValuesFromLastInsert(
                 }
 
                 if( additionalCondition )
-                    buf.appendAscii( RTL_CONSTASCII_STRINGPARAM( " AND " ) );
+                    buf.append( " AND " );
                 bufferQuoteIdentifier( buf, keyColumnNames[i], pConnectionSettings );
-                buf.appendAscii( RTL_CONSTASCII_STRINGPARAM( " = " ) );
+                buf.append( " = " );
                 buf.append( value );
                 additionalCondition = true;
             }
diff --git a/connectivity/source/drivers/postgresql/pq_tools.cxx b/connectivity/source/drivers/postgresql/pq_tools.cxx
index ed7e514073c8..2b979b0240ae 100644
--- a/connectivity/source/drivers/postgresql/pq_tools.cxx
+++ b/connectivity/source/drivers/postgresql/pq_tools.cxx
@@ -87,7 +87,7 @@ OUString concatQualified( const OUString & a, const OUString &b)
 {
     OUStringBuffer buf( a.getLength() + 2 + b.getLength() );
     buf.append( a );
-    buf.appendAscii( RTL_CONSTASCII_STRINGPARAM( "." ) );
+    buf.append( "." );
     buf.append( b );
     return buf.makeStringAndClear();
 }
@@ -130,9 +130,9 @@ void bufferEscapeConstant( OUStringBuffer & buf, const OUString & value, Connect
 
 static inline void ibufferQuoteConstant( OUStringBuffer & buf, const OUString & value, ConnectionSettings *settings )
 {
-    buf.appendAscii( RTL_CONSTASCII_STRINGPARAM( "'" ) );
+    buf.append( "'" );
     bufferEscapeConstant( buf, value, settings );
-    buf.appendAscii( RTL_CONSTASCII_STRINGPARAM( "'" ) );
+    buf.append( "'" );
 }
 
 void bufferQuoteConstant( OUStringBuffer & buf, const OUString & value, ConnectionSettings *settings )
@@ -149,7 +149,7 @@ void bufferQuoteAnyConstant( OUStringBuffer & buf, const Any &val, ConnectionSet
         bufferQuoteConstant( buf, str, settings );
     }
     else
-        buf.appendAscii( RTL_CONSTASCII_STRINGPARAM( "NULL" ) );
+        buf.append( "NULL" );
 }
 
 static inline void ibufferQuoteIdentifier( OUStringBuffer & buf, const OUString &toQuote, ConnectionSettings *settings )
@@ -182,7 +182,7 @@ void bufferQuoteQualifiedIdentifier(
     OUStringBuffer & buf, const OUString &schema, const OUString &table, ConnectionSettings *settings )
 {
     ibufferQuoteIdentifier(buf, schema, settings);
-    buf.appendAscii( RTL_CONSTASCII_STRINGPARAM( "." ) );
+    buf.append( "." );
     ibufferQuoteIdentifier(buf, table, settings);
 }
 
@@ -194,9 +194,9 @@ void bufferQuoteQualifiedIdentifier(
     ConnectionSettings *settings)
 {
     ibufferQuoteIdentifier(buf, schema, settings);
-    buf.appendAscii( RTL_CONSTASCII_STRINGPARAM( "." ) );
+    buf.append( "." );
     ibufferQuoteIdentifier(buf, table, settings);
-    buf.appendAscii( RTL_CONSTASCII_STRINGPARAM( "." ) );
+    buf.append( "." );
     ibufferQuoteIdentifier(buf, col, settings);
 }
 
@@ -575,28 +575,28 @@ OUString array2String( const com::sun::star::uno::Sequence< Any > &seq )
 {
     OUStringBuffer buf(128);
     int len = seq.getLength();
-    buf.appendAscii( RTL_CONSTASCII_STRINGPARAM( "{" ) );
+    buf.append( "{" );
     for( int i = 0 ; i < len ; i ++ )
     {
         OUString element;
         seq[i] >>= element;
 
         if( i > 0 )
-            buf.appendAscii( RTL_CONSTASCII_STRINGPARAM(",") );
+            buf.append( "," );
         int strLength = element.getLength();
-        buf.appendAscii( RTL_CONSTASCII_STRINGPARAM( "\"") );
+        buf.append( "\"" );
         for( int j = 0 ; j < strLength ; j ++ )
         {
             sal_Unicode c = element[j];
             if( c == '\\' || c == '"' || c == '{' || c == '}' )
             {
-                buf.appendAscii( RTL_CONSTASCII_STRINGPARAM( "\\" ) );
+                buf.append( "\\" );
             }
             buf.append( c );
         }
-        buf.appendAscii( RTL_CONSTASCII_STRINGPARAM( "\"" ) );
+        buf.append( "\"" );
     }
-    buf.appendAscii( RTL_CONSTASCII_STRINGPARAM( "}" ) );
+    buf.append( "}" );
     return buf.makeStringAndClear();
 }
 
@@ -932,19 +932,19 @@ OUString sqltype2string( const Reference< XPropertySet > & desc )
         case com::sun::star::sdbc::DataType::VARCHAR:
         case com::sun::star::sdbc::DataType::CHAR:
         {
-            typeName.appendAscii( RTL_CONSTASCII_STRINGPARAM( "(" ) );
+            typeName.append( "(" );
             typeName.append( precision );
-            typeName.appendAscii( RTL_CONSTASCII_STRINGPARAM( ")" ) );
+            typeName.append( ")" );
             break;
         }
         case com::sun::star::sdbc::DataType::DECIMAL:
         case com::sun::star::sdbc::DataType::NUMERIC:
         {
-            typeName.appendAscii( RTL_CONSTASCII_STRINGPARAM( "(" ) );
+            typeName.append( "(" );
             typeName.append( precision );
-            typeName.appendAscii( RTL_CONSTASCII_STRINGPARAM( "," ) );
+            typeName.append( "," );
             typeName.append( extractIntProperty( desc, getStatics().SCALE ) );
-            typeName.appendAscii( RTL_CONSTASCII_STRINGPARAM( ")" ) );
+            typeName.append( ")" );
             break;
         }
         default:
@@ -961,23 +961,23 @@ static void keyType2String( OUStringBuffer & buf, sal_Int32 keyType )
 {
     if( com::sun::star::sdbc::KeyRule::CASCADE == keyType )
     {
-        buf.appendAscii( RTL_CONSTASCII_STRINGPARAM( "CASCADE " ) );
+        buf.append( "CASCADE " );
     }
     else if( com::sun::star::sdbc::KeyRule::RESTRICT  == keyType )
     {
-        buf.appendAscii( RTL_CONSTASCII_STRINGPARAM( "RESTRICT " ) );
+        buf.append( "RESTRICT " );
     }
     else if( com::sun::star::sdbc::KeyRule::SET_DEFAULT  == keyType )
     {
-        buf.appendAscii( RTL_CONSTASCII_STRINGPARAM( "SET DEFAULT " ) );
+        buf.append( "SET DEFAULT " );
     }
     else if( com::sun::star::sdbc::KeyRule::SET_NULL  == keyType )
     {
-        buf.appendAscii( RTL_CONSTASCII_STRINGPARAM( "SET NULL " ) );
+        buf.append( "SET NULL " );
     }
     else //if( com::sun::star::sdbc::KeyRule::NO_ACTION == keyType )
     {
-        buf.appendAscii( RTL_CONSTASCII_STRINGPARAM( "NO ACTION " ) );
+        buf.append( "NO ACTION " );
     }
 }
 
@@ -992,16 +992,16 @@ void bufferKey2TableConstraint(
     bool foreign = false;
     if( type == com::sun::star::sdbcx::KeyType::UNIQUE )
     {
-        buf.appendAscii( RTL_CONSTASCII_STRINGPARAM( "UNIQUE( " ) );
+        buf.append( "UNIQUE( " );
     }
     else if( type == com::sun::star::sdbcx::KeyType::PRIMARY )
     {
-        buf.appendAscii( RTL_CONSTASCII_STRINGPARAM( "PRIMARY KEY( " ) );
+        buf.append( "PRIMARY KEY( " );
     }
     else if( type == com::sun::star::sdbcx::KeyType::FOREIGN )
     {
         foreign = true;
-        buf.appendAscii( RTL_CONSTASCII_STRINGPARAM( "FOREIGN KEY( " ) );
+        buf.append( "FOREIGN KEY( " );
     }
 
     Reference< XColumnsSupplier > columns( key, UNO_QUERY );
@@ -1020,18 +1020,18 @@ void bufferKey2TableConstraint(
                 }
                 else
                 {
-                    buf.appendAscii( RTL_CONSTASCII_STRINGPARAM( ", " ) );
+                    buf.append( ", " );
                 }
                 Reference< XPropertySet > keyColumn( colEnum->nextElement(), UNO_QUERY_THROW );
                 bufferQuoteIdentifier(buf, extractStringProperty( keyColumn, st.NAME ), settings );
             }
         }
     }
-    buf.appendAscii( RTL_CONSTASCII_STRINGPARAM( ") " ));
+    buf.append( ") " );
 
     if( foreign )
     {
-        buf.appendAscii( RTL_CONSTASCII_STRINGPARAM( "REFERENCES " ) );
+        buf.append( "REFERENCES " );
         OUString schema;
         OUString tableName;
         splitConcatenatedIdentifier( referencedTable, &schema, &tableName );
@@ -1041,7 +1041,7 @@ void bufferKey2TableConstraint(
             Reference< XEnumerationAccess > colEnumAccess( columns->getColumns(), UNO_QUERY);
             if( colEnumAccess.is() )
             {
-                buf.appendAscii( RTL_CONSTASCII_STRINGPARAM( " (" ) );
+                buf.append( " (" );
                 Reference< XEnumeration > colEnum(colEnumAccess->createEnumeration());
                 bool first = true;
                 while(colEnum.is() && colEnum->hasMoreElements() )
@@ -1052,19 +1052,19 @@ void bufferKey2TableConstraint(
                     }
                     else
                     {
-                        buf.appendAscii( RTL_CONSTASCII_STRINGPARAM( ", " ) );
+                        buf.append( ", " );
                     }
                     Reference< XPropertySet > keyColumn( colEnum->nextElement(), UNO_QUERY_THROW );
                     bufferQuoteIdentifier(
                                           buf, extractStringProperty( keyColumn, st.RELATED_COLUMN ), settings );
                 }
-                buf.appendAscii( RTL_CONSTASCII_STRINGPARAM( ") " ) );
+                buf.append( ") " );
             }
         }
 
-        buf.appendAscii( RTL_CONSTASCII_STRINGPARAM( "ON DELETE " ) );
+        buf.append( "ON DELETE " );
         keyType2String( buf, deleteRule );
-        buf.appendAscii( RTL_CONSTASCII_STRINGPARAM( " ON UPDATE " ) );
+        buf.append( " ON UPDATE " );
         keyType2String( buf, updateRule );
     }
 
diff --git a/connectivity/source/drivers/postgresql/pq_updateableresultset.cxx b/connectivity/source/drivers/postgresql/pq_updateableresultset.cxx
index b0d1c74a5629..f105d5c7d9bc 100644
--- a/connectivity/source/drivers/postgresql/pq_updateableresultset.cxx
+++ b/connectivity/source/drivers/postgresql/pq_updateableresultset.cxx
@@ -189,14 +189,14 @@ OUString UpdateableResultSet::buildWhereClause()
     if( m_primaryKey.getLength() )
     {
         OUStringBuffer buf( 128 );
-        buf.appendAscii( RTL_CONSTASCII_STRINGPARAM( " WHERE " ) );
+        buf.append( " WHERE " );
         for( int i = 0 ; i < m_primaryKey.getLength() ; i ++ )
         {
             if( i > 0 )
-                buf.appendAscii( RTL_CONSTASCII_STRINGPARAM( " AND " ) );
+                buf.append( " AND " );
             sal_Int32 index = findColumn( m_primaryKey[i] );
             bufferQuoteIdentifier( buf, m_primaryKey[i], *m_ppSettings );
-            buf.appendAscii( RTL_CONSTASCII_STRINGPARAM( " = " ) );
+            buf.append( " = " );
             bufferQuoteConstant( buf, getString( index ), *m_ppSettings );
         }
         ret = buf.makeStringAndClear();
@@ -218,9 +218,9 @@ void UpdateableResultSet::insertRow(  ) throw (SQLException, RuntimeException)
             *this, OUString(), 1, Any() );
 
     OUStringBuffer buf( 128 );
-    buf.appendAscii( RTL_CONSTASCII_STRINGPARAM( "INSERT INTO " ) );
+    buf.append( "INSERT INTO " );
     bufferQuoteQualifiedIdentifier( buf, m_schema, m_table, *m_ppSettings );
-    buf.appendAscii( RTL_CONSTASCII_STRINGPARAM( " ( " ) );
+    buf.append( " ( " );
 
     int columns = 0;
     for( UpdateableFieldVector::size_type i = 0 ; i < m_updateableField.size() ; i++ )
@@ -228,12 +228,12 @@ void UpdateableResultSet::insertRow(  ) throw (SQLException, RuntimeException)
         if( m_updateableField[i].isTouched )
         {
             if( columns > 0 )
-                buf.appendAscii( RTL_CONSTASCII_STRINGPARAM( ", " ) );
+                buf.append( ", " );
             columns ++;
             bufferQuoteIdentifier( buf, m_columnNames[i], *m_ppSettings);
         }
     }
-    buf.appendAscii( RTL_CONSTASCII_STRINGPARAM( " ) VALUES ( " ) );
+    buf.append( " ) VALUES ( " );
 
     columns = 0;
     for( UpdateableFieldVector::size_type i = 0 ; i < m_updateableField.size() ; i ++ )
@@ -241,7 +241,7 @@ void UpdateableResultSet::insertRow(  ) throw (SQLException, RuntimeException)
         if( m_updateableField[i].isTouched )
         {
             if( columns > 0 )
-                buf.appendAscii( RTL_CONSTASCII_STRINGPARAM( " , " ) );
+                buf.append( " , " );
             columns ++;
             bufferQuoteAnyConstant( buf, m_updateableField[i].value, *m_ppSettings );
 
@@ -252,7 +252,7 @@ void UpdateableResultSet::insertRow(  ) throw (SQLException, RuntimeException)
         }
     }
 
-    buf.appendAscii( RTL_CONSTASCII_STRINGPARAM( " )" ) );
+    buf.append( " )" );
 
     Reference< XStatement > stmt =
         extractConnectionFromStatement(m_owner)->createStatement();
@@ -312,9 +312,9 @@ void UpdateableResultSet::updateRow(  ) throw (SQLException, RuntimeException)
             *this, OUString(), 1, Any() );
 
     OUStringBuffer buf( 128 );
-    buf.appendAscii( RTL_CONSTASCII_STRINGPARAM( "UPDATE " ) );
+    buf.append( "UPDATE " );
     bufferQuoteQualifiedIdentifier( buf, m_schema, m_table, *m_ppSettings );
-    buf.appendAscii( RTL_CONSTASCII_STRINGPARAM( "SET " ) );
+    buf.append( "SET " );
 
     int columns = 0;
     for( UpdateableFieldVector::size_type i = 0; i < m_updateableField.size() ; i ++ )
@@ -322,11 +322,11 @@ void UpdateableResultSet::updateRow(  ) throw (SQLException, RuntimeException)
         if( m_updateableField[i].isTouched )
         {
             if( columns > 0 )
-                buf.appendAscii( RTL_CONSTASCII_STRINGPARAM( ", " ) );
+                buf.append( ", " );
             columns ++;
 
             buf.append( m_columnNames[i] );
-            buf.appendAscii( RTL_CONSTASCII_STRINGPARAM(" = " ) );
+            buf.append( " = " );
             bufferQuoteAnyConstant( buf, m_updateableField[i].value, *m_ppSettings );
 //             OUString val;
 //             m_updateableField[i].value >>= val;
diff --git a/connectivity/source/drivers/postgresql/pq_xcolumns.cxx b/connectivity/source/drivers/postgresql/pq_xcolumns.cxx
index c1f2d4e14cc6..a3dccb4fc55f 100644
--- a/connectivity/source/drivers/postgresql/pq_xcolumns.cxx
+++ b/connectivity/source/drivers/postgresql/pq_xcolumns.cxx
@@ -271,9 +271,9 @@ OUString columnMetaData2SDBCX(
 //         OUStringBuffer buf( 128 );
 //         OUString comment;
 //         evt.NewValue >>= comment;
-//         buf.appendAscii( RTL_CONSTASCII_STRINGPARAM( "COMMENT ON COLUMN" ) );
+//         buf.append( "COMMENT ON COLUMN" );
 //         bufferQuoteQualifiedIdentifier( buf, m_schema, m_table , m_column );
-//         buf.appendAscii( RTL_CONSTASCII_STRINGPARAM( "IS " ) );
+//         buf.append( "IS " );
 //         bufferQuoteConstant( buf, comment,m_pSettings->encoding);
 
 //         printf( "changing comment of column %s to %s\n",
@@ -362,11 +362,11 @@ void alterColumnByDescriptor(
 //         past->getPropertyValue( st.SCHEMA_NAME ) != future->getPropertyValue( st.SCHEMA_NAME ))
 //     {
 //         OUStringBuffer buf(128);
-//         buf.appendAscii( RTL_CONSTASCII_STRINGPARAM( "Can't move column " ) );
+//         buf.append( "Can't move column " );
 //         buf.append( extractStringProperty( past, st.COLUMN_NAME ) );
-//         buf.appendAscii( RTL_CONSTASCII_STRINGPARAM( " from table " ) );
+//         buf.append( " from table " );
 //         buf.append( extractStringProperty( past, st.TABLE_NAME ) );
-//         buf.appendAscii( RTL_CONSTASCII_STRINGPARAM( " to table " ) );
+//         buf.append( " to table " );
 //         buf.append( extractStringProperty( past, st.TABLE_NAME ) );
 //         throw SQLException( buf.makeStringAndClear(), Reference< XInterface > () );
 //     }
@@ -384,9 +384,9 @@ void alterColumnByDescriptor(
     if( ! pastColumnName.getLength())
     {
         // create a new column
-        buf.appendAscii( RTL_CONSTASCII_STRINGPARAM( "ALTER TABLE" ) );
+        buf.append( "ALTER TABLE" );
         bufferQuoteQualifiedIdentifier( buf, schemaName, tableName, settings );
-        buf.appendAscii( RTL_CONSTASCII_STRINGPARAM( "ADD COLUMN" ) );
+        buf.append( "ADD COLUMN" );
         bufferQuoteIdentifier( buf, futureColumnName, settings );
         buf.append( futureTypeName );
         transaction.executeUpdate( buf.makeStringAndClear() );
@@ -402,11 +402,11 @@ void alterColumnByDescriptor(
 
         if( pastColumnName != futureColumnName )
         {
-            buf.appendAscii( RTL_CONSTASCII_STRINGPARAM( "ALTER TABLE" ) );
+            buf.append( "ALTER TABLE" );
             bufferQuoteQualifiedIdentifier( buf, schemaName, tableName, settings );
-            buf.appendAscii( RTL_CONSTASCII_STRINGPARAM( "RENAME COLUMN" ) );
+            buf.append( "RENAME COLUMN" );
             bufferQuoteIdentifier( buf, pastColumnName, settings );
-            buf.appendAscii( RTL_CONSTASCII_STRINGPARAM( "TO" ) );
+            buf.append( "TO" );
             bufferQuoteIdentifier( buf, futureColumnName, settings );
             transaction.executeUpdate( buf.makeStringAndClear() );
         }
@@ -417,11 +417,11 @@ void alterColumnByDescriptor(
     if( futureDefaultValue != pastDefaultValue )
     {
         buf = OUStringBuffer( 128 );
-        buf.appendAscii( RTL_CONSTASCII_STRINGPARAM( "ALTER TABLE" ) );
+        buf.append( "ALTER TABLE" );
         bufferQuoteQualifiedIdentifier( buf, schemaName, tableName, settings );
-        buf.appendAscii( RTL_CONSTASCII_STRINGPARAM( "ALTER COLUMN" ) );
+        buf.append( "ALTER COLUMN" );
         bufferQuoteIdentifier( buf, futureColumnName, settings );
-        buf.appendAscii( RTL_CONSTASCII_STRINGPARAM( "SET DEFAULT " ) );
+        buf.append( "SET DEFAULT " );
         // LEM TODO: check out
         // default value is not quoted, caller needs to quote himself (otherwise
         // how to pass e.g. nextval('something' ) ????
@@ -435,19 +435,19 @@ void alterColumnByDescriptor(
     if( futureNullable != pastNullable )
     {
         buf = OUStringBuffer( 128 );
-        buf.appendAscii( RTL_CONSTASCII_STRINGPARAM( "ALTER TABLE" ) );
+        buf.append( "ALTER TABLE" );
         bufferQuoteQualifiedIdentifier( buf, schemaName, tableName, settings );
-        buf.appendAscii( RTL_CONSTASCII_STRINGPARAM( "ALTER COLUMN" ) );
+        buf.append( "ALTER COLUMN" );
         bufferQuoteIdentifier( buf, futureColumnName, settings );
         if( futureNullable == com::sun::star::sdbc::ColumnValue::NO_NULLS )
         {
-            buf.appendAscii( RTL_CONSTASCII_STRINGPARAM( "SET" ) );
+            buf.append( "SET" );
         }
         else
         {
-            buf.appendAscii( RTL_CONSTASCII_STRINGPARAM( "DROP" ) );
+            buf.append( "DROP" );
         }
-        buf.appendAscii( RTL_CONSTASCII_STRINGPARAM( " NOT NULL" ) );
+        buf.append( " NOT NULL" );
         transaction.executeUpdate( buf.makeStringAndClear() );
     }
 
@@ -462,9 +462,9 @@ void alterColumnByDescriptor(
     if( futureComment != pastComment )
     {
         buf = OUStringBuffer( 128 );
-        buf.appendAscii( RTL_CONSTASCII_STRINGPARAM( "COMMENT ON COLUMN" ) );
+        buf.append( "COMMENT ON COLUMN" );
         bufferQuoteQualifiedIdentifier( buf, schemaName, tableName , futureColumnName, settings );
-        buf.appendAscii( RTL_CONSTASCII_STRINGPARAM( "IS " ) );
+        buf.append( "IS " );
         bufferQuoteConstant( buf, futureComment, settings );
         transaction.executeUpdate( buf.makeStringAndClear() );
     }
diff --git a/connectivity/source/drivers/postgresql/pq_xindexes.cxx b/connectivity/source/drivers/postgresql/pq_xindexes.cxx
index 5366230e46b0..5393b480da1c 100644
--- a/connectivity/source/drivers/postgresql/pq_xindexes.cxx
+++ b/connectivity/source/drivers/postgresql/pq_xindexes.cxx
@@ -209,15 +209,15 @@ void Indexes::appendByDescriptor(
 
     OUStringBuffer buf( 128 );
 
-    buf.appendAscii( RTL_CONSTASCII_STRINGPARAM( "CREATE " ) );
+    buf.append( "CREATE " );
     if( isUnique )
-        buf.appendAscii( RTL_CONSTASCII_STRINGPARAM( "UNIQUE " ) );
-    buf.appendAscii( RTL_CONSTASCII_STRINGPARAM( "INDEX " ) );
+        buf.append( "UNIQUE " );
+    buf.append( "INDEX " );
     bufferQuoteIdentifier( buf, name, m_pSettings );
-    buf.appendAscii( RTL_CONSTASCII_STRINGPARAM( " ON " ) );
+    buf.append( " ON " );
     bufferQuoteQualifiedIdentifier( buf, m_schemaName, m_tableName, m_pSettings );
 
-    buf.appendAscii( RTL_CONSTASCII_STRINGPARAM( " ( " ) );
+    buf.append( " ( " );
 
     Reference< XColumnsSupplier > columns( descriptor, UNO_QUERY );
     if( columns.is() )
@@ -236,13 +236,13 @@ void Indexes::appendByDescriptor(
                 }
                 else
                 {
-                    buf.appendAscii( RTL_CONSTASCII_STRINGPARAM( ", " ) );
+                    buf.append( ", " );
                 }
                 buf.append( extractStringProperty( column, st.NAME ) );
             }
         }
     }
-    buf.appendAscii( RTL_CONSTASCII_STRINGPARAM( " ) " ) );
+    buf.append( " ) " );
 
     m_origin->createStatement()->executeUpdate( buf.makeStringAndClear() );
     refresh();
@@ -273,7 +273,7 @@ void Indexes::dropByIndex( sal_Int32 index )
     Statics &st = getStatics();
 
     OUStringBuffer buf( 128 );
-    buf.appendAscii( RTL_CONSTASCII_STRINGPARAM( "DROP INDEX " ) );
+    buf.append( "DROP INDEX " );
     bufferQuoteIdentifier( buf, extractStringProperty( set, st.NAME ), m_pSettings );
     m_origin->createStatement()->executeUpdate( buf.makeStringAndClear() );
 
diff --git a/connectivity/source/drivers/postgresql/pq_xkeycolumns.cxx b/connectivity/source/drivers/postgresql/pq_xkeycolumns.cxx
index 4e062df79cc0..406b9b6e5425 100644
--- a/connectivity/source/drivers/postgresql/pq_xkeycolumns.cxx
+++ b/connectivity/source/drivers/postgresql/pq_xkeycolumns.cxx
@@ -183,11 +183,11 @@ void KeyColumns::refresh()
 // //         past->getPropertyValue( st.SCHEMA_NAME ) != future->getPropertyValue( st.SCHEMA_NAME ))
 // //     {
 // //         OUStringBuffer buf(128);
-// //         buf.appendAscii( RTL_CONSTASCII_STRINGPARAM( "Can't move column " ) );
+// //         buf.append( "Can't move column " );
 // //         buf.append( extractStringProperty( past, st.COLUMN_NAME ) );
-// //         buf.appendAscii( RTL_CONSTASCII_STRINGPARAM( " from table " ) );
+// //         buf.append( " from table " );
 // //         buf.append( extractStringProperty( past, st.TABLE_NAME ) );
-// //         buf.appendAscii( RTL_CONSTASCII_STRINGPARAM( " to table " ) );
+// //         buf.append( " to table " );
 // //         buf.append( extractStringProperty( past, st.TABLE_NAME ) );
 // //         throw SQLException( buf.makeStringAndClear(), Reference< XInterface > () );
 // //     }
@@ -205,9 +205,9 @@ void KeyColumns::refresh()
 //     if( ! pastColumnName.getLength())
 //     {
 //         // create a new column
-//         buf.appendAscii( RTL_CONSTASCII_STRINGPARAM( "ALTER TABLE" ) );
+//         buf.append( "ALTER TABLE" );
 //         bufferQuoteQualifiedIdentifier( buf, schemaName, tableName );
-//         buf.appendAscii( RTL_CONSTASCII_STRINGPARAM( "ADD COLUMN" ) );
+//         buf.append( "ADD COLUMN" );
 //         bufferQuoteIdentifier( buf, futureColumnName );
 //         buf.append( futureTypeName );
 //         transaction.executeUpdate( buf.makeStringAndClear() );
@@ -223,11 +223,11 @@ void KeyColumns::refresh()
 
 //         if( pastColumnName != futureColumnName )
 //         {
-//             buf.appendAscii( RTL_CONSTASCII_STRINGPARAM( "ALTER TABLE" ) );
+//             buf.append( "ALTER TABLE" );
 //             bufferQuoteQualifiedIdentifier( buf, schemaName, tableName );
-//             buf.appendAscii( RTL_CONSTASCII_STRINGPARAM( "RENAME COLUMN" ) );
+//             buf.append( "RENAME COLUMN" );
 //             bufferQuoteIdentifier( buf, pastColumnName );
-//             buf.appendAscii( RTL_CONSTASCII_STRINGPARAM( "TO" ) );
+//             buf.append( "TO" );
 //             bufferQuoteIdentifier( buf, futureColumnName );
 //             transaction.executeUpdate( buf.makeStringAndClear() );
 //         }
@@ -238,11 +238,11 @@ void KeyColumns::refresh()
 //     if( futureDefaultValue != pastDefaultValue )
 //     {
 //         buf = OUStringBuffer( 128 );
-//         buf.appendAscii( RTL_CONSTASCII_STRINGPARAM( "ALTER TABLE" ) );
+//         buf.append( "ALTER TABLE" );
 //         bufferQuoteQualifiedIdentifier( buf, schemaName, tableName );
-//         buf.appendAscii( RTL_CONSTASCII_STRINGPARAM( "ALTER COLUMN" ) );
+//         buf.append( "ALTER COLUMN" );
 //         bufferQuoteIdentifier( buf, futureColumnName );
-//         buf.appendAscii( RTL_CONSTASCII_STRINGPARAM( "SET DEFAULT " ) );
+//         buf.append( "SET DEFAULT " );
 //         // default value is not quoted, caller needs to quote himself (otherwise
 //         // how to pass e.g. nextval('something' ) ????
 //         buf.append( futureDefaultValue );
@@ -255,19 +255,19 @@ void KeyColumns::refresh()
 //     if( futureNullable != pastNullable )
 //     {
 //         buf = OUStringBuffer( 128 );
-//         buf.appendAscii( RTL_CONSTASCII_STRINGPARAM( "ALTER TABLE" ) );
+//         buf.append( "ALTER TABLE" );
 //         bufferQuoteQualifiedIdentifier( buf, schemaName, tableName );
-//         buf.appendAscii( RTL_CONSTASCII_STRINGPARAM( "ALTER COLUMN" ) );
+//         buf.append( "ALTER COLUMN" );
 //         bufferQuoteIdentifier( buf, futureColumnName );
 //         if( futureNullable == com::sun::star::sdbc::ColumnValue::NO_NULLS )
 //         {
-//             buf.appendAscii( RTL_CONSTASCII_STRINGPARAM( "SET" ) );
+//             buf.append( "SET" );
 //         }
 //         else
 //         {
-//             buf.appendAscii( RTL_CONSTASCII_STRINGPARAM( "DROP" ) );
+//             buf.append( "DROP" );
 //         }
-//         buf.appendAscii( RTL_CONSTASCII_STRINGPARAM( " NOT NULL" ) );
+//         buf.append( " NOT NULL" );
 //         transaction.executeUpdate( buf.makeStringAndClear() );
 //     }
 
@@ -276,9 +276,9 @@ void KeyColumns::refresh()
 //     if( futureComment != pastComment )
 //     {
 //         buf = OUStringBuffer( 128 );
-//         buf.appendAscii( RTL_CONSTASCII_STRINGPARAM( "COMMENT ON COLUMN" ) );
+//         buf.append( "COMMENT ON COLUMN" );
 //         bufferQuoteQualifiedIdentifier( buf, schemaName, tableName , futureColumnName );
-//         buf.appendAscii( RTL_CONSTASCII_STRINGPARAM( "IS " ) );
+//         buf.append( "IS " );
 //         bufferQuoteConstant( buf, futureComment,encoding);
 //         transaction.executeUpdate( buf.makeStringAndClear() );
 //     }
diff --git a/cppu/source/cppu/cppu_opt.cxx b/cppu/source/cppu/cppu_opt.cxx
index a057b5f2a7ec..785928c8a3ad 100644
--- a/cppu/source/cppu/cppu_opt.cxx
+++ b/cppu/source/cppu/cppu_opt.cxx
@@ -31,7 +31,7 @@ extern "C" CPPU_DLLPUBLIC rtl_uString * SAL_CALL cppu_unsatisfied_iquery_msg(
     SAL_THROW_EXTERN_C()
 {
     OUStringBuffer buf( 64 );
-    buf.appendAscii( RTL_CONSTASCII_STRINGPARAM("unsatisfied query for interface of type ") );
+    buf.append( "unsatisfied query for interface of type " );
     buf.append( OUString::unacquired( &pType->pTypeName ) );
     buf.append( (sal_Unicode) '!' );
     OUString ret( buf.makeStringAndClear() );
@@ -45,7 +45,7 @@ extern "C" CPPU_DLLPUBLIC rtl_uString * SAL_CALL cppu_unsatisfied_iset_msg(
     SAL_THROW_EXTERN_C()
 {
     OUStringBuffer buf( 64 );
-    buf.appendAscii( RTL_CONSTASCII_STRINGPARAM("invalid attempt to assign an empty interface of type ") );
+    buf.append( "invalid attempt to assign an empty interface of type " );
     buf.append( OUString::unacquired( &pType->pTypeName ) );
     buf.append( (sal_Unicode) '!' );
     OUString ret( buf.makeStringAndClear() );
@@ -59,10 +59,9 @@ extern "C" CPPU_DLLPUBLIC rtl_uString * SAL_CALL cppu_Any_extraction_failure_msg
     SAL_THROW_EXTERN_C()
 {
     OUStringBuffer buf;
-    buf.appendAscii( RTL_CONSTASCII_STRINGPARAM(
-                         "Cannot extract an Any(") );
+    buf.append( "Cannot extract an Any(" );
     buf.append( OUString::unacquired(&pAny->pType->pTypeName) );
-    buf.appendAscii( RTL_CONSTASCII_STRINGPARAM(") to ") );
+    buf.append( ") to " );
     buf.append( OUString::unacquired(&pType->pTypeName) );
     buf.append( static_cast<sal_Unicode>('!') );
     const OUString ret( buf.makeStringAndClear() );
diff --git a/cppu/source/typelib/typelib.cxx b/cppu/source/typelib/typelib.cxx
index d2f9aee5f6fc..46bc91935d29 100644
--- a/cppu/source/typelib/typelib.cxx
+++ b/cppu/source/typelib/typelib.cxx
@@ -1199,7 +1199,7 @@ extern "C" CPPU_DLLPUBLIC void SAL_CALL typelib_typedescription_newMIInterface(
                 typelib_TypeDescriptionReference const * pDirectBaseMember
                     = pDirectBase->ppAllMembers[i->directBaseMemberOffset + j];
                 rtl::OUStringBuffer aBuf(pDirectBaseMember->pTypeName);
-                aBuf.appendAscii(RTL_CONSTASCII_STRINGPARAM(":@"));
+                aBuf.append(":@");
                 aBuf.append(i->directBaseIndex);
                 aBuf.append(static_cast< sal_Unicode >(','));
                 aBuf.append(i->memberOffset + j);
diff --git a/cppu/source/uno/data.cxx b/cppu/source/uno/data.cxx
index 9619dbf61de1..f6f7b1e013ae 100644
--- a/cppu/source/uno/data.cxx
+++ b/cppu/source/uno/data.cxx
@@ -97,12 +97,11 @@ void * binuno_queryInterface( void * pUnoI, typelib_TypeDescriptionReference * p
     {
 #if OSL_DEBUG_LEVEL > 1
         OUStringBuffer buf( 128 );
-        buf.appendAscii(
-            RTL_CONSTASCII_STRINGPARAM("### exception occurred querying for interface ") );
+        buf.append( "### exception occurred querying for interface " );
         buf.append( * reinterpret_cast< OUString const * >( &pDestType->pTypeName ) );
-        buf.appendAscii( RTL_CONSTASCII_STRINGPARAM(": [") );
+        buf.append( ": [" );
         buf.append( * reinterpret_cast< OUString const * >( &pExc->pType->pTypeName ) );
-        buf.appendAscii( RTL_CONSTASCII_STRINGPARAM("] ") );
+        buf.append( "] " );
         // Message is very first member
         buf.append( * reinterpret_cast< OUString const * >( pExc->pData ) );
         OString cstr(
diff --git a/cppu/source/uno/lbenv.cxx b/cppu/source/uno/lbenv.cxx
index 1390e56536eb..04dfa2d056bd 100644
--- a/cppu/source/uno/lbenv.cxx
+++ b/cppu/source/uno/lbenv.cxx
@@ -718,7 +718,7 @@ extern "C" CPPU_DLLPUBLIC void SAL_CALL uno_dumpEnvironment(
     {
         writeLine( stream, "###################################"
                    "###########################################", pFilter );
-        buf.appendAscii( RTL_CONSTASCII_STRINGPARAM("environment: ") );
+        buf.append( "environment: " );
         buf.append( pEnv->pTypeName );
         writeLine( stream, buf.makeStringAndClear(), pFilter );
         writeLine( stream, "NO INTERFACE INFORMATION AVAILABLE!", pFilter );
@@ -727,7 +727,7 @@ extern "C" CPPU_DLLPUBLIC void SAL_CALL uno_dumpEnvironment(
 
     writeLine( stream, "########################################"
                "######################################", pFilter );
-    buf.appendAscii( RTL_CONSTASCII_STRINGPARAM("environment dump: ") );
+    buf.append( "environment dump: " );
     buf.append( pEnv->pTypeName );
     writeLine( stream, buf.makeStringAndClear(), pFilter );
 
@@ -741,12 +741,12 @@ extern "C" CPPU_DLLPUBLIC void SAL_CALL uno_dumpEnvironment(
     {
         ObjectEntry * pOEntry = iPos->second;
 
-        buf.appendAscii( RTL_CONSTASCII_STRINGPARAM("+ ") );
+        buf.append( "+ " );
         if (pOEntry->mixedObject)
-            buf.appendAscii( RTL_CONSTASCII_STRINGPARAM("mixed ") );
-        buf.appendAscii( RTL_CONSTASCII_STRINGPARAM("object entry: nRef=") );
+            buf.append( "mixed " );
+        buf.append( "object entry: nRef=" );
         buf.append( pOEntry->nRef, 10 );
-        buf.appendAscii( RTL_CONSTASCII_STRINGPARAM("; oid=\"") );
+        buf.append( "; oid=\"" );
         buf.append( pOEntry->oid );
         buf.append( (sal_Unicode) '\"' );
         writeLine( stream, buf.makeStringAndClear(), pFilter );
@@ -756,21 +756,20 @@ extern "C" CPPU_DLLPUBLIC void SAL_CALL uno_dumpEnvironment(
         {
             const InterfaceEntry & rIEntry = pOEntry->aInterfaces[nPos];
 
-            buf.appendAscii( RTL_CONSTASCII_STRINGPARAM("  - ") );
+            buf.append( "  - " );
             buf.append(
                 ((typelib_TypeDescription *) rIEntry.pTypeDescr)->pTypeName );
             if (rIEntry.fpFreeProxy)
             {
-                buf.appendAscii(
-                    RTL_CONSTASCII_STRINGPARAM("; proxy free=0x") );
+                buf.append( "; proxy free=0x" );
                 buf.append(
                     reinterpret_cast< sal_IntPtr >(rIEntry.fpFreeProxy), 16 );
             }
             else
             {
-                buf.appendAscii( RTL_CONSTASCII_STRINGPARAM("; original") );
+                buf.append( "; original" );
             }
-            buf.appendAscii( RTL_CONSTASCII_STRINGPARAM("; ptr=0x") );
+            buf.append( "; ptr=0x" );
             buf.append(
                 reinterpret_cast< sal_IntPtr >(rIEntry.pInterface), 16 );
 
@@ -779,8 +778,7 @@ extern "C" CPPU_DLLPUBLIC void SAL_CALL uno_dumpEnvironment(
                 ::std::size_t erased = ptr2obj.erase( rIEntry.pInterface );
                 if (erased != 1)
                 {
-                    buf.appendAscii( RTL_CONSTASCII_STRINGPARAM(
-                                         " (ptr not found in map!)") );
+                    buf.append( " (ptr not found in map!)" );
                 }
             }
             writeLine( stream, buf.makeStringAndClear(), pFilter );
@@ -808,9 +806,9 @@ extern "C" CPPU_DLLPUBLIC void SAL_CALL uno_dumpEnvironmentByName(
     else
     {
         ::rtl::OUStringBuffer buf( 32 );
-        buf.appendAscii( RTL_CONSTASCII_STRINGPARAM("environment \"") );
+        buf.append( "environment \"" );
         buf.append( pEnvDcp );
-        buf.appendAscii( RTL_CONSTASCII_STRINGPARAM("\" does not exist!") );
+        buf.append( "\" does not exist!" );
         writeLine( stream, buf.makeStringAndClear(), pFilter );
     }
 }
@@ -825,7 +823,7 @@ namespace
         makeOIdPart()
         {
             ::rtl::OUStringBuffer aRet( 64 );
-            aRet.appendAscii( RTL_CONSTASCII_STRINGPARAM("];") );
+            aRet.append( "];" );
             // pid
             oslProcessInfo info;
             info.Size = sizeof(oslProcessInfo);
@@ -836,8 +834,7 @@ namespace
             }
             else
             {
-                aRet.appendAscii(
-                    RTL_CONSTASCII_STRINGPARAM("unknown process id") );
+                aRet.append( "unknown process id" );
             }
             // good guid
             sal_uInt8 ar[16];
@@ -1130,7 +1127,7 @@ static uno_Environment * initDefaultEnvironment(
         // late init with some code from matching uno language binding
         ::rtl::OUStringBuffer aLibName( 16 );
         aLibName.append( envTypeName );
-        aLibName.appendAscii( RTL_CONSTASCII_STRINGPARAM("_uno" ) );
+        aLibName.append( "_uno" );
         OUString aStr( aLibName.makeStringAndClear() );
 
         if (!loadEnv(aStr, pEnv))
diff --git a/cppu/source/uno/lbmap.cxx b/cppu/source/uno/lbmap.cxx
index 9c6061565061..4f281ba45c23 100644
--- a/cppu/source/uno/lbmap.cxx
+++ b/cppu/source/uno/lbmap.cxx
@@ -290,7 +290,7 @@ static inline OUString getMappingName(
     aKey.append( rFrom.getTypeName() );
     aKey.append( (sal_Unicode)'[' );
     aKey.append( reinterpret_cast< sal_IntPtr >(rFrom.get()), 16 );
-    aKey.appendAscii( RTL_CONSTASCII_STRINGPARAM("];") );
+    aKey.append( "];" );
     aKey.append( rTo.getTypeName() );
     aKey.append( (sal_Unicode)'[' );
     aKey.append( reinterpret_cast< sal_IntPtr >(rTo.get()), 16 );
diff --git a/cppu/source/uno/loadmodule.cxx b/cppu/source/uno/loadmodule.cxx
index 9271a89e9e90..f00936d328d2 100644
--- a/cppu/source/uno/loadmodule.cxx
+++ b/cppu/source/uno/loadmodule.cxx
@@ -34,10 +34,10 @@ namespace cppu { namespace detail {
 ::oslModule loadModule(rtl::OUString const & name) {
     rtl::OUStringBuffer b;
 #if defined SAL_DLLPREFIX
-    b.appendAscii(RTL_CONSTASCII_STRINGPARAM(SAL_DLLPREFIX));
+    b.append(SAL_DLLPREFIX);
 #endif
     b.append(name);
-    b.appendAscii(RTL_CONSTASCII_STRINGPARAM(SAL_DLLEXTENSION));
+    b.append(SAL_DLLEXTENSION);
     return ::osl_loadModuleRelative(
         reinterpret_cast< oslGenericFunction >(&loadModule),
         b.makeStringAndClear().pData,
diff --git a/cui/source/options/treeopt.cxx b/cui/source/options/treeopt.cxx
index 3cfb7ff9e196..171af686a963 100644
--- a/cui/source/options/treeopt.cxx
+++ b/cui/source/options/treeopt.cxx
@@ -1154,9 +1154,9 @@ void OfaTreeOptionsDialog::SelectHdl_Impl()
 
     {
         OUStringBuffer sTitleBuf(sTitle);
-        sTitleBuf.appendAscii(RTL_CONSTASCII_STRINGPARAM(" - "));
+        sTitleBuf.append(" - ");
         sTitleBuf.append(aTreeLB.GetEntryText(pParent));
-        sTitleBuf.appendAscii(RTL_CONSTASCII_STRINGPARAM(" - "));
+        sTitleBuf.append(" - ");
         sTitleBuf.append(aTreeLB.GetEntryText(pEntry));
         SetText(sTitleBuf.makeStringAndClear());
     }
diff --git a/extensions/source/nsplugin/source/so_main.cxx b/extensions/source/nsplugin/source/so_main.cxx
index 8678f625878b..ba617ed2853b 100644
--- a/extensions/source/nsplugin/source/so_main.cxx
+++ b/extensions/source/nsplugin/source/so_main.cxx
@@ -313,9 +313,9 @@ Reference< lang::XMultiServiceFactory > SAL_CALL start_office(NSP_PIPE_FD read_f
 
         // accept string
         OSL_ASSERT( buf.isEmpty() );
-        buf.appendAscii( RTL_CONSTASCII_STRINGPARAM( "--accept=pipe,name=" ) );
+        buf.append( "--accept=pipe,name=" );
         buf.append( aPluginPipeName );    //user installation path as pipe name
-        buf.appendAscii( RTL_CONSTASCII_STRINGPARAM( ";urp;" ) );
+        buf.append( ";urp;" );
         OUString sConnectStartString( buf.makeStringAndClear() );
 
         // arguments
@@ -332,10 +332,9 @@ Reference< lang::XMultiServiceFactory > SAL_CALL start_office(NSP_PIPE_FD read_f
 
         // connection string
         OSL_ASSERT( buf.isEmpty() );
-        buf.appendAscii( RTL_CONSTASCII_STRINGPARAM( "uno:pipe,name=" ) );
+        buf.append( "uno:pipe,name=" );
         buf.append( aPluginPipeName );
-        buf.appendAscii( RTL_CONSTASCII_STRINGPARAM(
-            ";urp;StarOffice.ComponentContext" ) );
+        buf.append( ";urp;StarOffice.ComponentContext" );
         OUString sConnectString( buf.makeStringAndClear() );
 
         try
diff --git a/extensions/source/propctrlr/selectlabeldialog.cxx b/extensions/source/propctrlr/selectlabeldialog.cxx
index f4d3643b52d4..36dae6ea1fd0 100644
--- a/extensions/source/propctrlr/selectlabeldialog.cxx
+++ b/extensions/source/propctrlr/selectlabeldialog.cxx
@@ -224,7 +224,7 @@ namespace pcr
 
             OUString sDisplayName = OUStringBuffer(
                 ::comphelper::getString(xAsSet->getPropertyValue(PROPERTY_LABEL))).
-                appendAscii(RTL_CONSTASCII_STRINGPARAM(" (")).append(sName).append(')').
+                append(" (").append(sName).append(')').
                 makeStringAndClear();
 
             // all requirements met -> insert
diff --git a/framework/source/fwe/helper/titlehelper.cxx b/framework/source/fwe/helper/titlehelper.cxx
index dd301e6ad653..b7f56a1ea6de 100644
--- a/framework/source/fwe/helper/titlehelper.cxx
+++ b/framework/source/fwe/helper/titlehelper.cxx
@@ -373,7 +373,7 @@ void TitleHelper::impl_updateTitleForModel (const css::uno::Reference< css::fram
         if (nLeasedNumber != css::frame::UntitledNumbersConst::INVALID_NUMBER)
             sNewTitle.append ((::sal_Int32)nLeasedNumber);
         else
-            sNewTitle.appendAscii ("?");
+            sNewTitle.appendAscii("?");
 
         sTitle = sNewTitle.makeStringAndClear ();
     }
@@ -522,7 +522,7 @@ void TitleHelper::impl_appendProductName (OUStringBuffer& sTitle)
     if (!name.isEmpty())
     {
         if (!sTitle.isEmpty())
-            sTitle.appendAscii(RTL_CONSTASCII_STRINGPARAM(" - "));
+            sTitle.append(" - ");
         sTitle.append(name);
     }
 }
@@ -569,9 +569,9 @@ void TitleHelper::impl_appendDebugVersion (OUStringBuffer& sTitle)
     sTitle.append(version);
     OUString sDefault("development");
     OUString sVersion = ::utl::Bootstrap::getBuildIdData(sDefault);
-    sTitle.appendAscii(RTL_CONSTASCII_STRINGPARAM(" ["));
+    sTitle.append(" [");
     sTitle.append(sVersion);
-    sTitle.appendAscii(RTL_CONSTASCII_STRINGPARAM("]"));
+    sTitle.append("]");
 }
 #else
 void TitleHelper::impl_appendDebugVersion (OUStringBuffer&)
diff --git a/framework/source/services/autorecovery.cxx b/framework/source/services/autorecovery.cxx
index 1106f84615b8..75595d96d21b 100644
--- a/framework/source/services/autorecovery.cxx
+++ b/framework/source/services/autorecovery.cxx
@@ -1250,7 +1250,7 @@ void AutoRecovery::implts_flushConfigItem(const AutoRecovery::TDocumentInfo& rIn
         css::uno::Reference< css::lang::XSingleServiceFactory > xCreate(xCheck, css::uno::UNO_QUERY_THROW);
 
         OUStringBuffer sIDBuf;
-        sIDBuf.appendAscii(RTL_CONSTASCII_STRINGPARAM(RECOVERY_ITEM_BASE_IDENTIFIER));
+        sIDBuf.append(RECOVERY_ITEM_BASE_IDENTIFIER);
         sIDBuf.append((sal_Int32)rInfo.ID);
         OUString sID = sIDBuf.makeStringAndClear();
 
@@ -2813,7 +2813,7 @@ OUString AutoRecovery::implst_getJobDescription(sal_Int32 eJob)
 {
     // describe the current running operation
     OUStringBuffer sFeature(256);
-    sFeature.appendAscii(RTL_CONSTASCII_STRINGPARAM(CMD_PROTOCOL));
+    sFeature.append(CMD_PROTOCOL);
 
     // Attention: Because "eJob" is used as a flag field the order of checking these
     // flags is important. We must preferr job with higher priorities!
@@ -2822,23 +2822,23 @@ OUString AutoRecovery::implst_getJobDescription(sal_Int32 eJob)
     // e.g. PrepareEmergencySave must be done before EmergencySave is started of course.
 
     if ((eJob & AutoRecovery::E_PREPARE_EMERGENCY_SAVE) == AutoRecovery::E_PREPARE_EMERGENCY_SAVE)
-        sFeature.appendAscii(RTL_CONSTASCII_STRINGPARAM(CMD_DO_PREPARE_EMERGENCY_SAVE));
+        sFeature.append(CMD_DO_PREPARE_EMERGENCY_SAVE);
     else if ((eJob & AutoRecovery::E_EMERGENCY_SAVE) == AutoRecovery::E_EMERGENCY_SAVE)
-        sFeature.appendAscii(RTL_CONSTASCII_STRINGPARAM(CMD_DO_EMERGENCY_SAVE));
+        sFeature.append(CMD_DO_EMERGENCY_SAVE);
     else if ((eJob & AutoRecovery::E_RECOVERY) == AutoRecovery::E_RECOVERY)
-        sFeature.appendAscii(RTL_CONSTASCII_STRINGPARAM(CMD_DO_RECOVERY));
+        sFeature.append(CMD_DO_RECOVERY);
     else if ((eJob & AutoRecovery::E_SESSION_SAVE) == AutoRecovery::E_SESSION_SAVE)
-        sFeature.appendAscii(RTL_CONSTASCII_STRINGPARAM(CMD_DO_SESSION_SAVE));
+        sFeature.append(CMD_DO_SESSION_SAVE);
     else if ((eJob & AutoRecovery::E_SESSION_QUIET_QUIT) == AutoRecovery::E_SESSION_QUIET_QUIT)
-        sFeature.appendAscii(RTL_CONSTASCII_STRINGPARAM(CMD_DO_SESSION_QUIET_QUIT));
+        sFeature.append(CMD_DO_SESSION_QUIET_QUIT);
     else if ((eJob & AutoRecovery::E_SESSION_RESTORE) == AutoRecovery::E_SESSION_RESTORE)
-        sFeature.appendAscii(RTL_CONSTASCII_STRINGPARAM(CMD_DO_SESSION_RESTORE));
+        sFeature.append(CMD_DO_SESSION_RESTORE);
     else if ((eJob & AutoRecovery::E_ENTRY_BACKUP) == AutoRecovery::E_ENTRY_BACKUP)
-        sFeature.appendAscii(RTL_CONSTASCII_STRINGPARAM(CMD_DO_ENTRY_BACKUP));
+        sFeature.append(CMD_DO_ENTRY_BACKUP);
     else if ((eJob & AutoRecovery::E_ENTRY_CLEANUP) == AutoRecovery::E_ENTRY_CLEANUP)
-        sFeature.appendAscii(RTL_CONSTASCII_STRINGPARAM(CMD_DO_ENTRY_CLEANUP));
+        sFeature.append(CMD_DO_ENTRY_CLEANUP);
     else if ((eJob & AutoRecovery::E_AUTO_SAVE) == AutoRecovery::E_AUTO_SAVE)
-        sFeature.appendAscii(RTL_CONSTASCII_STRINGPARAM(CMD_DO_AUTO_SAVE));
+        sFeature.append(CMD_DO_AUTO_SAVE);
     else if ( eJob != AutoRecovery::E_NO_JOB )
         SAL_INFO("fwk", "AutoRecovery::implst_getJobDescription(): Invalid job identifier detected.");
 
diff --git a/framework/source/uielement/langselectionstatusbarcontroller.cxx b/framework/source/uielement/langselectionstatusbarcontroller.cxx
index 095cca7b095f..f8f3a025f4d8 100644
--- a/framework/source/uielement/langselectionstatusbarcontroller.cxx
+++ b/framework/source/uielement/langselectionstatusbarcontroller.cxx
@@ -193,43 +193,43 @@ throw (::com::sun::star::uno::RuntimeException)
 
         if (MID_LANG_SEL_1 <= nId && nId <= MID_LANG_SEL_9)
         {
-            aBuff.appendAscii( RTL_CONSTASCII_STRINGPARAM( (".uno:LanguageStatus?Language:string=Current_") ));
+            aBuff.append( ".uno:LanguageStatus?Language:string=Current_" );
             aBuff.append( aSelectedLang );
         }
         else if (nId == MID_LANG_SEL_NONE)
         {
             //set None as current language for selection
-            aBuff.appendAscii( RTL_CONSTASCII_STRINGPARAM( (".uno:LanguageStatus?Language:string=Current_LANGUAGE_NONE") ));
+            aBuff.append( ".uno:LanguageStatus?Language:string=Current_LANGUAGE_NONE" );
         }
         else if (nId == MID_LANG_SEL_RESET)
         {
             // reset language attributes for selection
-            aBuff.appendAscii( RTL_CONSTASCII_STRINGPARAM( (".uno:LanguageStatus?Language:string=Current_RESET_LANGUAGES") ));
+            aBuff.append( ".uno:LanguageStatus?Language:string=Current_RESET_LANGUAGES" );
         }
         else if (nId == MID_LANG_SEL_MORE)
         {
             //open the dialog "format/character" for current selection
-            aBuff.appendAscii( RTL_CONSTASCII_STRINGPARAM( (".uno:FontDialog?Language:string=*") ));
+            aBuff.append( ".uno:FontDialog?Language:string=*" );
         }
         else if (MID_LANG_PARA_1 <= nId && nId <= MID_LANG_PARA_9)
         {
-            aBuff.appendAscii( RTL_CONSTASCII_STRINGPARAM( (".uno:LanguageStatus?Language:string=Paragraph_") ));
+            aBuff.append( ".uno:LanguageStatus?Language:string=Paragraph_" );
             aBuff.append( aSelectedLang );
         }
         else if (nId == MID_LANG_PARA_NONE)
         {
             //set None as language for current paragraph
-            aBuff.appendAscii( RTL_CONSTASCII_STRINGPARAM( (".uno:LanguageStatus?Language:string=Paragraph_LANGUAGE_NONE") ));
+            aBuff.append( ".uno:LanguageStatus?Language:string=Paragraph_LANGUAGE_NONE" );
         }
         else if (nId == MID_LANG_PARA_RESET)
         {
             // reset language attributes for paragraph
-            aBuff.appendAscii( RTL_CONSTASCII_STRINGPARAM( (".uno:LanguageStatus?Language:string=Paragraph_RESET_LANGUAGES") ));
+            aBuff.append( ".uno:LanguageStatus?Language:string=Paragraph_RESET_LANGUAGES" );
         }
         else if (nId == MID_LANG_PARA_MORE)
         {
             //open the dialog "format/character" for current paragraph
-            aBuff.appendAscii( RTL_CONSTASCII_STRINGPARAM( (".uno:FontDialogForParagraph") ));
+            aBuff.append( ".uno:FontDialogForParagraph" );
         }
 
         const Sequence< beans::PropertyValue > aDummyArgs;
diff --git a/framework/source/uielement/popuptoolbarcontroller.cxx b/framework/source/uielement/popuptoolbarcontroller.cxx
index 03b1fce4c931..e2ac700d38ab 100644
--- a/framework/source/uielement/popuptoolbarcontroller.cxx
+++ b/framework/source/uielement/popuptoolbarcontroller.cxx
@@ -386,7 +386,7 @@ static sal_Bool Impl_ExistURLInMenu(
     if ( !bValidFallback )
     {
         OUStringBuffer aBuffer;
-        aBuffer.appendAscii( RTL_CONSTASCII_STRINGPARAM( "private:factory/" ) );
+        aBuffer.append( "private:factory/" );
         aBuffer.append( SvtModuleOptions().GetDefaultModuleName() );
         sFallback = aBuffer.makeStringAndClear();
     }
diff --git a/framework/source/uielement/recentfilesmenucontroller.cxx b/framework/source/uielement/recentfilesmenucontroller.cxx
index 52b3ed69ebce..586a9af7dcf0 100644
--- a/framework/source/uielement/recentfilesmenucontroller.cxx
+++ b/framework/source/uielement/recentfilesmenucontroller.cxx
@@ -145,7 +145,7 @@ void RecentFilesMenuController::fillPopupMenu( Reference< css::awt::XPopupMenu >
                 }
 
                 OUStringBuffer aStrBuffer;
-                aStrBuffer.appendAscii( RTL_CONSTASCII_STRINGPARAM( CMD_PREFIX ) );
+                aStrBuffer.append( CMD_PREFIX );
                 aStrBuffer.append( sal_Int32( i ) );
                 OUString  aURLString( aStrBuffer.makeStringAndClear() );
 
diff --git a/helpcompiler/source/HelpIndexer.cxx b/helpcompiler/source/HelpIndexer.cxx
index 2a07f70ef28a..28833be49db9 100644
--- a/helpcompiler/source/HelpIndexer.cxx
+++ b/helpcompiler/source/HelpIndexer.cxx
@@ -26,9 +26,9 @@ HelpIndexer::HelpIndexer(OUString const &lang, OUString const &module,
     : d_lang(lang), d_module(module)
 {
     d_indexDir = OUStringBuffer(outDir).append('/').
-        append(module).appendAscii(RTL_CONSTASCII_STRINGPARAM(".idxl")).toString();
-    d_captionDir = srcDir + OUString("/caption");
-    d_contentDir = srcDir + OUString("/content");
+        append(module).append(".idxl").makeStringAndClear();
+    d_captionDir = srcDir + "/caption";
+    d_contentDir = srcDir + "/content";
 }
 
 bool HelpIndexer::indexDocuments()
diff --git a/sal/qa/rtl/bootstrap/rtl_Bootstrap.cxx b/sal/qa/rtl/bootstrap/rtl_Bootstrap.cxx
index 55353039144f..281ba2ce4a75 100644
--- a/sal/qa/rtl/bootstrap/rtl_Bootstrap.cxx
+++ b/sal/qa/rtl/bootstrap/rtl_Bootstrap.cxx
@@ -694,7 +694,7 @@ namespace rtl_Bootstrap
 
         void testSection() {
             rtl::OUStringBuffer b;
-            b.appendAscii(RTL_CONSTASCII_STRINGPARAM("${"));
+            b.append("${");
             rtl::OUString p(t_getSourcePath(TESTSHL2_INI));
             for (sal_Int32 i = 0; i < p.getLength(); ++i) {
                 if (p[i] != 'u') {
@@ -702,7 +702,7 @@ namespace rtl_Bootstrap
                 }
                 b.append(p[i]);
             }
-            b.appendAscii(RTL_CONSTASCII_STRINGPARAM(":Other_Section:EXPAND}"));
+            b.append(":Other_Section:EXPAND}");
             rtl::OUString t(b.makeStringAndClear());
             Bootstrap(t_getSourcePath(TESTSHL2_INI)).expandMacrosFrom(t);
             CPPUNIT_ASSERT_MESSAGE( "section expansion", t == "$FILE" );
diff --git a/sal/qa/rtl/uri/rtl_testuri.cxx b/sal/qa/rtl/uri/rtl_testuri.cxx
index 5fee79175209..ad660993fc22 100644
--- a/sal/qa/rtl/uri/rtl_testuri.cxx
+++ b/sal/qa/rtl/uri/rtl_testuri.cxx
@@ -226,10 +226,10 @@ void Test::test_Uri() {
 
     aText1 = rtl::OUString(
             "%ed%a0%80" "%f0%90%8f%bf" "%ed%bf%bf" "A");
-    aBuffer.appendAscii(RTL_CONSTASCII_STRINGPARAM("%ED%A0%80"));
+    aBuffer.append("%ED%A0%80");
     aBuffer.append(static_cast< sal_Unicode >(0xD800));
     aBuffer.append(static_cast< sal_Unicode >(0xDFFF));
-    aBuffer.appendAscii(RTL_CONSTASCII_STRINGPARAM("%ED%BF%BF"));
+    aBuffer.append("%ED%BF%BF");
     aBuffer.append(static_cast< sal_Unicode >('A'));
     aText2 = aBuffer.makeStringAndClear();
     CPPUNIT_ASSERT_MESSAGE(
@@ -267,7 +267,7 @@ void Test::test_Uri() {
     // Check IURI handling:
 
     aText1 = rtl::OUString("%30%C3%BF");
-    aBuffer.appendAscii(RTL_CONSTASCII_STRINGPARAM("%30"));
+    aBuffer.append("%30");
     aBuffer.append(static_cast< sal_Unicode >(0x00FF));
     aText2 = aBuffer.makeStringAndClear();
     CPPUNIT_ASSERT_MESSAGE(
diff --git a/sc/source/core/data/dpoutput.cxx b/sc/source/core/data/dpoutput.cxx
index ab95110cf579..cb43eccd54db 100644
--- a/sc/source/core/data/dpoutput.cxx
+++ b/sc/source/core/data/dpoutput.cxx
@@ -1543,7 +1543,7 @@ OUString lcl_GetDataFieldName( const OUString& rSourceName, sheet::GeneralFuncti
         return OUString();
 
     OUStringBuffer aRet( ScGlobal::GetRscString( nStrId ) );
-    aRet.appendAscii(RTL_CONSTASCII_STRINGPARAM(" - "));
+    aRet.append(" - ");
     aRet.append(rSourceName);
     return aRet.makeStringAndClear();
 }
diff --git a/sc/source/core/data/dputil.cxx b/sc/source/core/data/dputil.cxx
index b2171f1e4643..40cfafb0e5da 100644
--- a/sc/source/core/data/dputil.cxx
+++ b/sc/source/core/data/dputil.cxx
@@ -366,7 +366,7 @@ OUString ScDPUtil::getDisplayedMeasureName(const OUString& rName, ScSubTotalFunc
     if (nId)
     {
         aRet.append(ScGlobal::GetRscString(nId));        // function name
-        aRet.appendAscii(RTL_CONSTASCII_STRINGPARAM(" - "));
+        aRet.append(" - ");
     }
     aRet.append(rName);                   // field name
 
diff --git a/sc/source/core/data/postit.cxx b/sc/source/core/data/postit.cxx
index 1cf598c8c081..cbff1e6cc82e 100644
--- a/sc/source/core/data/postit.cxx
+++ b/sc/source/core/data/postit.cxx
@@ -804,7 +804,7 @@ SdrCaptionObj* ScNoteUtil::CreateTempCaption(
     if( pNote && !pNote->IsCaptionShown() )
     {
         if( !aBuffer.isEmpty() )
-            aBuffer.appendAscii( RTL_CONSTASCII_STRINGPARAM( "\n--------\n" ) ).append( pNote->GetText() );
+            aBuffer.append( "\n--------\n" ).append( pNote->GetText() );
         pNoteCaption = pNote->GetOrCreateCaption( rPos );
     }
 
diff --git a/sc/source/core/tool/compiler.cxx b/sc/source/core/tool/compiler.cxx
index 1668973ce555..e68cf55d6ae3 100644
--- a/sc/source/core/tool/compiler.cxx
+++ b/sc/source/core/tool/compiler.cxx
@@ -635,10 +635,10 @@ static OUString lcl_makeExternalNameStr(const OUString& rFile, const OUString& r
         aBuf.append( '[');
     aBuf.append( "'" + aFile + "'" + OUString(cSep));
     if (bODF)
-        aBuf.appendAscii( RTL_CONSTASCII_STRINGPARAM( "$$'"));
+        aBuf.append( "$$'" );
     aBuf.append( aName);
     if (bODF)
-        aBuf.appendAscii( RTL_CONSTASCII_STRINGPARAM( "']"));
+        aBuf.append( "']" );
     return aBuf.makeStringAndClear();
 }
 
diff --git a/sc/source/core/tool/dbdata.cxx b/sc/source/core/tool/dbdata.cxx
index 97e24b047d67..5eb88b320fea 100644
--- a/sc/source/core/tool/dbdata.cxx
+++ b/sc/source/core/tool/dbdata.cxx
@@ -231,14 +231,14 @@ OUString ScDBData::GetOperations() const
     if (mpSortParam->maKeyState[0].bDoSort)
     {
         if (!aBuf.isEmpty())
-            aBuf.appendAscii(RTL_CONSTASCII_STRINGPARAM(", "));
+            aBuf.append(", ");
         aBuf.append(ScGlobal::GetRscString(STR_OPERATION_SORT));
     }
 
     if (mpSubTotal->bGroupActive[0] && !mpSubTotal->bRemoveOnly)
     {
         if (!aBuf.isEmpty())
-            aBuf.appendAscii(RTL_CONSTASCII_STRINGPARAM(", "));
+            aBuf.append(", ");
         aBuf.append(ScGlobal::GetRscString(STR_OPERATION_SUBTOTAL));
     }
 
diff --git a/sc/source/filter/oox/querytablebuffer.cxx b/sc/source/filter/oox/querytablebuffer.cxx
index 5b2e9b10d5d1..d4d489b6e79a 100644
--- a/sc/source/filter/oox/querytablebuffer.cxx
+++ b/sc/source/filter/oox/querytablebuffer.cxx
@@ -72,7 +72,7 @@ void lclAppendWebQueryTableName( OUStringBuffer& rTables, const OUString& rTable
     {
         if( !rTables.isEmpty() )
             rTables.append( ';' );
-        rTables.appendAscii( RTL_CONSTASCII_STRINGPARAM( "HTML__" ) ).append( rTableName );
+        rTables.append( "HTML__" ).append( rTableName );
     }
 }
 
@@ -82,7 +82,7 @@ void lclAppendWebQueryTableIndex( OUStringBuffer& rTables, sal_Int32 nTableIndex
     {
         if( !rTables.isEmpty() )
             rTables.append( ';' );
-        rTables.appendAscii( RTL_CONSTASCII_STRINGPARAM( "HTML_" ) ).append( nTableIndex );
+        rTables.append( "HTML_" ).append( nTableIndex );
     }
 }
 
diff --git a/sc/source/ui/dbgui/filtdlg.cxx b/sc/source/ui/dbgui/filtdlg.cxx
index 60953a040d95..c713e2a16d51 100644
--- a/sc/source/ui/dbgui/filtdlg.cxx
+++ b/sc/source/ui/dbgui/filtdlg.cxx
@@ -116,43 +116,43 @@ ScFilterDlg::ScFilterDlg(SfxBindings* pB, SfxChildWindow* pCW, Window* pParent,
 
     OUString sAccName = SC_RESSTR(RID_FILTER_OPERATOR);
     aBuf.append(sAccName);
-    aBuf.appendAscii(RTL_CONSTASCII_STRINGPARAM (" 1"));
+    aBuf.append(" 1");
     pLbConnect1->SetAccessibleName(aBuf.makeStringAndClear());
     aBuf.append(sAccName);
-    aBuf.appendAscii(RTL_CONSTASCII_STRINGPARAM (" 2"));
+    aBuf.append(" 2");
     pLbConnect2->SetAccessibleName(aBuf.makeStringAndClear());
 
     sAccName = SC_RESSTR(RID_FILTER_FIELDNAME);
     aBuf.append(sAccName);
-    aBuf.appendAscii(RTL_CONSTASCII_STRINGPARAM (" 1"));
+    aBuf.append(" 1");
     pLbField1->SetAccessibleName(aBuf.makeStringAndClear());
     aBuf.append(sAccName);
-    aBuf.appendAscii(RTL_CONSTASCII_STRINGPARAM (" 2"));
+    aBuf.append(" 2");
     pLbField2->SetAccessibleName(aBuf.makeStringAndClear());
     aBuf.append(sAccName);
-    aBuf.appendAscii(RTL_CONSTASCII_STRINGPARAM (" 3"));
+    aBuf.append(" 3");
     pLbField3->SetAccessibleName(aBuf.makeStringAndClear());
 
     sAccName = SC_RESSTR(RID_FILTER_CONDITION);
     aBuf.append(sAccName);
-    aBuf.appendAscii(RTL_CONSTASCII_STRINGPARAM (" 1"));
+    aBuf.append(" 1");
     pLbCond1->SetAccessibleName(aBuf.makeStringAndClear());
     aBuf.append(sAccName);
-    aBuf.appendAscii(RTL_CONSTASCII_STRINGPARAM (" 2"));
+    aBuf.append(" 2");
     pLbCond2->SetAccessibleName(aBuf.makeStringAndClear());
     aBuf.append(sAccName);
-    aBuf.appendAscii(RTL_CONSTASCII_STRINGPARAM (" 3"));
+    aBuf.append(" 3");
     pLbCond3->SetAccessibleName(aBuf.makeStringAndClear());
 
     sAccName = SC_RESSTR(RID_FILTER_VALUE);
     aBuf.append(sAccName);
-    aBuf.appendAscii(RTL_CONSTASCII_STRINGPARAM (" 1"));
+    aBuf.append(" 1");
     pEdVal1->SetAccessibleName(aBuf.makeStringAndClear());
     aBuf.append(sAccName);
-    aBuf.appendAscii(RTL_CONSTASCII_STRINGPARAM (" 2"));
+    aBuf.append(" 2");
     pEdVal2->SetAccessibleName(aBuf.makeStringAndClear());
     aBuf.append(sAccName);
-    aBuf.appendAscii(RTL_CONSTASCII_STRINGPARAM (" 3"));
+    aBuf.append(" 3");
     pEdVal3->SetAccessibleName(aBuf.makeStringAndClear());
 
     pLbCopyArea->SetAccessibleName(ScResId(STR_COPY_AREA_TO));
diff --git a/sc/source/ui/dbgui/foptmgr.cxx b/sc/source/ui/dbgui/foptmgr.cxx
index 82a9e02117a3..bdf57025a2d6 100644
--- a/sc/source/ui/dbgui/foptmgr.cxx
+++ b/sc/source/ui/dbgui/foptmgr.cxx
@@ -161,7 +161,7 @@ void ScFilterOptionsMgr::Init()
 
         if ( !theDbName.startsWith(STR_DB_LOCAL_NONAME) )
         {
-            theDbArea.appendAscii(RTL_CONSTASCII_STRINGPARAM(" ("));
+            theDbArea.append(" (");
             theDbArea.append(theDbName).append(')');
             pFtDbArea->SetText( theDbArea.makeStringAndClear() );
         }
diff --git a/sc/source/ui/docshell/docsh.cxx b/sc/source/ui/docshell/docsh.cxx
index 6b8490760875..98b6be62473d 100644
--- a/sc/source/ui/docshell/docsh.cxx
+++ b/sc/source/ui/docshell/docsh.cxx
@@ -1688,7 +1688,7 @@ void lcl_ScDocShell_GetFixedWidthString( OUString& rStr, const ScDocument& rDoc,
     {
         OUStringBuffer aReplacement;
         if (bValue)
-            aReplacement.appendAscii(RTL_CONSTASCII_STRINGPARAM("###"));
+            aReplacement.append("###");
         else
             aReplacement.append(aString);
         //truncate to the number of characters that should fit, even in the
diff --git a/sc/source/ui/vba/vbahyperlink.cxx b/sc/source/ui/vba/vbahyperlink.cxx
index a021ec568569..63710bd8d44c 100644
--- a/sc/source/ui/vba/vbahyperlink.cxx
+++ b/sc/source/ui/vba/vbahyperlink.cxx
@@ -76,7 +76,7 @@ ScVbaHyperlink::ScVbaHyperlink( const uno::Reference< XHelperInterface >& rxAnch
             {
                 OUStringBuffer aBuffer( aUrlComp.first );
                 if( !aUrlComp.second.isEmpty() )
-                    aBuffer.appendAscii( RTL_CONSTASCII_STRINGPARAM( " - " ) ).append( aUrlComp.second );
+                    aBuffer.append( " - " ).append( aUrlComp.second );
                 aTextToDisplay = aBuffer.makeStringAndClear();
             }
         }
diff --git a/sc/source/ui/view/viewutil.cxx b/sc/source/ui/view/viewutil.cxx
index 9857b1ff2a94..cad155d32dfb 100644
--- a/sc/source/ui/view/viewutil.cxx
+++ b/sc/source/ui/view/viewutil.cxx
@@ -162,7 +162,7 @@ sal_Bool ScViewUtil::IsActionShown( const ScChangeAction& rAction,
     if ( rSettings.HasComment() )
     {
         OUStringBuffer aBuf(rAction.GetComment());
-        aBuf.appendAscii(RTL_CONSTASCII_STRINGPARAM(" ("));
+        aBuf.append(" (");
         OUString aTmp;
         rAction.GetDescription(aTmp, &rDocument);
         aBuf.append(aTmp);
diff --git a/sfx2/source/appl/appserv.cxx b/sfx2/source/appl/appserv.cxx
index 27abf6c80394..7fc357a4fbd8 100644
--- a/sfx2/source/appl/appserv.cxx
+++ b/sfx2/source/appl/appserv.cxx
@@ -1052,7 +1052,7 @@ void SfxApplication::OfaExec_Impl( SfxRequest& rReq )
                 if ( xSystemShell.is() && !sTemplRepoURL.isEmpty() )
                 {
                     OUStringBuffer aURLBuf( sTemplRepoURL );
-                    aURLBuf.appendAscii(RTL_CONSTASCII_STRINGPARAM("?lang="));
+                    aURLBuf.append("?lang=");
 
                     // read locale from configuration
                     OUString sLocale(officecfg::Setup::L10N::ooLocale::get());
diff --git a/sfx2/source/appl/sfxpicklist.cxx b/sfx2/source/appl/sfxpicklist.cxx
index 9ec4aa3fb435..4b5b3fd17a3c 100644
--- a/sfx2/source/appl/sfxpicklist.cxx
+++ b/sfx2/source/appl/sfxpicklist.cxx
@@ -82,10 +82,10 @@ void SfxPickList::CreatePicklistMenuTitle( Menu* pMenu, sal_uInt16 nItemId, cons
         aPickEntry.append(OUString::number(nNo + 1));
     }
     else if ( nNo == 9 )
-        aPickEntry.appendAscii(RTL_CONSTASCII_STRINGPARAM("1~0"));
+        aPickEntry.append("1~0");
     else
         aPickEntry.append(OUString::number(nNo + 1));
-    aPickEntry.appendAscii(RTL_CONSTASCII_STRINGPARAM(": "));
+    aPickEntry.append(": ");
 
     INetURLObject   aURL( aURLString );
     OUString   aTipHelpText;
@@ -111,7 +111,7 @@ void SfxPickList::CreatePicklistMenuTitle( Menu* pMenu, sal_uInt16 nItemId, cons
         if ( aPickEntry.getLength() > 50 )
         {
             aPickEntry.setLength( 47 );
-            aPickEntry.appendAscii(RTL_CONSTASCII_STRINGPARAM("..."));
+            aPickEntry.append("...");
         }
     }
     else
diff --git a/sfx2/source/dialog/filedlghelper.cxx b/sfx2/source/dialog/filedlghelper.cxx
index 26a5345a3573..c8178a4420f6 100644
--- a/sfx2/source/dialog/filedlghelper.cxx
+++ b/sfx2/source/dialog/filedlghelper.cxx
@@ -1762,12 +1762,12 @@ void FileDialogHelper_Impl::addFilters( const OUString& rFactory,
 
     // create the list of filters
     OUStringBuffer sQuery(256);
-    sQuery.appendAscii(RTL_CONSTASCII_STRINGPARAM("getSortedFilterList()"));
-    sQuery.appendAscii(RTL_CONSTASCII_STRINGPARAM(":module="));
+    sQuery.append("getSortedFilterList()");
+    sQuery.append(":module=");
     sQuery.append(rFactory); // use long name here !
-    sQuery.appendAscii(RTL_CONSTASCII_STRINGPARAM(":iflags="));
+    sQuery.append(":iflags=");
     sQuery.append(OUString::number(m_nMustFlags));
-    sQuery.appendAscii(RTL_CONSTASCII_STRINGPARAM(":eflags="));
+    sQuery.append(":eflags=");
     sQuery.append(OUString::number(m_nDontFlags));
 
     uno::Reference< XEnumeration > xResult;
diff --git a/sfx2/source/dialog/taskpane.cxx b/sfx2/source/dialog/taskpane.cxx
index 394f4bc0e7ba..12a7b1dcfd77 100644
--- a/sfx2/source/dialog/taskpane.cxx
+++ b/sfx2/source/dialog/taskpane.cxx
@@ -107,10 +107,9 @@ namespace sfx2
 
                 const OUString sWindowStateRef( aModuleProps.getOrDefault( "ooSetupFactoryWindowStateConfigRef", OUString() ) );
 
-                aPathComposer.appendAscii(RTL_CONSTASCII_STRINGPARAM(
-                    "org.openoffice.Office.UI."));
+                aPathComposer.append( "org.openoffice.Office.UI." );
                 aPathComposer.append( sWindowStateRef );
-                aPathComposer.appendAscii(RTL_CONSTASCII_STRINGPARAM("/UIElements/States"));
+                aPathComposer.append( "/UIElements/States" );
                 if ( !i_rResourceURL.isEmpty() )
                 {
                     aPathComposer.append('/').append( i_rResourceURL );
@@ -173,7 +172,7 @@ namespace sfx2
                     if ( sImageURL.startsWith( pCommandImagePrefix ) )
                     {
                         OUStringBuffer aCommandName;
-                        aCommandName.appendAscii(RTL_CONSTASCII_STRINGPARAM(".uno:"));
+                        aCommandName.append( ".uno:" );
                         aCommandName.append( sImageURL.copy( nCommandImagePrefixLen ) );
                         const OUString sCommandName( aCommandName.makeStringAndClear() );
 
diff --git a/sfx2/source/doc/docfac.cxx b/sfx2/source/doc/docfac.cxx
index 5a27c50068b0..67de74486ea9 100644
--- a/sfx2/source/doc/docfac.cxx
+++ b/sfx2/source/doc/docfac.cxx
@@ -371,8 +371,8 @@ const SvGlobalName& SfxObjectFactory::GetClassId() const
 OUString SfxObjectFactory::GetFactoryURL() const
 {
     OUStringBuffer aURLComposer;
-    aURLComposer.appendAscii(RTL_CONSTASCII_STRINGPARAM("private:factory/"));
-    aURLComposer.appendAscii(GetShortName());
+    aURLComposer.append("private:factory/");
+    aURLComposer.append(GetShortName());
     return aURLComposer.makeStringAndClear();
 }
 
diff --git a/sfx2/source/view/viewfac.cxx b/sfx2/source/view/viewfac.cxx
index 35926d3648e2..24b5eef7a7ef 100644
--- a/sfx2/source/view/viewfac.cxx
+++ b/sfx2/source/view/viewfac.cxx
@@ -34,7 +34,7 @@ SfxViewShell *SfxViewFactory::CreateInstance(SfxViewFrame *pFrame, SfxViewShell
 OUString SfxViewFactory::GetLegacyViewName() const
 {
     OUStringBuffer aViewName;
-    aViewName.appendAscii(RTL_CONSTASCII_STRINGPARAM("view"));
+    aViewName.append( "view" );
     aViewName.append( sal_Int32( GetOrdinal() ) );
     return aViewName.makeStringAndClear();
 }
diff --git a/sfx2/source/view/viewfrm.cxx b/sfx2/source/view/viewfrm.cxx
index 1fa99c46c2f6..f29363bbad24 100644
--- a/sfx2/source/view/viewfrm.cxx
+++ b/sfx2/source/view/viewfrm.cxx
@@ -2726,11 +2726,11 @@ void SfxViewFrame::AddDispatchMacroToBasic_Impl( const OUString& sMacro )
         }
 
         // append new method
-        sRoutine.appendAscii(RTL_CONSTASCII_STRINGPARAM("\nsub "));
+        sRoutine.append( "\nsub " );
         sRoutine.append(sMacroName);
-        sRoutine.appendAscii(RTL_CONSTASCII_STRINGPARAM("\n"));
+        sRoutine.append( "\n" );
         sRoutine.append(sMacro);
-        sRoutine.appendAscii(RTL_CONSTASCII_STRINGPARAM("\nend sub\n"));
+        sRoutine.append( "\nend sub\n" );
 
         // create the modul inside the library and insert the macro routine
         aTemp <<= sRoutine.makeStringAndClear();
diff --git a/sfx2/source/view/viewsh.cxx b/sfx2/source/view/viewsh.cxx
index c4d9eb47e1e7..695067007e28 100644
--- a/sfx2/source/view/viewsh.cxx
+++ b/sfx2/source/view/viewsh.cxx
@@ -816,7 +816,7 @@ void SfxViewShell::GetState_Impl( SfxItemSet &rSet )
                             aBuffer.append( RetrieveLabelFromCommand(
                                 OUString( ".uno:PrintDefault" ),
                                 xFrame ));
-                            aBuffer.appendAscii(RTL_CONSTASCII_STRINGPARAM(" ("));
+                            aBuffer.append( " (" );
                             aBuffer.append( aPrinterName );
                             aBuffer.append(')');
 
diff --git a/stoc/source/implementationregistration/implreg.cxx b/stoc/source/implementationregistration/implreg.cxx
index b7ee54998eb1..0f9ce337503d 100644
--- a/stoc/source/implementationregistration/implreg.cxx
+++ b/stoc/source/implementationregistration/implreg.cxx
@@ -999,13 +999,11 @@ static void insert_singletons(
                             if (! is_supported_service( service_name, xExistingService_td ))
                             {
                                 OUStringBuffer buf( 64 );
-                                buf.appendAscii(
-                                    RTL_CONSTASCII_STRINGPARAM("existing singleton service (") );
+                                buf.append( "existing singleton service (" );
                                 buf.append( singleton_name );
                                 buf.append( (sal_Unicode)'=' );
                                 buf.append( existing_name );
-                                buf.appendAscii(
-                                    RTL_CONSTASCII_STRINGPARAM(") does not support given one: ") );
+                                buf.append( ") does not support given one: " );
                                 buf.append( service_name );
                                 throw registry::CannotRegisterImplementationException(
                                     buf.makeStringAndClear(), Reference< XInterface >() );
@@ -1378,8 +1376,7 @@ void ImplementationRegistration::initialize(
 
     if( aArgs.getLength() != 4 ) {
         OUStringBuffer buf;
-        buf.appendAscii( RTL_CONSTASCII_STRINGPARAM(
-            "ImplementationRegistration::initialize() expects 4 parameters, got "));
+        buf.append( "ImplementationRegistration::initialize() expects 4 parameters, got " );
         buf.append( (sal_Int32) aArgs.getLength() );
         throw IllegalArgumentException( buf.makeStringAndClear(),
                                         Reference<XInterface > (),
@@ -1397,11 +1394,10 @@ void ImplementationRegistration::initialize(
     }
     if( !rLoader.is()) {
         OUStringBuffer buf;
-        buf.appendAscii( RTL_CONSTASCII_STRINGPARAM(
-            "ImplementationRegistration::initialize() invalid first parameter,"
-            "expected " ) );
+        buf.append( "ImplementationRegistration::initialize() invalid first parameter,"
+                    "expected " );
         buf.append( getCppuType( &rLoader ).getTypeName() );
-        buf.appendAscii( RTL_CONSTASCII_STRINGPARAM( ", got " ) );
+        buf.append( ", got " );
         buf.append( aArgs.getConstArray()[0].getValueTypeName() );
         throw IllegalArgumentException( buf.makeStringAndClear(),
                                         Reference< XInterface > (),
@@ -1414,9 +1410,8 @@ void ImplementationRegistration::initialize(
     }
     if( loaderServiceName.isEmpty() ) {
         OUStringBuffer buf;
-        buf.appendAscii( RTL_CONSTASCII_STRINGPARAM(
-            "ImplementationRegistration::initialize() invalid second parameter,"
-            "expected string, got " ) );
+        buf.append( "ImplementationRegistration::initialize() invalid second parameter,"
+                    "expected string, got " );
         buf.append( aArgs.getConstArray()[1].getValueTypeName() );
         throw IllegalArgumentException( buf.makeStringAndClear(),
                                         Reference< XInterface > (),
@@ -1429,9 +1424,8 @@ void ImplementationRegistration::initialize(
     }
     if( locationUrl.isEmpty() ) {
         OUStringBuffer buf;
-        buf.appendAscii( RTL_CONSTASCII_STRINGPARAM(
-            "ImplementationRegistration::initialize() invalid third parameter,"
-            "expected string, got " ) );
+        buf.append( "ImplementationRegistration::initialize() invalid third parameter,"
+                    "expected string, got " );
         buf.append( aArgs.getConstArray()[2].getValueTypeName() );
         throw IllegalArgumentException( buf.makeStringAndClear(),
                                         Reference< XInterface > (),
@@ -1447,11 +1441,10 @@ void ImplementationRegistration::initialize(
         rReg = getRegistryFromServiceManager();
         if( !rReg.is() ) {
             OUStringBuffer buf;
-            buf.appendAscii( RTL_CONSTASCII_STRINGPARAM(
-                "ImplementationRegistration::initialize() invalid fourth parameter,"
-                "expected " ));
+            buf.append( "ImplementationRegistration::initialize() invalid fourth parameter,"
+                        "expected " );
             buf.append( getCppuType( &rReg ).getTypeName() );
-            buf.appendAscii( RTL_CONSTASCII_STRINGPARAM(", got " ) );
+            buf.append( ", got " );
             buf.append( aArgs.getConstArray()[3].getValueTypeName() );
             throw IllegalArgumentException( buf.makeStringAndClear(),
                                             Reference< XInterface > (),
@@ -1542,22 +1535,20 @@ void ImplementationRegistration::prepareRegister(
         catch( const InvalidRegistryException & e )
         {
             OUStringBuffer buf;
-            buf.appendAscii( RTL_CONSTASCII_STRINGPARAM(
-                "ImplementationRegistration::registerImplementation() "
-                "InvalidRegistryException during registration (" ));
+            buf.append( "ImplementationRegistration::registerImplementation() "
+                        "InvalidRegistryException during registration (" );
             buf.append( e.Message );
-            buf.appendAscii( RTL_CONSTASCII_STRINGPARAM( ")" ) );
+            buf.append( ")" );
             throw CannotRegisterImplementationException(
                 buf.makeStringAndClear(), Reference< XInterface > () );
         }
         catch( const MergeConflictException & e )
         {
             OUStringBuffer buf;
-            buf.appendAscii( RTL_CONSTASCII_STRINGPARAM(
-                "ImplementationRegistration::registerImplementation() "
-                "MergeConflictException during registration (" ));
+            buf.append( "ImplementationRegistration::registerImplementation() "
+                        "MergeConflictException during registration (" );
             buf.append( e.Message );
-            buf.appendAscii( RTL_CONSTASCII_STRINGPARAM( ")" ) );
+            buf.append( ")" );
             throw CannotRegisterImplementationException(
                 buf.makeStringAndClear(), Reference< XInterface > () );
         }
diff --git a/stoc/source/security/access_controller.cxx b/stoc/source/security/access_controller.cxx
index 5f59ed156526..ee218a8e5eb8 100644
--- a/stoc/source/security/access_controller.cxx
+++ b/stoc/source/security/access_controller.cxx
@@ -562,14 +562,13 @@ static void dumpPermissions(
     OUStringBuffer buf( 48 );
     if (!userId.isEmpty())
     {
-        buf.appendAscii( RTL_CONSTASCII_STRINGPARAM("> dumping permissions of user \"") );
+        buf.append( "> dumping permissions of user \"" );
         buf.append( userId );
-        buf.appendAscii( RTL_CONSTASCII_STRINGPARAM("\":") );
+        buf.append( "\":" );
     }
     else
     {
-        buf.appendAscii(
-            RTL_CONSTASCII_STRINGPARAM("> dumping default permissions:") );
+        buf.append( "> dumping default permissions:" );
     }
     OString str( OUStringToOString( buf.makeStringAndClear(), RTL_TEXTENCODING_ASCII_US ) );
     OSL_TRACE( "%s", str.getStr() );
@@ -715,9 +714,9 @@ PermissionCollection AccessController::getEffectivePermissions(
         }
 #ifdef __DIAGNOSE
         OUStringBuffer buf( 48 );
-        buf.appendAscii( RTL_CONSTASCII_STRINGPARAM("> info: recurring call of user \"") );
+        buf.append( "> info: recurring call of user \"" );
         buf.append( userId );
-        buf.appendAscii( RTL_CONSTASCII_STRINGPARAM("\"") );
+        buf.append( "\"" );
         OString str(
             OUStringToOString( buf.makeStringAndClear(), RTL_TEXTENCODING_ASCII_US ) );
         OSL_TRACE( "%s", str.getStr() );
@@ -807,8 +806,7 @@ PermissionCollection AccessController::getEffectivePermissions(
     {
         clearPostPoned(); // safety: exception could have happened before checking postponed?
         OUStringBuffer buf( 64 );
-        buf.appendAscii(
-            RTL_CONSTASCII_STRINGPARAM("deployment error (AccessControlException occurred): ") );
+        buf.append( "deployment error (AccessControlException occurred): " );
         buf.append( exc.Message );
         throw DeploymentException( buf.makeStringAndClear(), exc.Context );
     }
diff --git a/stoc/source/security/file_policy.cxx b/stoc/source/security/file_policy.cxx
index 46ba89f2b205..36bb86641757 100644
--- a/stoc/source/security/file_policy.cxx
+++ b/stoc/source/security/file_policy.cxx
@@ -207,9 +207,9 @@ void PolicyReader::assureToken( sal_Unicode token )
     if (c == token)
         return;
     OUStringBuffer buf( 16 );
-    buf.appendAscii( RTL_CONSTASCII_STRINGPARAM("expected >") );
+    buf.append( "expected >" );
     buf.append( c );
-    buf.appendAscii( RTL_CONSTASCII_STRINGPARAM("<!") );
+    buf.append( "<!" );
     error( buf.makeStringAndClear() );
 }
 //__________________________________________________________________________________________________
@@ -368,13 +368,13 @@ void PolicyReader::error( OUString const & msg )
     SAL_THROW( (RuntimeException) )
 {
     OUStringBuffer buf( 32 );
-    buf.appendAscii( RTL_CONSTASCII_STRINGPARAM("error processing file \"") );
+    buf.append( "error processing file \"" );
     buf.append( m_fileName );
-    buf.appendAscii( RTL_CONSTASCII_STRINGPARAM("\" [line ") );
+    buf.append( "\" [line " );
     buf.append( m_linepos );
-    buf.appendAscii( RTL_CONSTASCII_STRINGPARAM(", column ") );
+    buf.append( ", column " );
     buf.append( m_pos );
-    buf.appendAscii( RTL_CONSTASCII_STRINGPARAM("] ") );
+    buf.append( "] " );
     buf.append( msg );
     throw RuntimeException( buf.makeStringAndClear(), Reference< XInterface >() );
 }
@@ -390,9 +390,9 @@ PolicyReader::PolicyReader( OUString const & fileName, AccessControl & ac )
     if (osl_File_E_None != ::osl_openFile( m_fileName.pData, &m_file, osl_File_OpenFlag_Read ))
     {
         OUStringBuffer buf( 32 );
-        buf.appendAscii( RTL_CONSTASCII_STRINGPARAM("cannot open file \"") );
+        buf.append( "cannot open file \"" );
         buf.append( m_fileName );
-        buf.appendAscii( RTL_CONSTASCII_STRINGPARAM("\"!") );
+        buf.append( "\"!" );
         throw RuntimeException( buf.makeStringAndClear(), Reference< XInterface >() );
     }
 }
diff --git a/stoc/source/security/permissions.cxx b/stoc/source/security/permissions.cxx
index 34bb834ef339..448db7ea9f75 100644
--- a/stoc/source/security/permissions.cxx
+++ b/stoc/source/security/permissions.cxx
@@ -70,7 +70,7 @@ static inline sal_Int32 makeMask(
         if (! strings[ nPos ])
         {
             OUStringBuffer buf( 48 );
-            buf.appendAscii( RTL_CONSTASCII_STRINGPARAM("### ignoring unknown socket action: ") );
+            buf.append( "### ignoring unknown socket action: " );
             buf.append( item );
             OString str( OUStringToOString(
                 buf.makeStringAndClear(), RTL_TEXTENCODING_ASCII_US ) );
@@ -243,8 +243,7 @@ OUString SocketPermission::toString() const SAL_THROW(())
 {
     OUStringBuffer buf( 48 );
     // host
-    buf.appendAscii(
-        RTL_CONSTASCII_STRINGPARAM("com.sun.star.connection.SocketPermission (host=\"") );
+    buf.append( "com.sun.star.connection.SocketPermission (host=\"" );
     buf.append( m_host );
     if (m_resolvedHost)
     {
@@ -266,9 +265,9 @@ OUString SocketPermission::toString() const SAL_THROW(())
         }
     }
     // actions
-    buf.appendAscii( RTL_CONSTASCII_STRINGPARAM("\", actions=\"") );
+    buf.append( "\", actions=\"" );
     buf.append( makeStrings( m_actions, s_actions ) );
-    buf.appendAscii( RTL_CONSTASCII_STRINGPARAM("\")") );
+    buf.append( "\")" );
     return buf.makeStringAndClear();
 }
 
@@ -327,14 +326,14 @@ FilePermission::FilePermission(
         {
             OUStringBuffer buf( 64 );
             buf.append( getWorkingDir() );
-            buf.appendAscii( RTL_CONSTASCII_STRINGPARAM("/*") );
+            buf.append( "/*" );
             m_url = buf.makeStringAndClear();
         }
         else if ( m_url == "-" )
         {
             OUStringBuffer buf( 64 );
             buf.append( getWorkingDir() );
-            buf.appendAscii( RTL_CONSTASCII_STRINGPARAM("/-") );
+            buf.append( "/-" );
             m_url = buf.makeStringAndClear();
         }
         else if (!m_url.startsWith("file:///"))
@@ -420,12 +419,12 @@ OUString FilePermission::toString() const SAL_THROW(())
 {
     OUStringBuffer buf( 48 );
     // url
-    buf.appendAscii( RTL_CONSTASCII_STRINGPARAM("com.sun.star.io.FilePermission (url=\"") );
+    buf.append( "com.sun.star.io.FilePermission (url=\"" );
     buf.append( m_url );
     // actions
-    buf.appendAscii( RTL_CONSTASCII_STRINGPARAM("\", actions=\"") );
+    buf.append( "\", actions=\"" );
     buf.append( makeStrings( m_actions, s_actions ) );
-    buf.appendAscii( RTL_CONSTASCII_STRINGPARAM("\")") );
+    buf.append( "\")" );
     return buf.makeStringAndClear();
 }
 
@@ -462,10 +461,9 @@ bool RuntimePermission::implies( Permission const & perm ) const SAL_THROW(())
 OUString RuntimePermission::toString() const SAL_THROW(())
 {
     OUStringBuffer buf( 48 );
-    buf.appendAscii(
-        RTL_CONSTASCII_STRINGPARAM("com.sun.star.security.RuntimePermission (name=\"") );
+    buf.append( "com.sun.star.security.RuntimePermission (name=\"" );
     buf.append( m_name );
-    buf.appendAscii( RTL_CONSTASCII_STRINGPARAM("\")") );
+    buf.append( "\")" );
     return buf.makeStringAndClear();
 }
 
@@ -519,8 +517,7 @@ PermissionCollection::PermissionCollection(
         else
         {
             OUStringBuffer buf( 48 );
-            buf.appendAscii( RTL_CONSTASCII_STRINGPARAM(
-                "checking for unsupported permission type: ") );
+            buf.append( "checking for unsupported permission type: " );
             buf.append( perm_type.getTypeName() );
             throw RuntimeException(
                 buf.makeStringAndClear(), Reference< XInterface >() );
@@ -560,9 +557,9 @@ static void demanded_diag(
     SAL_THROW(())
 {
     OUStringBuffer buf( 48 );
-    buf.appendAscii( RTL_CONSTASCII_STRINGPARAM("demanding ") );
+    buf.append( "demanding " );
     buf.append( perm.toString() );
-    buf.appendAscii( RTL_CONSTASCII_STRINGPARAM(" => ok.") );
+    buf.append( " => ok." );
     OString str(
         OUStringToOString( buf.makeStringAndClear(), RTL_TEXTENCODING_ASCII_US ) );
     OSL_TRACE( "%s", str.getStr() );
@@ -574,7 +571,7 @@ static void throwAccessControlException(
     SAL_THROW( (security::AccessControlException) )
 {
     OUStringBuffer buf( 48 );
-    buf.appendAscii( RTL_CONSTASCII_STRINGPARAM("access denied: ") );
+    buf.append( "access denied: " );
     buf.append( perm.toString() );
     throw security::AccessControlException(
         buf.makeStringAndClear(), Reference< XInterface >(), demanded_perm );
@@ -642,7 +639,7 @@ void PermissionCollection::checkPermission( Any const & perm ) const
     else
     {
         OUStringBuffer buf( 48 );
-        buf.appendAscii( RTL_CONSTASCII_STRINGPARAM("checking for unsupported permission type: ") );
+        buf.append( "checking for unsupported permission type: " );
         buf.append( demanded_type.getTypeName() );
         throw RuntimeException(
             buf.makeStringAndClear(), Reference< XInterface >() );
diff --git a/stoc/source/servicemanager/servicemanager.cxx b/stoc/source/servicemanager/servicemanager.cxx
index 18f3b7aa86d4..13d5725ebb82 100644
--- a/stoc/source/servicemanager/servicemanager.cxx
+++ b/stoc/source/servicemanager/servicemanager.cxx
@@ -1538,7 +1538,7 @@ Sequence<OUString> ORegistryServiceManager::getFromServiceName(
     const OUString& serviceName )
 {
     OUStringBuffer buf;
-    buf.appendAscii( RTL_CONSTASCII_STRINGPARAM( "/SERVICES/" ) );
+    buf.append( "/SERVICES/" );
     buf.append( serviceName );
     return retrieveAsciiValueList( m_xRegistry, buf.makeStringAndClear() );
 }
diff --git a/stoc/source/uriproc/ExternalUriReferenceTranslator.cxx b/stoc/source/uriproc/ExternalUriReferenceTranslator.cxx
index b042197bd858..91f5b8cd68d8 100644
--- a/stoc/source/uriproc/ExternalUriReferenceTranslator.cxx
+++ b/stoc/source/uriproc/ExternalUriReferenceTranslator.cxx
@@ -114,7 +114,7 @@ OUString Translator::translateToInternal(
     // authority part; treat them as having an empty authority part:
     if (!externalUriReference.matchAsciiL(RTL_CONSTASCII_STRINGPARAM("//"), i))
     {
-        buf.appendAscii(RTL_CONSTASCII_STRINGPARAM("//"));
+        buf.append("//");
     }
     rtl_TextEncoding encoding = osl_getThreadTextEncoding();
     for (bool path = true;;) {
diff --git a/stoc/source/uriproc/UriReference.cxx b/stoc/source/uriproc/UriReference.cxx
index 312203d78587..3544b60e2c96 100644
--- a/stoc/source/uriproc/UriReference.cxx
+++ b/stoc/source/uriproc/UriReference.cxx
@@ -184,7 +184,7 @@ void UriReference::clearFragment() throw (css::uno::RuntimeException) {
 void UriReference::appendSchemeSpecificPart(OUStringBuffer & buffer) const
 {
     if (m_hasAuthority) {
-        buffer.appendAscii(RTL_CONSTASCII_STRINGPARAM("//"));
+        buffer.append("//");
         buffer.append(m_authority);
     }
     buffer.append(m_path);
diff --git a/stoc/source/uriproc/VndSunStarPkgUrlReferenceFactory.cxx b/stoc/source/uriproc/VndSunStarPkgUrlReferenceFactory.cxx
index 16aa0780cd56..f8234f2397c8 100644
--- a/stoc/source/uriproc/VndSunStarPkgUrlReferenceFactory.cxx
+++ b/stoc/source/uriproc/VndSunStarPkgUrlReferenceFactory.cxx
@@ -106,7 +106,7 @@ Factory::createVndSunStarPkgUrlReference(
     OSL_ASSERT(authority.is());
     if (authority->isAbsolute() && !authority->hasFragment()) {
         OUStringBuffer buf;
-        buf.appendAscii(RTL_CONSTASCII_STRINGPARAM("vnd.sun.star.pkg://"));
+        buf.append("vnd.sun.star.pkg://");
         buf.append(
             rtl::Uri::encode(
                 authority->getUriReference(), rtl_UriCharClassRegName,
diff --git a/stoc/test/uriproc/test_uriproc.cxx b/stoc/test/uriproc/test_uriproc.cxx
index a82875a13e08..a7be7da9bc2f 100644
--- a/stoc/test/uriproc/test_uriproc.cxx
+++ b/stoc/test/uriproc/test_uriproc.cxx
@@ -89,13 +89,13 @@ OString createTestAssertEqualMessage(
     append(buf, token2);
     buf.append(static_cast< sal_Unicode >('|'));
     append(buf, token3);
-    buf.appendAscii(RTL_CONSTASCII_STRINGPARAM(": TEST_ASSERT_EQUAL("));
+    buf.append(": TEST_ASSERT_EQUAL(");
     buf.appendAscii(expectedExpr);
-    buf.appendAscii(RTL_CONSTASCII_STRINGPARAM(", "));
+    buf.append(", ");
     buf.appendAscii(actualExpr);
-    buf.appendAscii(RTL_CONSTASCII_STRINGPARAM("): <"));
+    buf.append("): <");
     append(buf, expected);
-    buf.appendAscii(RTL_CONSTASCII_STRINGPARAM("> != <"));
+    buf.append("> != <");
     append(buf, actual);
     buf.append(static_cast< sal_Unicode >('>'));
     return OUStringToOString(
diff --git a/svtools/source/contnr/DocumentInfoPreview.cxx b/svtools/source/contnr/DocumentInfoPreview.cxx
index 2a546077986b..bb6129878da8 100644
--- a/svtools/source/contnr/DocumentInfoPreview.cxx
+++ b/svtools/source/contnr/DocumentInfoPreview.cxx
@@ -154,7 +154,7 @@ void ODocumentInfoPreview::insertDateTime(
     if (aToolsDT.IsValidAndGregorian()) {
         const LocaleDataWrapper& rLocaleWrapper( Application::GetSettings().GetLocaleDataWrapper() );
         OUStringBuffer buf(rLocaleWrapper.getDate(aToolsDT));
-        buf.appendAscii(RTL_CONSTASCII_STRINGPARAM(", "));
+        buf.append(", ");
         buf.append(rLocaleWrapper.getTime(aToolsDT));
         insertEntry(m_pInfoTable->GetString(id), buf.makeStringAndClear());
     }
diff --git a/testtools/source/performance/ubtest.cxx b/testtools/source/performance/ubtest.cxx
index 0223891592c6..00c2a3502f86 100644
--- a/testtools/source/performance/ubtest.cxx
+++ b/testtools/source/performance/ubtest.cxx
@@ -162,12 +162,12 @@ Reference< XSingleServiceFactory > loadLibComponentFactory(
 
     OUStringBuffer aLibNameBuf( 32 );
 #ifdef SAL_UNX
-    aLibNameBuf.appendAscii( RTL_CONSTASCII_STRINGPARAM("lib") );
+    aLibNameBuf.append( "lib" );
     aLibNameBuf.append( rLibName );
-    aLibNameBuf.appendAscii( RTL_CONSTASCII_STRINGPARAM(".so") );
+    aLibNameBuf.append( ".so" );
 #else
     aLibNameBuf.append( rLibName );
-    aLibNameBuf.appendAscii( RTL_CONSTASCII_STRINGPARAM(".dll") );
+    aLibNameBuf.append( ".dll" );
 #endif
     OUString aLibName( aLibNameBuf.makeStringAndClear() );
     oslModule lib = osl_loadModule( aLibName.pData, SAL_LOADMODULE_LAZY | SAL_LOADMODULE_GLOBAL );
@@ -371,9 +371,9 @@ static void createInstance( Reference< T > & rxOut,
     if (! x.is())
     {
         OUStringBuffer buf( 64 );
-        buf.appendAscii( RTL_CONSTASCII_STRINGPARAM("cannot get service instance \"") );
+        buf.append( "cannot get service instance \"" );
         buf.append( rServiceName );
-        buf.appendAscii( RTL_CONSTASCII_STRINGPARAM("\"!") );
+        buf.append( "\"!" );
         throw RuntimeException( buf.makeStringAndClear(), Reference< XInterface >() );
     }
 
@@ -381,12 +381,12 @@ static void createInstance( Reference< T > & rxOut,
     if (! rxOut.is())
     {
         OUStringBuffer buf( 64 );
-        buf.appendAscii( RTL_CONSTASCII_STRINGPARAM("service instance \"") );
+        buf.append( "service instance \"" );
         buf.append( rServiceName );
-        buf.appendAscii( RTL_CONSTASCII_STRINGPARAM("\" does not support demanded interface \"") );
+        buf.append( "\" does not support demanded interface \"" );
         const Type & rType = ::getCppuType( (const Reference< T > *)0 );
         buf.append( rType.getTypeName() );
-        buf.appendAscii( RTL_CONSTASCII_STRINGPARAM("\"!") );
+        buf.append( "\"!" );
         throw RuntimeException( buf.makeStringAndClear(), Reference< XInterface >() );
     }
 }
@@ -492,9 +492,9 @@ Reference< XInterface > TestImpl::resolveObject( const OUString & rUnoUrl )
     if (! xResolvedObject.is())
     {
         OUStringBuffer buf( 32 );
-        buf.appendAscii( RTL_CONSTASCII_STRINGPARAM("cannot resolve object \"") );
+        buf.append( "cannot resolve object \"" );
         buf.append( rUnoUrl );
-        buf.appendAscii( RTL_CONSTASCII_STRINGPARAM("\"!") );
+        buf.append( "\"!" );
         throw RuntimeException( buf.makeStringAndClear(), Reference< XInterface >() );
     }
 
@@ -993,9 +993,9 @@ sal_Int32 TestImpl::run( const Sequence< OUString > & rArgs )
                 if (! stream)
                 {
                     OUStringBuffer buf( 32 );
-                    buf.appendAscii( RTL_CONSTASCII_STRINGPARAM("cannot open file for writing: \"") );
+                    buf.append( "cannot open file for writing: \"" );
                     buf.append( aLogStr );
-                    buf.appendAscii( RTL_CONSTASCII_STRINGPARAM("\"!") );
+                    buf.append( "\"!" );
                     throw RuntimeException( buf.makeStringAndClear(), Reference< XInterface >() );
                 }
             }
diff --git a/ucb/source/ucp/webdav/SerfPropFindReqProcImpl.cxx b/ucb/source/ucp/webdav/SerfPropFindReqProcImpl.cxx
index ccceaf486d5b..d3f9faa72ccf 100644
--- a/ucb/source/ucp/webdav/SerfPropFindReqProcImpl.cxx
+++ b/ucb/source/ucp/webdav/SerfPropFindReqProcImpl.cxx
@@ -96,7 +96,7 @@ serf_bucket_t * SerfPropFindReqProcImpl::createSerfRequestBucket( serf_request_t
         // TODO is it really needed a Unicode string buffer?
         // All properties and property names aren't supposed to be ASCII?
         rtl::OUStringBuffer aBuffer;
-        aBuffer.appendAscii( RTL_CONSTASCII_STRINGPARAM( PROPFIND_HEADER ));
+        aBuffer.append( PROPFIND_HEADER );
 
         // create and fill body bucket with requested properties
         const int nPropCount = ( !mbOnlyPropertyNames && mpPropNames )
@@ -104,7 +104,7 @@ serf_bucket_t * SerfPropFindReqProcImpl::createSerfRequestBucket( serf_request_t
                                : 0;
         if ( nPropCount > 0 )
         {
-            aBuffer.appendAscii( RTL_CONSTASCII_STRINGPARAM( "<prop>" ) );
+            aBuffer.append( "<prop>" );
             SerfPropName thePropName;
             for ( int theIndex = 0; theIndex < nPropCount; theIndex ++ )
             {
@@ -128,15 +128,15 @@ serf_bucket_t * SerfPropFindReqProcImpl::createSerfRequestBucket( serf_request_t
         {
             if ( mbOnlyPropertyNames )
             {
-                aBuffer.appendAscii( RTL_CONSTASCII_STRINGPARAM( "<propname/>" ));
+                aBuffer.append( "<propname/>" );
             }
             else
             {
-                aBuffer.appendAscii( RTL_CONSTASCII_STRINGPARAM( "<allprop/>" ));
+                aBuffer.append( "<allprop/>" );
             }
         }
 
-        aBuffer.appendAscii( RTL_CONSTASCII_STRINGPARAM( PROPFIND_TRAILER ));
+        aBuffer.append( PROPFIND_TRAILER );
         aBodyText = rtl::OUStringToOString( aBuffer.makeStringAndClear(), RTL_TEXTENCODING_UTF8 );
         body_bkt = serf_bucket_simple_copy_create( aBodyText.getStr(),
                                                    aBodyText.getLength(),
diff --git a/ucb/source/ucp/webdav/SerfPropPatchReqProcImpl.cxx b/ucb/source/ucp/webdav/SerfPropPatchReqProcImpl.cxx
index c3e95b4a60d9..809a81e12cdd 100644
--- a/ucb/source/ucp/webdav/SerfPropPatchReqProcImpl.cxx
+++ b/ucb/source/ucp/webdav/SerfPropPatchReqProcImpl.cxx
@@ -68,14 +68,14 @@ serf_bucket_t * SerfPropPatchReqProcImpl::createSerfRequestBucket( serf_request_
         {
             rtl::OUStringBuffer aBuffer;
             // add PropPatch xml header in front
-            aBuffer.appendAscii( RTL_CONSTASCII_STRINGPARAM( PROPPATCH_HEADER ));
+            aBuffer.append( PROPPATCH_HEADER );
 
             // <*operation code*><prop>
 
             ProppatchOperation lastOp = (*mpProperties)[ 0 ].operation;
-            aBuffer.appendAscii( RTL_CONSTASCII_STRINGPARAM( "<" ));
+            aBuffer.append( "<" );
             aBuffer.appendAscii( OpCode[lastOp].str, OpCode[lastOp].len );
-            aBuffer.appendAscii( RTL_CONSTASCII_STRINGPARAM( "><prop>" ));
+            aBuffer.append( "><prop>" );
 
             SerfPropName thePropName;
             for ( int n = 0; n < nPropCount; ++n )
@@ -88,24 +88,24 @@ serf_bucket_t * SerfPropPatchReqProcImpl::createSerfRequestBucket( serf_request_
                 if ( rProperty.operation != lastOp )
                 {
                     // </prop></*last operation code*><*operation code><prop>
-                    aBuffer.appendAscii( RTL_CONSTASCII_STRINGPARAM( "</prop></" ));
+                    aBuffer.append( "</prop></" );
                     aBuffer.appendAscii( OpCode[lastOp].str, OpCode[lastOp].len );
-                    aBuffer.appendAscii( RTL_CONSTASCII_STRINGPARAM( "><" ));
+                    aBuffer.append( "><" );
                     aBuffer.appendAscii( OpCode[rProperty.operation].str, OpCode[rProperty.operation].len );
-                    aBuffer.appendAscii( RTL_CONSTASCII_STRINGPARAM( "><prop>" ));
+                    aBuffer.append( "><prop>" );
                 }
 
                 // <*propname* xmlns="*propns*"
-                aBuffer.appendAscii( RTL_CONSTASCII_STRINGPARAM( "<" ));
+                aBuffer.append( "<" );
                 aBuffer.appendAscii( thePropName.name );
-                aBuffer.appendAscii( RTL_CONSTASCII_STRINGPARAM( " xmlns=\"" ));
+                aBuffer.append( " xmlns=\"" );
                 aBuffer.appendAscii( thePropName.nspace );
-                aBuffer.appendAscii( RTL_CONSTASCII_STRINGPARAM( "\"" ));
+                aBuffer.append( "\"" );
 
                 if ( rProperty.operation == PROPSET )
                 {
                     // >*property value*</*propname*>
-                    aBuffer.appendAscii( RTL_CONSTASCII_STRINGPARAM( ">" ));
+                    aBuffer.append( ">" );
 
                     OUString aStringValue;
                     if ( DAVProperties::isUCBDeadProperty( thePropName ) )
@@ -118,26 +118,26 @@ serf_bucket_t * SerfPropPatchReqProcImpl::createSerfRequestBucket( serf_request_
                         rProperty.value >>= aStringValue;
                     }
                     aBuffer.append( aStringValue );
-                    aBuffer.appendAscii( RTL_CONSTASCII_STRINGPARAM( "</" ));
+                    aBuffer.append( "</" );
                     aBuffer.appendAscii( thePropName.name );
-                    aBuffer.appendAscii( RTL_CONSTASCII_STRINGPARAM( ">" ));
+                    aBuffer.append( ">" );
                 }
                 else
                 {
                     // />
-                    aBuffer.appendAscii( RTL_CONSTASCII_STRINGPARAM( "/>" ));
+                    aBuffer.append( "/>" );
                 }
 
                 lastOp = rProperty.operation;
             }
 
             // </prop></*last operation code*>
-            aBuffer.appendAscii( RTL_CONSTASCII_STRINGPARAM( "</prop></" ));
+            aBuffer.append( "</prop></" );
             aBuffer.appendAscii( OpCode[lastOp].str, OpCode[lastOp].len );
-            aBuffer.appendAscii( RTL_CONSTASCII_STRINGPARAM( ">" ));
+            aBuffer.append( ">" );
 
             // add PropPatch xml trailer at end
-            aBuffer.appendAscii( RTL_CONSTASCII_STRINGPARAM( PROPPATCH_TRAILER ));
+            aBuffer.append( PROPPATCH_TRAILER );
 
             aBodyText = rtl::OUStringToOString( aBuffer.makeStringAndClear(), RTL_TEXTENCODING_UTF8 );
             body_bkt = serf_bucket_simple_copy_create( aBodyText.getStr(),
diff --git a/ucb/source/ucp/webdav/webdavprovider.cxx b/ucb/source/ucp/webdav/webdavprovider.cxx
index 2389dc479b3f..3bbd12b7a260 100644
--- a/ucb/source/ucp/webdav/webdavprovider.cxx
+++ b/ucb/source/ucp/webdav/webdavprovider.cxx
@@ -35,18 +35,18 @@ using namespace http_dav_ucp;
 OUString &WebDAVUserAgent::operator()() const
 {
     OUStringBuffer aBuffer;
-    aBuffer.appendAscii( RTL_CONSTASCII_STRINGPARAM( "$ooName/$ooSetupVersion" ));
+    aBuffer.append( "$ooName/$ooSetupVersion" );
 #if OSL_DEBUG_LEVEL > 0
 #ifdef APR_VERSION
-    aBuffer.appendAscii( RTL_CONSTASCII_STRINGPARAM( " apr/" APR_VERSION ));
+    aBuffer.append( " apr/" APR_VERSION );
 #endif
 
 #ifdef APR_UTIL_VERSION
-    aBuffer.appendAscii( RTL_CONSTASCII_STRINGPARAM( " apr-util/" APR_UTIL_VERSION ));
+    aBuffer.append( " apr-util/" APR_UTIL_VERSION );
 #endif
 
 #ifdef SERF_VERSION
-    aBuffer.appendAscii( RTL_CONSTASCII_STRINGPARAM( " serf/" SERF_VERSION ));
+    aBuffer.append( " serf/" SERF_VERSION );
 #endif
 #endif
     static OUString aUserAgent( aBuffer.makeStringAndClear() );
author	Noel Grandin <noel@peralex.com>	2013-11-19 17:06:06 +0200
committer	Noel Grandin <noel@peralex.com>	2013-11-20 10:07:32 +0200
commit	52bbd9cc00b5a1e15e4f96b5c5fa5e75855692c1 (patch)
tree	72d0d1d16806f1c785a4f79ea2c0cdfe54bb8101
parent	3af99e4d59d89c343965a928681a30f36b1007d2 (diff)