loplugin:stringconstant: OUStringBuffer: appendAscii -> append

Change-Id: I68b02ad101c4c2165b4618ed5d97cbffc2c43d2d

33 files changed, 272 insertions, 272 deletions

diff --git a/connectivity/source/commontools/DateConversion.cxx b/connectivity/source/commontools/DateConversion.cxx
index ffcc94112d17..a3e5bb8329db 100644
--- a/connectivity/source/commontools/DateConversion.cxx
+++ b/connectivity/source/commontools/DateConversion.cxx
@@ -63,9 +63,9 @@ OUString DBTypeConversion::toSQLString(sal_Int32 eType, const Any& _rVal, bool b
                     if (_rVal.getValueType().getTypeClass() == ::com::sun::star::uno::TypeClass_BOOLEAN)
                     {
                         if (::cppu::any2bool(_rVal))
-                            aRet.appendAscii("1");
+                            aRet.append("1");
                         else
-                            aRet.appendAscii("0");
+                            aRet.append("0");
                     }
                     else
                     {
@@ -78,7 +78,7 @@ OUString DBTypeConversion::toSQLString(sal_Int32 eType, const Any& _rVal, bool b
                 case DataType::VARCHAR:
                 case DataType::LONGVARCHAR:
                     if (bQuote)
-                        aRet.appendAscii("'");
+                        aRet.append("'");
                     {
                         OUString aTemp;
                         _rxTypeConverter->convertToSimpleType(_rVal, TypeClass_STRING) >>= aTemp;
@@ -96,7 +96,7 @@ OUString DBTypeConversion::toSQLString(sal_Int32 eType, const Any& _rVal, bool b
                         aRet.append(aTemp);
                     }
                     if (bQuote)
-                        aRet.appendAscii("'");
+                        aRet.append("'");
                     break;
                 case DataType::REAL:
                 case DataType::DOUBLE:
@@ -136,10 +136,10 @@ OUString DBTypeConversion::toSQLString(sal_Int32 eType, const Any& _rVal, bool b
                     if ( bOk )
                     {
                         if (bQuote)
-                            aRet.appendAscii("{ts '");
+                            aRet.append("{ts '");
                         aRet.append(DBTypeConversion::toDateTimeString(aDateTime));
                         if (bQuote)
-                            aRet.appendAscii("'}");
+                            aRet.append("'}");
                         break;
                     }
                     break;
@@ -166,10 +166,10 @@ OUString DBTypeConversion::toSQLString(sal_Int32 eType, const Any& _rVal, bool b
                         bOk = _rVal >>= aDate;
                     OSL_VERIFY_RES( bOk, "DBTypeConversion::toSQLString: _rVal is not date!");
                     if (bQuote)
-                        aRet.appendAscii("{d '");
+                        aRet.append("{d '");
                     aRet.append(DBTypeConversion::toDateString(aDate));
                     if (bQuote)
-                        aRet.appendAscii("'}");
+                        aRet.append("'}");
                 }   break;
                 case DataType::TIME:
                 {
@@ -193,10 +193,10 @@ OUString DBTypeConversion::toSQLString(sal_Int32 eType, const Any& _rVal, bool b
                         bOk = _rVal >>= aTime;
                     OSL_VERIFY_RES( bOk,"DBTypeConversion::toSQLString: _rVal is not time!");
                     if (bQuote)
-                        aRet.appendAscii("{t '");
+                        aRet.append("{t '");
                     aRet.append(DBTypeConversion::toTimeString(aTime));
                     if (bQuote)
-                        aRet.appendAscii("'}");
+                        aRet.append("'}");
                 } break;
             }
         }
@@ -206,7 +206,7 @@ OUString DBTypeConversion::toSQLString(sal_Int32 eType, const Any& _rVal, bool b
         }
     }
     else
-        aRet.appendAscii(" NULL ");
+        aRet.append(" NULL ");
     return aRet.makeStringAndClear();
 }
 
diff --git a/connectivity/source/commontools/TIndexes.cxx b/connectivity/source/commontools/TIndexes.cxx
index 8c6a3b62889d..6b3b8d9197dd 100644
--- a/connectivity/source/commontools/TIndexes.cxx
+++ b/connectivity/source/commontools/TIndexes.cxx
@@ -141,8 +141,8 @@ sdbcx::ObjectType OIndexesHelper::appendObject( const OUString& _rForName, const
         OUString aDot( "." );
 
         if(comphelper::getBOOL(descriptor->getPropertyValue(rPropMap.getNameByIndex(PROPERTY_ID_ISUNIQUE))))
-            aSql.appendAscii("UNIQUE ");
-        aSql.appendAscii("INDEX ");
+            aSql.append("UNIQUE ");
+        aSql.append("INDEX ");
 
 
         OUString aCatalog,aSchema,aTable;
@@ -153,9 +153,9 @@ sdbcx::ObjectType OIndexesHelper::appendObject( const OUString& _rForName, const
         if (!_rForName.isEmpty() )
         {
             aSql.append( ::dbtools::quoteName( aQuote, _rForName ) );
-            aSql.appendAscii(" ON ");
+            aSql.append(" ON ");
             aSql.append(aComposedName);
-            aSql.appendAscii(" ( ");
+            aSql.append(" ( ");
 
             Reference<XColumnsSupplier> xColumnSup(descriptor,UNO_QUERY);
             Reference<XIndexAccess> xColumns(xColumnSup->getColumns(),UNO_QUERY);
@@ -176,7 +176,7 @@ sdbcx::ObjectType OIndexesHelper::appendObject( const OUString& _rForName, const
                                                 :
                                     " DESC");
                 }
-                aSql.appendAscii(",");
+                aSql.append(",");
             }
             aSql[aSql.getLength() - 1] = ')';
         }
diff --git a/connectivity/source/commontools/TKeys.cxx b/connectivity/source/commontools/TKeys.cxx
index 30ba628b4a37..f24a9f2a19a2 100644
--- a/connectivity/source/commontools/TKeys.cxx
+++ b/connectivity/source/commontools/TKeys.cxx
@@ -157,19 +157,19 @@ sdbcx::ObjectType OKeysHelper::appendObject( const OUString& _rForName, const Re
         // if we're here, we belong to a table which is not new, i.e. already exists in the database.
         // In this case, really append the new index.
         OUStringBuffer aSql;
-        aSql.appendAscii("ALTER TABLE ");
+        aSql.append("ALTER TABLE ");
         OUString aQuote  = m_pTable->getConnection()->getMetaData()->getIdentifierQuoteString(  );
 
         aSql.append(composeTableName( m_pTable->getConnection()->getMetaData(), m_pTable, ::dbtools::eInTableDefinitions, false, false, true ));
-        aSql.appendAscii(" ADD ");
+        aSql.append(" ADD ");
 
         if ( nKeyType == KeyType::PRIMARY )
         {
-            aSql.appendAscii(" PRIMARY KEY (");
+            aSql.append(" PRIMARY KEY (");
         }
         else if ( nKeyType == KeyType::FOREIGN )
         {
-            aSql.appendAscii(" FOREIGN KEY (");
+            aSql.append(" FOREIGN KEY (");
         }
         else
             throw SQLException();
@@ -180,28 +180,28 @@ sdbcx::ObjectType OKeysHelper::appendObject( const OUString& _rForName, const Re
         for(sal_Int32 i = 0 ; i < xColumns->getCount() ; ++i)
         {
             if ( i > 0 )
-                aSql.appendAscii(",");
+                aSql.append(",");
             xColProp.set(xColumns->getByIndex(i), css::uno::UNO_QUERY);
             aSql.append( ::dbtools::quoteName( aQuote,getString(xColProp->getPropertyValue(rPropMap.getNameByIndex(PROPERTY_ID_NAME)))) );
 
         }
-        aSql.appendAscii(")");
+        aSql.append(")");
 
         if ( nKeyType == KeyType::FOREIGN )
         {
-            aSql.appendAscii(" REFERENCES ");
+            aSql.append(" REFERENCES ");
             aSql.append(::dbtools::quoteTableName(m_pTable->getConnection()->getMetaData(),sReferencedName,::dbtools::eInTableDefinitions));
-            aSql.appendAscii(" (");
+            aSql.append(" (");
 
             for(sal_Int32 i=0;i<xColumns->getCount();++i)
             {
                 if ( i > 0 )
-                    aSql.appendAscii(",");
+                    aSql.append(",");
                 xColumns->getByIndex(i) >>= xColProp;
                 aSql.append(::dbtools::quoteName( aQuote,getString(xColProp->getPropertyValue(rPropMap.getNameByIndex(PROPERTY_ID_RELATEDCOLUMN)))));
 
             }
-            aSql.appendAscii(")");
+            aSql.append(")");
             aSql.append(getKeyRuleString(true   ,nUpdateRule));
             aSql.append(getKeyRuleString(false  ,nDeleteRule));
         }
@@ -273,7 +273,7 @@ void OKeysHelper::dropObject(sal_Int32 _nPos, const OUString& _sElementName)
         else
         {
             OUStringBuffer aSql;
-            aSql.appendAscii("ALTER TABLE ");
+            aSql.append("ALTER TABLE ");
 
             aSql.append( composeTableName( m_pTable->getConnection()->getMetaData(), m_pTable,::dbtools::eInTableDefinitions, false, false, true ));
 
@@ -285,7 +285,7 @@ void OKeysHelper::dropObject(sal_Int32 _nPos, const OUString& _sElementName)
             }
             if ( KeyType::PRIMARY == nKeyType )
             {
-                aSql.appendAscii(" DROP PRIMARY KEY");
+                aSql.append(" DROP PRIMARY KEY");
             }
             else
             {
diff --git a/connectivity/source/commontools/dbconversion.cxx b/connectivity/source/commontools/dbconversion.cxx
index 92854f8544e0..0d8e5c022339 100644
--- a/connectivity/source/commontools/dbconversion.cxx
+++ b/connectivity/source/commontools/dbconversion.cxx
@@ -105,7 +105,7 @@ namespace dbtools
     {
         css::util::Date aDate(_rDateTime.Day,_rDateTime.Month,_rDateTime.Year);
         OUStringBuffer aTemp(toDateString(aDate));
-        aTemp.appendAscii(" ");
+        aTemp.append(" ");
         css::util::Time const aTime(_rDateTime.NanoSeconds, _rDateTime.Seconds,
                 _rDateTime.Minutes, _rDateTime.Hours, _rDateTime.IsUTC);
         aTemp.append( toTimeString(aTime) );
diff --git a/connectivity/source/commontools/dbtools.cxx b/connectivity/source/commontools/dbtools.cxx
index a3feae5f497f..43e524423888 100644
--- a/connectivity/source/commontools/dbtools.cxx
+++ b/connectivity/source/commontools/dbtools.cxx
@@ -830,7 +830,7 @@ static OUString impl_doComposeTableName( const Reference< XDatabaseMetaData >& _
     if ( !_rSchema.isEmpty() && aNameComps.bSchemas )
     {
         aComposedName.append( _bQuote ? quoteName( sQuoteString, _rSchema ) : _rSchema );
-        aComposedName.appendAscii( "." );
+        aComposedName.append( "." );
     }
 
     aComposedName.append( _bQuote ? quoteName( sQuoteString, _rName ) : _rName );
@@ -1933,9 +1933,9 @@ void getBooleanComparisonPredicate( const OUString& _rExpression, const bool _bV
     case BooleanComparisonMode::IS_LITERAL:
         _out_rSQLPredicate.append( _rExpression );
         if ( _bValue )
-            _out_rSQLPredicate.appendAscii( " IS TRUE" );
+            _out_rSQLPredicate.append( " IS TRUE" );
         else
-            _out_rSQLPredicate.appendAscii( " IS FALSE" );
+            _out_rSQLPredicate.append( " IS FALSE" );
         break;
 
     case BooleanComparisonMode::EQUAL_LITERAL:
@@ -1946,16 +1946,16 @@ void getBooleanComparisonPredicate( const OUString& _rExpression, const bool _bV
     case BooleanComparisonMode::ACCESS_COMPAT:
         if ( _bValue )
         {
-            _out_rSQLPredicate.appendAscii( " NOT ( ( " );
+            _out_rSQLPredicate.append( " NOT ( ( " );
             _out_rSQLPredicate.append( _rExpression );
-            _out_rSQLPredicate.appendAscii( " = 0 ) OR ( " );
+            _out_rSQLPredicate.append( " = 0 ) OR ( " );
             _out_rSQLPredicate.append( _rExpression );
-            _out_rSQLPredicate.appendAscii( " IS NULL ) )" );
+            _out_rSQLPredicate.append( " IS NULL ) )" );
         }
         else
         {
             _out_rSQLPredicate.append( _rExpression );
-            _out_rSQLPredicate.appendAscii( " = 0" );
+            _out_rSQLPredicate.append( " = 0" );
         }
         break;
 
diff --git a/connectivity/source/commontools/dbtools2.cxx b/connectivity/source/commontools/dbtools2.cxx
index ce7fc96a952c..7f5b6809dfb1 100644
--- a/connectivity/source/commontools/dbtools2.cxx
+++ b/connectivity/source/commontools/dbtools2.cxx
@@ -126,7 +126,7 @@ OUString createStandardTypePart(const Reference< XPropertySet >& xColProp,const
         if ( nParenPos == -1 )
         {
             aSql.append(sTypeName);
-            aSql.appendAscii("(");
+            aSql.append("(");
         }
         else
         {
@@ -137,13 +137,13 @@ OUString createStandardTypePart(const Reference< XPropertySet >& xColProp,const
         {
             aSql.append(nPrecision);
             if ( (nScale > 0) || (!_sCreatePattern.isEmpty() && sCreateParams.indexOf(_sCreatePattern) != -1) )
-                aSql.appendAscii(",");
+                aSql.append(",");
         }
         if ( (nScale > 0) || ( !_sCreatePattern.isEmpty() && sCreateParams.indexOf(_sCreatePattern) != -1 ) || nDataType == DataType::TIMESTAMP )
             aSql.append(nScale);
 
         if ( nParenPos == -1 )
-            aSql.appendAscii(")");
+            aSql.append(")");
         else
         {
             nParenPos = sTypeName.indexOf(')',nParenPos);
@@ -183,7 +183,7 @@ OUString createStandardColumnPart(const Reference< XPropertySet >& xColProp,cons
     if ( xPropInfo.is() && xPropInfo->hasPropertyByName(rPropMap.getNameByIndex(PROPERTY_ID_AUTOINCREMENTCREATION)) )
         xColProp->getPropertyValue(rPropMap.getNameByIndex(PROPERTY_ID_AUTOINCREMENTCREATION)) >>= sAutoIncrementValue;
 
-    aSql.appendAscii(" ");
+    aSql.append(" ");
 
     aSql.append(createStandardTypePart(xColProp, _xConnection, _sCreatePattern));
 
@@ -192,7 +192,7 @@ OUString createStandardColumnPart(const Reference< XPropertySet >& xColProp,cons
 
     if ( bIsAutoIncrement && !sAutoIncrementValue.isEmpty())
     {
-        aSql.appendAscii(" ");
+        aSql.append(" ");
         aSql.append(sAutoIncrementValue);
     }
 
@@ -238,7 +238,7 @@ OUString createStandardCreateStatement(const Reference< XPropertySet >& descript
         if ( (xColumns->getByIndex(i) >>= xColProp) && xColProp.is() )
         {
             aSql.append(createStandardColumnPart(xColProp,_xConnection,_pHelper,_sCreatePattern));
-            aSql.appendAscii(",");
+            aSql.append(",");
         }
     }
     return aSql.makeStringAndClear();
@@ -366,7 +366,7 @@ OUString createStandardKeyStatement(const Reference< XPropertySet >& descriptor,
         if ( aSql[aSql.getLength() - 1] == ',' )
             aSql[aSql.getLength() - 1] = ')';
         else
-            aSql.appendAscii(")");
+            aSql.append(")");
     }
 
     return aSql.makeStringAndClear();
diff --git a/connectivity/source/commontools/filtermanager.cxx b/connectivity/source/commontools/filtermanager.cxx
index ff1f03ec6806..cadb35923ea9 100644
--- a/connectivity/source/commontools/filtermanager.cxx
+++ b/connectivity/source/commontools/filtermanager.cxx
@@ -109,12 +109,12 @@ namespace dbtools
         {
             io_appendTo.insert( 0, '(' );
             io_appendTo.insert( 1, ' ' );
-            io_appendTo.appendAscii( " ) AND " );
+            io_appendTo.append( " ) AND " );
         }
 
-        io_appendTo.appendAscii( "( " );
+        io_appendTo.append( "( " );
         io_appendTo.append( i_component );
-        io_appendTo.appendAscii( " )" );
+        io_appendTo.append( " )" );
     }
 
 
diff --git a/connectivity/source/commontools/parameters.cxx b/connectivity/source/commontools/parameters.cxx
index 1f94a59f1ede..06f16ac94e30 100644
--- a/connectivity/source/commontools/parameters.cxx
+++ b/connectivity/source/commontools/parameters.cxx
@@ -389,9 +389,9 @@ namespace dbtools
                     if ( !sAdditionalFilter.isEmpty() )
                         sAdditionalFilter.append(" AND ");
 
-                    sAdditionalFilter.appendAscii("( ",((sal_Int32)(sizeof("( ")-1)));
+                    sAdditionalFilter.append("( ");
                     sAdditionalFilter.append(*aComponent);
-                    sAdditionalFilter.appendAscii(" )",((sal_Int32)(sizeof(" )")-1)));
+                    sAdditionalFilter.append(" )");
                 }
 
                 // now set this filter at the 's filter manager
diff --git a/connectivity/source/commontools/sqlerror.cxx b/connectivity/source/commontools/sqlerror.cxx
index 58ad8660c738..6c5a8e179cf0 100644
--- a/connectivity/source/commontools/sqlerror.cxx
+++ b/connectivity/source/commontools/sqlerror.cxx
@@ -237,7 +237,7 @@ namespace connectivity
         {
             OUString sResMessage( m_pResources->loadString( lcl_getResourceID( _eCondition, false ) ) );
             OSL_ENSURE( !sResMessage.isEmpty(), "SQLError_Impl::impl_getErrorMessage: illegal error condition, or invalid resource!" );
-            aMessage.append( getMessagePrefix() ).appendAscii( " " ).append( sResMessage );
+            aMessage.append( getMessagePrefix() ).append( " " ).append( sResMessage );
         }
 
         return aMessage.makeStringAndClear();
diff --git a/connectivity/source/drivers/firebird/Util.cxx b/connectivity/source/drivers/firebird/Util.cxx
index c8f182d37924..bf77aa3f3034 100644
--- a/connectivity/source/drivers/firebird/Util.cxx
+++ b/connectivity/source/drivers/firebird/Util.cxx
@@ -30,14 +30,14 @@ OUString firebird::StatusVectorToString(const ISC_STATUS_ARRAY& rStatusVector,
     OUStringBuffer buf;
     const ISC_STATUS* pStatus = reinterpret_cast<const ISC_STATUS*>(&rStatusVector);
 
-    buf.appendAscii("firebird_sdbc error:");
+    buf.append("firebird_sdbc error:");
     try
     {
         char msg[512]; // Size is based on suggestion in docs.
         while(fb_interpret(msg, sizeof(msg), &pStatus))
         {
             // TODO: verify encoding
-            buf.appendAscii("\n*");
+            buf.append("\n*");
             buf.append(OUString(msg, strlen(msg), RTL_TEXTENCODING_UTF8));
         }
     }
@@ -45,7 +45,7 @@ OUString firebird::StatusVectorToString(const ISC_STATUS_ARRAY& rStatusVector,
     {
         SAL_WARN("connectivity.firebird", "ignore fb_interpret exception");
     }
-    buf.appendAscii("\ncaused by\n'").append(rCause).appendAscii("'\n");
+    buf.append("\ncaused by\n'").append(rCause).append("'\n");
 
     OUString error = buf.makeStringAndClear();
     SAL_WARN("connectivity.firebird", error);
diff --git a/connectivity/source/drivers/hsqldb/HConnection.cxx b/connectivity/source/drivers/hsqldb/HConnection.cxx
index 16b537843d44..89bf6b5a1ac5 100644
--- a/connectivity/source/drivers/hsqldb/HConnection.cxx
+++ b/connectivity/source/drivers/hsqldb/HConnection.cxx
@@ -293,9 +293,9 @@ namespace connectivity { namespace hsqldb
 
             // get the table information
             OUStringBuffer sSQL;
-            sSQL.appendAscii( "SELECT HSQLDB_TYPE FROM INFORMATION_SCHEMA.SYSTEM_TABLES" );
+            sSQL.append( "SELECT HSQLDB_TYPE FROM INFORMATION_SCHEMA.SYSTEM_TABLES" );
             HTools::appendTableFilterCrit( sSQL, sCatalog, sSchema, sName, true );
-            sSQL.appendAscii( " AND TABLE_TYPE = 'TABLE'" );
+            sSQL.append( " AND TABLE_TYPE = 'TABLE'" );
 
             Reference< XStatement > xStatement( xMe->createStatement(), UNO_QUERY_THROW );
             Reference< XResultSet > xTableHsqlType( xStatement->executeQuery( sSQL.makeStringAndClear() ), UNO_QUERY_THROW );
@@ -329,10 +329,10 @@ namespace connectivity { namespace hsqldb
             // assemble the image URL
             OUStringBuffer aImageURL;
             // load the graphic from the global graphic repository
-            aImageURL.appendAscii( "private:graphicrepository/" );
+            aImageURL.append( "private:graphicrepository/" );
             // the relative path within the images.zip
-            aImageURL.appendAscii( "database/" );
-            aImageURL.appendAscii( LINKED_TEXT_TABLE_IMAGE_RESOURCE );
+            aImageURL.append( "database/" );
+            aImageURL.append( LINKED_TEXT_TABLE_IMAGE_RESOURCE );
             // the name of the graphic to use
             OUString sImageURL( aImageURL.makeStringAndClear() );
 
diff --git a/connectivity/source/drivers/hsqldb/HDriver.cxx b/connectivity/source/drivers/hsqldb/HDriver.cxx
index 02dfb0558661..bd6cf36f7fae 100644
--- a/connectivity/source/drivers/hsqldb/HDriver.cxx
+++ b/connectivity/source/drivers/hsqldb/HDriver.cxx
@@ -143,9 +143,9 @@ namespace connectivity
         OUString lcl_getPermittedJavaMethods_nothrow( const Reference< XComponentContext >& _rxContext )
         {
             OUStringBuffer aConfigPath;
-            aConfigPath.appendAscii( "/org.openoffice.Office.DataAccess/DriverSettings/" );
+            aConfigPath.append( "/org.openoffice.Office.DataAccess/DriverSettings/" );
             aConfigPath.append     ( ODriverDelegator::getImplementationName_Static() );
-            aConfigPath.appendAscii( "/PermittedJavaMethods" );
+            aConfigPath.append( "/PermittedJavaMethods" );
             ::utl::OConfigurationTreeRoot aConfig( ::utl::OConfigurationTreeRoot::createWithComponentContext(
                 _rxContext, aConfigPath.makeStringAndClear() ) );
 
@@ -882,9 +882,9 @@ namespace connectivity
             if ( xStatement.is() )
             {
                 OUStringBuffer aStatement;
-                aStatement.appendAscii( "SET DATABASE COLLATION \"" );
+                aStatement.append( "SET DATABASE COLLATION \"" );
                 aStatement.appendAscii( lcl_getCollationForLocale( lcl_getSystemLocale( m_xContext ) ) );
-                aStatement.appendAscii( "\"" );
+                aStatement.append( "\"" );
 
                 xStatement->execute( aStatement.makeStringAndClear() );
             }
diff --git a/connectivity/source/drivers/hsqldb/HTools.cxx b/connectivity/source/drivers/hsqldb/HTools.cxx
index 49cfdfd56ad8..9794aee76286 100644
--- a/connectivity/source/drivers/hsqldb/HTools.cxx
+++ b/connectivity/source/drivers/hsqldb/HTools.cxx
@@ -26,24 +26,24 @@ namespace connectivity { namespace hsqldb
     void HTools::appendTableFilterCrit( OUStringBuffer& _inout_rBuffer, const OUString& _rCatalog,
         const OUString& _rSchema, const OUString& _rName, bool _bShortForm )
     {
-        _inout_rBuffer.appendAscii( " WHERE " );
+        _inout_rBuffer.append( " WHERE " );
         if ( !_rCatalog.isEmpty() )
         {
             _inout_rBuffer.appendAscii( _bShortForm ? "TABLE_CAT" : "TABLE_CATALOG" );
-            _inout_rBuffer.appendAscii( " = '" );
+            _inout_rBuffer.append( " = '" );
             _inout_rBuffer.append     ( _rCatalog );
-            _inout_rBuffer.appendAscii( "' AND " );
+            _inout_rBuffer.append( "' AND " );
         }
         if ( !_rSchema.isEmpty() )
         {
             _inout_rBuffer.appendAscii( _bShortForm ? "TABLE_SCHEM" : "TABLE_SCHEMA" );
-            _inout_rBuffer.appendAscii( " = '" );
+            _inout_rBuffer.append( " = '" );
             _inout_rBuffer.append     ( _rSchema );
-            _inout_rBuffer.appendAscii( "' AND " );
+            _inout_rBuffer.append( "' AND " );
         }
-        _inout_rBuffer.appendAscii( "TABLE_NAME = '" );
+        _inout_rBuffer.append( "TABLE_NAME = '" );
         _inout_rBuffer.append     ( _rName );
-        _inout_rBuffer.appendAscii( "'" );
+        _inout_rBuffer.append( "'" );
     }
 
 
diff --git a/connectivity/source/drivers/hsqldb/HView.cxx b/connectivity/source/drivers/hsqldb/HView.cxx
index 8c2b987fc1db..f4f6442d9a1d 100644
--- a/connectivity/source/drivers/hsqldb/HView.cxx
+++ b/connectivity/source/drivers/hsqldb/HView.cxx
@@ -94,9 +94,9 @@ namespace connectivity { namespace hsqldb
         // create a statement which can be used to re-create the original view, in case
         // dropping it succeeds, but creating it with a new statement fails
         OUStringBuffer aRestoreCommand;
-        aRestoreCommand.appendAscii( "CREATE VIEW " );
+        aRestoreCommand.append( "CREATE VIEW " );
         aRestoreCommand.append     ( sQualifiedName );
-        aRestoreCommand.appendAscii( " AS " );
+        aRestoreCommand.append( " AS " );
         aRestoreCommand.append     ( impl_getCommand_throwSQLException() );
         OUString sRestoreCommand( aRestoreCommand.makeStringAndClear() );
 
@@ -105,15 +105,15 @@ namespace connectivity { namespace hsqldb
         {
             // drop the existing view
             OUStringBuffer aCommand;
-            aCommand.appendAscii( "DROP VIEW " );
+            aCommand.append( "DROP VIEW " );
             aCommand.append     ( sQualifiedName );
             xStatement->execute( aCommand.makeStringAndClear() );
             bDropSucceeded = true;
 
             // create a new one with the same name
-            aCommand.appendAscii( "CREATE VIEW " );
+            aCommand.append( "CREATE VIEW " );
             aCommand.append     ( sQualifiedName );
-            aCommand.appendAscii( " AS " );
+            aCommand.append( " AS " );
             aCommand.append     ( _rNewCommand );
             xStatement->execute( aCommand.makeStringAndClear() );
         }
@@ -156,7 +156,7 @@ namespace connectivity { namespace hsqldb
     OUString HView::impl_getCommand() const
     {
         OUStringBuffer aCommand;
-        aCommand.appendAscii( "SELECT VIEW_DEFINITION FROM INFORMATION_SCHEMA.SYSTEM_VIEWS " );
+        aCommand.append( "SELECT VIEW_DEFINITION FROM INFORMATION_SCHEMA.SYSTEM_VIEWS " );
         HTools::appendTableFilterCrit( aCommand, m_CatalogName, m_SchemaName, m_Name, false );
         ::utl::SharedUNOComponent< XStatement > xStatement; xStatement.set( m_xConnection->createStatement(), UNO_QUERY_THROW );
         Reference< XResultSet > xResult( xStatement->executeQuery( aCommand.makeStringAndClear() ), UNO_QUERY_THROW );
diff --git a/connectivity/source/drivers/macab/MacabDriver.cxx b/connectivity/source/drivers/macab/MacabDriver.cxx
index 0d6ac6a6302f..3972e5bc289d 100644
--- a/connectivity/source/drivers/macab/MacabDriver.cxx
+++ b/connectivity/source/drivers/macab/MacabDriver.cxx
@@ -314,8 +314,8 @@ void SAL_CALL MacabDriver::disposing( const EventObject& ) throw (RuntimeExcepti
 OUString MacabDriver::impl_getConfigurationSettingsPath()
 {
     OUStringBuffer aPath;
-    aPath.appendAscii( "/org.openoffice.Office.DataAccess/DriverSettings/" );
-    aPath.appendAscii( "com.sun.star.comp.sdbc.macab.Driver" );
+    aPath.append( "/org.openoffice.Office.DataAccess/DriverSettings/" );
+    aPath.append( "com.sun.star.comp.sdbc.macab.Driver" );
     return aPath.makeStringAndClear();
 }
 
diff --git a/connectivity/source/drivers/mysql/YTables.cxx b/connectivity/source/drivers/mysql/YTables.cxx
index 25949eb04177..a631f6ce6188 100644
--- a/connectivity/source/drivers/mysql/YTables.cxx
+++ b/connectivity/source/drivers/mysql/YTables.cxx
@@ -213,9 +213,9 @@ void OTables::addComment(const Reference< XPropertySet >& descriptor,OUStringBuf
     descriptor->getPropertyValue(OMetaConnection::getPropMap().getNameByIndex(PROPERTY_ID_DESCRIPTION))     >>= sDesc;
     if ( !sDesc.isEmpty() )
     {
-        _rOut.appendAscii(" COMMENT '");
+        _rOut.append(" COMMENT '");
         _rOut.append(sDesc);
-        _rOut.appendAscii("'");
+        _rOut.append("'");
     }
 }
 
diff --git a/connectivity/source/drivers/odbc/ODatabaseMetaData.cxx b/connectivity/source/drivers/odbc/ODatabaseMetaData.cxx
index a52608afa5db..9b05604d0b56 100644
--- a/connectivity/source/drivers/odbc/ODatabaseMetaData.cxx
+++ b/connectivity/source/drivers/odbc/ODatabaseMetaData.cxx
@@ -1309,53 +1309,53 @@ OUString SAL_CALL ODatabaseMetaData::getStringFunctions(  ) throw(SQLException,
     OUStringBuffer aValue;
     OTools::GetInfo(m_pConnection,m_aConnectionHandle,SQL_STRING_FUNCTIONS,nValue,*this);
     if(nValue & SQL_FN_STR_ASCII)
-        aValue.appendAscii("ASCII,");
+        aValue.append("ASCII,");
     if(nValue & SQL_FN_STR_BIT_LENGTH)
-        aValue.appendAscii("BIT_LENGTH,");
+        aValue.append("BIT_LENGTH,");
     if(nValue & SQL_FN_STR_CHAR)
-        aValue.appendAscii("CHAR,");
+        aValue.append("CHAR,");
     if(nValue & SQL_FN_STR_CHAR_LENGTH)
-        aValue.appendAscii("CHAR_LENGTH,");
+        aValue.append("CHAR_LENGTH,");
     if(nValue & SQL_FN_STR_CHARACTER_LENGTH)
-        aValue.appendAscii("CHARACTER_LENGTH,");
+        aValue.append("CHARACTER_LENGTH,");
     if(nValue & SQL_FN_STR_CONCAT)
-        aValue.appendAscii("CONCAT,");
+        aValue.append("CONCAT,");
     if(nValue & SQL_FN_STR_DIFFERENCE)
-        aValue.appendAscii("DIFFERENCE,");
+        aValue.append("DIFFERENCE,");
     if(nValue & SQL_FN_STR_INSERT)
-        aValue.appendAscii("INSERT,");
+        aValue.append("INSERT,");
     if(nValue & SQL_FN_STR_LCASE)
-        aValue.appendAscii("LCASE,");
+        aValue.append("LCASE,");
     if(nValue & SQL_FN_STR_LEFT)
-        aValue.appendAscii("LEFT,");
+        aValue.append("LEFT,");
     if(nValue & SQL_FN_STR_LENGTH)
-        aValue.appendAscii("LENGTH,");
+        aValue.append("LENGTH,");
     if(nValue & SQL_FN_STR_LOCATE)
-        aValue.appendAscii("LOCATE,");
+        aValue.append("LOCATE,");
     if(nValue & SQL_FN_STR_LOCATE_2)
-        aValue.appendAscii("LOCATE_2,");
+        aValue.append("LOCATE_2,");
     if(nValue & SQL_FN_STR_LTRIM)
-        aValue.appendAscii("LTRIM,");
+        aValue.append("LTRIM,");
     if(nValue & SQL_FN_STR_OCTET_LENGTH)
-        aValue.appendAscii("OCTET_LENGTH,");
+        aValue.append("OCTET_LENGTH,");
     if(nValue & SQL_FN_STR_POSITION)
-        aValue.appendAscii("POSITION,");
+        aValue.append("POSITION,");
     if(nValue & SQL_FN_STR_REPEAT)
-        aValue.appendAscii("REPEAT,");
+        aValue.append("REPEAT,");
     if(nValue & SQL_FN_STR_REPLACE)
-        aValue.appendAscii("REPLACE,");
+        aValue.append("REPLACE,");
     if(nValue & SQL_FN_STR_RIGHT)
-        aValue.appendAscii("RIGHT,");
+        aValue.append("RIGHT,");
     if(nValue & SQL_FN_STR_RTRIM)
-        aValue.appendAscii("RTRIM,");
+        aValue.append("RTRIM,");
     if(nValue & SQL_FN_STR_SOUNDEX)
-        aValue.appendAscii("SOUNDEX,");
+        aValue.append("SOUNDEX,");
     if(nValue & SQL_FN_STR_SPACE)
-        aValue.appendAscii("SPACE,");
+        aValue.append("SPACE,");
     if(nValue & SQL_FN_STR_SUBSTRING)
-        aValue.appendAscii("SUBSTRING,");
+        aValue.append("SUBSTRING,");
     if(nValue & SQL_FN_STR_UCASE)
-        aValue.appendAscii("UCASE,");
+        aValue.append("UCASE,");
 
 
     if ( !aValue.isEmpty() )
@@ -1371,47 +1371,47 @@ OUString SAL_CALL ODatabaseMetaData::getTimeDateFunctions(  ) throw(SQLException
     OTools::GetInfo(m_pConnection,m_aConnectionHandle,SQL_TIMEDATE_FUNCTIONS,nValue,*this);
 
     if(nValue & SQL_FN_TD_CURRENT_DATE)
-        aValue.appendAscii("CURRENT_DATE,");
+        aValue.append("CURRENT_DATE,");
     if(nValue & SQL_FN_TD_CURRENT_TIME)
-        aValue.appendAscii("CURRENT_TIME,");
+        aValue.append("CURRENT_TIME,");
     if(nValue & SQL_FN_TD_CURRENT_TIMESTAMP)
-        aValue.appendAscii("CURRENT_TIMESTAMP,");
+        aValue.append("CURRENT_TIMESTAMP,");
     if(nValue & SQL_FN_TD_CURDATE)
-        aValue.appendAscii("CURDATE,");
+        aValue.append("CURDATE,");
     if(nValue & SQL_FN_TD_CURTIME)
-        aValue.appendAscii("CURTIME,");
+        aValue.append("CURTIME,");
     if(nValue & SQL_FN_TD_DAYNAME)
-        aValue.appendAscii("DAYNAME,");
+        aValue.append("DAYNAME,");
     if(nValue & SQL_FN_TD_DAYOFMONTH)
-        aValue.appendAscii("DAYOFMONTH,");
+        aValue.append("DAYOFMONTH,");
     if(nValue & SQL_FN_TD_DAYOFWEEK)
-        aValue.appendAscii("DAYOFWEEK,");
+        aValue.append("DAYOFWEEK,");
     if(nValue & SQL_FN_TD_DAYOFYEAR)
-        aValue.appendAscii("DAYOFYEAR,");
+        aValue.append("DAYOFYEAR,");
     if(nValue & SQL_FN_TD_EXTRACT)
-        aValue.appendAscii("EXTRACT,");
+        aValue.append("EXTRACT,");
     if(nValue & SQL_FN_TD_HOUR)
-        aValue.appendAscii("HOUR,");
+        aValue.append("HOUR,");
     if(nValue & SQL_FN_TD_MINUTE)
-        aValue.appendAscii("MINUTE,");
+        aValue.append("MINUTE,");
     if(nValue & SQL_FN_TD_MONTH)
-        aValue.appendAscii("MONTH,");
+        aValue.append("MONTH,");
     if(nValue & SQL_FN_TD_MONTHNAME)
-        aValue.appendAscii("MONTHNAME,");
+        aValue.append("MONTHNAME,");
     if(nValue & SQL_FN_TD_NOW)
-        aValue.appendAscii("NOW,");
+        aValue.append("NOW,");
     if(nValue & SQL_FN_TD_QUARTER)
-        aValue.appendAscii("QUARTER,");
+        aValue.append("QUARTER,");
     if(nValue & SQL_FN_TD_SECOND)
-        aValue.appendAscii("SECOND,");
+        aValue.append("SECOND,");
     if(nValue & SQL_FN_TD_TIMESTAMPADD)
-        aValue.appendAscii("TIMESTAMPADD,");
+        aValue.append("TIMESTAMPADD,");
     if(nValue & SQL_FN_TD_TIMESTAMPDIFF)
-        aValue.appendAscii("TIMESTAMPDIFF,");
+        aValue.append("TIMESTAMPDIFF,");
     if(nValue & SQL_FN_TD_WEEK)
-        aValue.appendAscii("WEEK,");
+        aValue.append("WEEK,");
     if(nValue & SQL_FN_TD_YEAR)
-        aValue.appendAscii("YEAR,");
+        aValue.append("YEAR,");
 
     if ( !aValue.isEmpty() )
         aValue.setLength(aValue.getLength()-1);
@@ -1426,11 +1426,11 @@ OUString SAL_CALL ODatabaseMetaData::getSystemFunctions(  ) throw(SQLException,
     OTools::GetInfo(m_pConnection,m_aConnectionHandle,SQL_SYSTEM_FUNCTIONS,nValue,*this);
 
     if(nValue & SQL_FN_SYS_DBNAME)
-        aValue.appendAscii("DBNAME,");
+        aValue.append("DBNAME,");
     if(nValue & SQL_FN_SYS_IFNULL)
-        aValue.appendAscii("IFNULL,");
+        aValue.append("IFNULL,");
     if(nValue & SQL_FN_SYS_USERNAME)
-        aValue.appendAscii("USERNAME,");
+        aValue.append("USERNAME,");
 
     if ( !aValue.isEmpty() )
         aValue.setLength(aValue.getLength()-1);
@@ -1445,53 +1445,53 @@ OUString SAL_CALL ODatabaseMetaData::getNumericFunctions(  ) throw(SQLException,
     OTools::GetInfo(m_pConnection,m_aConnectionHandle,SQL_NUMERIC_FUNCTIONS,nValue,*this);
 
     if(nValue & SQL_FN_NUM_ABS)
-        aValue.appendAscii("ABS,");
+        aValue.append("ABS,");
     if(nValue & SQL_FN_NUM_ACOS)
-        aValue.appendAscii("ACOS,");
+        aValue.append("ACOS,");
     if(nValue & SQL_FN_NUM_ASIN)
-        aValue.appendAscii("ASIN,");
+        aValue.append("ASIN,");
     if(nValue & SQL_FN_NUM_ATAN)
-        aValue.appendAscii("ATAN,");
+        aValue.append("ATAN,");
     if(nValue & SQL_FN_NUM_ATAN2)
-        aValue.appendAscii("ATAN2,");
+        aValue.append("ATAN2,");
     if(nValue & SQL_FN_NUM_CEILING)
-        aValue.appendAscii("CEILING,");
+        aValue.append("CEILING,");
     if(nValue & SQL_FN_NUM_COS)
-        aValue.appendAscii("COS,");
+        aValue.append("COS,");
     if(nValue & SQL_FN_NUM_COT)
-        aValue.appendAscii("COT,");
+        aValue.append("COT,");
     if(nValue & SQL_FN_NUM_DEGREES)
-        aValue.appendAscii("DEGREES,");
+        aValue.append("DEGREES,");
     if(nValue & SQL_FN_NUM_EXP)
-        aValue.appendAscii("EXP,");
+        aValue.append("EXP,");
     if(nValue & SQL_FN_NUM_FLOOR)
-        aValue.appendAscii("FLOOR,");
+        aValue.append("FLOOR,");
     if(nValue & SQL_FN_NUM_LOG)
-        aValue.appendAscii("LOGF,");
+        aValue.append("LOGF,");
     if(nValue & SQL_FN_NUM_LOG10)
-        aValue.appendAscii("LOG10,");
+        aValue.append("LOG10,");
     if(nValue & SQL_FN_NUM_MOD)
-        aValue.appendAscii("MOD,");
+        aValue.append("MOD,");
     if(nValue & SQL_FN_NUM_PI)
-        aValue.appendAscii("PI,");
+        aValue.append("PI,");
     if(nValue & SQL_FN_NUM_POWER)
-        aValue.appendAscii("POWER,");
+        aValue.append("POWER,");
     if(nValue & SQL_FN_NUM_RADIANS)
-        aValue.appendAscii("RADIANS,");
+        aValue.append("RADIANS,");
     if(nValue & SQL_FN_NUM_RAND)
-        aValue.appendAscii("RAND,");
+        aValue.append("RAND,");
     if(nValue & SQL_FN_NUM_ROUND)
-        aValue.appendAscii("ROUND,");
+        aValue.append("ROUND,");
     if(nValue & SQL_FN_NUM_SIGN)
-        aValue.appendAscii("SIGN,");
+        aValue.append("SIGN,");
     if(nValue & SQL_FN_NUM_SIN)
-        aValue.appendAscii("SIN,");
+        aValue.append("SIN,");
     if(nValue & SQL_FN_NUM_SQRT)
-        aValue.appendAscii("SQRT,");
+        aValue.append("SQRT,");
     if(nValue & SQL_FN_NUM_TAN)
-        aValue.appendAscii("TAN,");
+        aValue.append("TAN,");
     if(nValue & SQL_FN_NUM_TRUNCATE)
-        aValue.appendAscii("TRUNCATE,");
+        aValue.append("TRUNCATE,");
 
     if ( !aValue.isEmpty() )
         aValue.setLength(aValue.getLength()-1);
diff --git a/connectivity/source/drivers/postgresql/pq_baseresultset.cxx b/connectivity/source/drivers/postgresql/pq_baseresultset.cxx
index 3a003b0414e6..db11fc9d7126 100644
--- a/connectivity/source/drivers/postgresql/pq_baseresultset.cxx
+++ b/connectivity/source/drivers/postgresql/pq_baseresultset.cxx
@@ -635,9 +635,9 @@ sal_Bool BaseResultSet::convertFastPropertyValue(
     default:
     {
         OUStringBuffer buf(128);
-        buf.appendAscii( "pq_resultset: Invalid property handle (" );
+        buf.append( "pq_resultset: Invalid property handle (" );
         buf.append( nHandle );
-        buf.appendAscii( ")" );
+        buf.append( ")" );
         throw IllegalArgumentException( buf.makeStringAndClear(), *this, 2 );
     }
     }
@@ -672,11 +672,11 @@ void BaseResultSet::checkColumnIndex(sal_Int32 index ) throw ( SQLException, Run
     if( index < 1 || index > m_fieldCount )
     {
         OUStringBuffer buf(128);
-        buf.appendAscii( "pq_resultset: index out of range (" );
+        buf.append( "pq_resultset: index out of range (" );
         buf.append( index );
-        buf.appendAscii( ", allowed range is 1 to " );
+        buf.append( ", allowed range is 1 to " );
         buf.append( m_fieldCount );
-        buf.appendAscii( ")" );
+        buf.append( ")" );
         throw SQLException( buf.makeStringAndClear(), *this, OUString(), 1, Any() );
     }
 
@@ -685,14 +685,14 @@ void BaseResultSet::checkColumnIndex(sal_Int32 index ) throw ( SQLException, Run
 void BaseResultSet::checkRowIndex( bool mustBeOnValidRow )
 {
     OUStringBuffer buf( 128 );
-    buf.appendAscii( "pq_baseresultset: row index out of range, allowed is " );
+    buf.append( "pq_baseresultset: row index out of range, allowed is " );
     if( mustBeOnValidRow )
     {
         if( m_row < 0 || m_row >= m_rowCount )
         {
-            buf.appendAscii( "0 to " );
+            buf.append( "0 to " );
             buf.append( ((sal_Int32)(m_rowCount -1)) );
-            buf.appendAscii( ", got " );
+            buf.append( ", got " );
             buf.append( m_row );
             throw SQLException( buf.makeStringAndClear(), *this, OUString(),1, Any() );
         }
@@ -701,9 +701,9 @@ void BaseResultSet::checkRowIndex( bool mustBeOnValidRow )
     {
         if( m_row < -1 || m_row > m_rowCount )
         {
-            buf.appendAscii( "-1 to " );
+            buf.append( "-1 to " );
             buf.append( m_rowCount );
-            buf.appendAscii( ", got " );
+            buf.append( ", got " );
             buf.append( m_row );
             throw SQLException( buf.makeStringAndClear(), *this, OUString(),1, Any() );
         }
diff --git a/connectivity/source/drivers/postgresql/pq_connection.cxx b/connectivity/source/drivers/postgresql/pq_connection.cxx
index 15b00b3102c9..3ccf92a8e34a 100644
--- a/connectivity/source/drivers/postgresql/pq_connection.cxx
+++ b/connectivity/source/drivers/postgresql/pq_connection.cxx
@@ -515,7 +515,7 @@ void Connection::initialize( const Sequence< Any >& aArguments )
     if( aArguments.getLength() != 2 )
     {
         OUStringBuffer buf(128);
-        buf.appendAscii( "pq_driver: expected 2 arguments, got " );
+        buf.append( "pq_driver: expected 2 arguments, got " );
         buf.append( aArguments.getLength( ) );
         throw IllegalArgumentException(buf.makeStringAndClear(), Reference< XInterface > () , 0 );
     }
@@ -523,7 +523,7 @@ void Connection::initialize( const Sequence< Any >& aArguments )
     if( ! (aArguments[0] >>= url) )
     {
         OUStringBuffer buf(128);
-        buf.appendAscii( "pq_driver: expected string as first argument, got " );
+        buf.append( "pq_driver: expected string as first argument, got " );
         buf.append( aArguments[0].getValueType().getTypeName() );
         throw IllegalArgumentException( buf.makeStringAndClear() , *this, 0 );
     }
@@ -559,9 +559,9 @@ void Connection::initialize( const Sequence< Any >& aArguments )
                 else
                     errorMessage = "#no error message#";
                 OUStringBuffer buf( 128 );
-                buf.appendAscii( "Error in database URL '" );
+                buf.append( "Error in database URL '" );
                 buf.append( url );
-                buf.appendAscii( "':\n" );
+                buf.append( "':\n" );
                 buf.append( errorMessage );
                 // HY092 is "Invalid attribute/option identifier."
                 // Just the most likely error; the error might be  HY024 "Invalid attribute value".
@@ -591,9 +591,9 @@ void Connection::initialize( const Sequence< Any >& aArguments )
 
         const char * error = PQerrorMessage( m_settings.pConnection );
         OUString errorMessage( error, strlen( error) , RTL_TEXTENCODING_ASCII_US );
-        buf.appendAscii( "Couldn't establish database connection to '" );
+        buf.append( "Couldn't establish database connection to '" );
         buf.append( url );
-        buf.appendAscii( "'\n" );
+        buf.append( "'\n" );
         buf.append( errorMessage );
         PQfinish( m_settings.pConnection );
         m_settings.pConnection = 0;
@@ -609,9 +609,9 @@ void Connection::initialize( const Sequence< Any >& aArguments )
     if( isLog( &m_settings, LogLevel::INFO ) )
     {
         OUStringBuffer buf( 128 );
-        buf.appendAscii( "connection to '" );
+        buf.append( "connection to '" );
         buf.append( url );
-        buf.appendAscii( "' successfully opened" );
+        buf.append( "' successfully opened" );
         log( &m_settings, LogLevel::INFO, buf.makeStringAndClear() );
     }
 }
diff --git a/connectivity/source/drivers/postgresql/pq_databasemetadata.cxx b/connectivity/source/drivers/postgresql/pq_databasemetadata.cxx
index 366fb61ebc46..701bad72a47c 100644
--- a/connectivity/source/drivers/postgresql/pq_databasemetadata.cxx
+++ b/connectivity/source/drivers/postgresql/pq_databasemetadata.cxx
@@ -1138,9 +1138,9 @@ sal_Bool DatabaseMetaData::dataDefinitionIgnoredInTransactions(  ) throw (SQLExc
     if( isLog( m_pSettings, LogLevel::INFO ) )
     {
         OUStringBuffer buf( 128 );
-        buf.appendAscii( "DatabaseMetaData::getTables got called with " );
+        buf.append( "DatabaseMetaData::getTables got called with " );
         buf.append( schemaPattern );
-        buf.appendAscii( "." );
+        buf.append( "." );
         buf.append( tableNamePattern );
         log( m_pSettings, LogLevel::INFO, buf.makeStringAndClear() );
     }
@@ -1425,8 +1425,8 @@ static void columnMetaData2DatabaseTypeDescription(
         {
             oidMap[row->getInt(12)] = DatabaseTypeDescription();
             if( domains )
-                queryBuf.appendAscii( " OR " );
-            queryBuf.appendAscii( "oid = " );
+                queryBuf.append( " OR " );
+            queryBuf.append( "oid = " );
             queryBuf.append( row->getInt(12 ) );
             domains ++;
         }
@@ -1464,11 +1464,11 @@ static void columnMetaData2DatabaseTypeDescription(
     if( isLog( m_pSettings, LogLevel::INFO ) )
     {
         OUStringBuffer buf( 128 );
-        buf.appendAscii( "DatabaseMetaData::getColumns got called with " );
+        buf.append( "DatabaseMetaData::getColumns got called with " );
         buf.append( schemaPattern );
-        buf.appendAscii( "." );
+        buf.append( "." );
         buf.append( tableNamePattern );
-        buf.appendAscii( "." );
+        buf.append( "." );
         buf.append( columnNamePattern );
         log( m_pSettings, LogLevel::INFO, buf.makeStringAndClear() );
     }
@@ -1647,11 +1647,11 @@ static void columnMetaData2DatabaseTypeDescription(
     if( isLog( m_pSettings, LogLevel::INFO ) )
     {
         OUStringBuffer buf( 128 );
-        buf.appendAscii( "DatabaseMetaData::getColumnPrivileges got called with " );
+        buf.append( "DatabaseMetaData::getColumnPrivileges got called with " );
         buf.append( schema );
-        buf.appendAscii( "." );
+        buf.append( "." );
         buf.append( table );
-        buf.appendAscii( "." );
+        buf.append( "." );
         buf.append( columnNamePattern );
         log( m_pSettings, LogLevel::INFO, buf.makeStringAndClear() );
     }
@@ -1676,9 +1676,9 @@ static void columnMetaData2DatabaseTypeDescription(
     if( isLog( m_pSettings, LogLevel::INFO ) )
     {
         OUStringBuffer buf( 128 );
-        buf.appendAscii( "DatabaseMetaData::getTablePrivileges got called with " );
+        buf.append( "DatabaseMetaData::getTablePrivileges got called with " );
         buf.append( schemaPattern );
-        buf.appendAscii( "." );
+        buf.append( "." );
         buf.append( tableNamePattern );
         log( m_pSettings, LogLevel::INFO, buf.makeStringAndClear() );
     }
@@ -1734,9 +1734,9 @@ static void columnMetaData2DatabaseTypeDescription(
     if( isLog( m_pSettings, LogLevel::INFO ) )
     {
         OUStringBuffer buf( 128 );
-        buf.appendAscii( "DatabaseMetaData::getPrimaryKeys got called with " );
+        buf.append( "DatabaseMetaData::getPrimaryKeys got called with " );
         buf.append( schema );
-        buf.appendAscii( "." );
+        buf.append( "." );
         buf.append( table );
         log( m_pSettings, LogLevel::INFO, buf.makeStringAndClear() );
     }
diff --git a/connectivity/source/drivers/postgresql/pq_preparedstatement.cxx b/connectivity/source/drivers/postgresql/pq_preparedstatement.cxx
index 57804c0f15d7..f11ada3dfb64 100644
--- a/connectivity/source/drivers/postgresql/pq_preparedstatement.cxx
+++ b/connectivity/source/drivers/postgresql/pq_preparedstatement.cxx
@@ -222,13 +222,13 @@ void PreparedStatement::checkColumnIndex( sal_Int32 parameterIndex )
     if( parameterIndex < 1 || parameterIndex > (sal_Int32) m_vars.size() )
     {
         OUStringBuffer buf( 128 );
-        buf.appendAscii( "pq_preparedstatement: parameter index out of range (expected 1 to " );
+        buf.append( "pq_preparedstatement: parameter index out of range (expected 1 to " );
         buf.append( (sal_Int32 ) m_vars.size() );
-        buf.appendAscii( ", got " );
+        buf.append( ", got " );
         buf.append( parameterIndex );
-        buf.appendAscii( ", statement '" );
+        buf.append( ", statement '" );
         buf.append( OStringToOUString( m_stmt, m_pSettings->encoding ) );
-        buf.appendAscii( "')" );
+        buf.append( "')" );
         throw SQLException( buf.makeStringAndClear(), *this, OUString(), 1, Any () );
     }
 }
@@ -315,18 +315,18 @@ void PreparedStatement::raiseSQLException(
     throw( SQLException )
 {
     OUStringBuffer buf(128);
-    buf.appendAscii( "pq_driver: ");
+    buf.append( "pq_driver: ");
     if( errorType )
     {
-        buf.appendAscii( "[" );
+        buf.append( "[" );
         buf.appendAscii( errorType );
-        buf.appendAscii( "]" );
+        buf.append( "]" );
     }
     buf.append(
         OUString( errorMsg, strlen(errorMsg) , m_pSettings->encoding ) );
-    buf.appendAscii( " (caused by statement '" );
+    buf.append( " (caused by statement '" );
     buf.appendAscii( m_executedStatement.getStr() );
-    buf.appendAscii( "')" );
+    buf.append( "')" );
     OUString error = buf.makeStringAndClear();
     log( m_pSettings, LogLevel::ERROR, error );
     throw SQLException( error, *this, OUString(), 1, Any() );
@@ -800,9 +800,9 @@ sal_Bool PreparedStatement::convertFastPropertyValue(
     default:
     {
         OUStringBuffer buf(128);
-        buf.appendAscii( "pq_statement: Invalid property handle (" );
+        buf.append( "pq_statement: Invalid property handle (" );
         buf.append( nHandle );
-        buf.appendAscii( ")" );
+        buf.append( ")" );
         throw IllegalArgumentException( buf.makeStringAndClear(), *this, 2 );
     }
     }
diff --git a/connectivity/source/drivers/postgresql/pq_resultsetmetadata.cxx b/connectivity/source/drivers/postgresql/pq_resultsetmetadata.cxx
index 461241c34ee7..ee82f3035e1e 100644
--- a/connectivity/source/drivers/postgresql/pq_resultsetmetadata.cxx
+++ b/connectivity/source/drivers/postgresql/pq_resultsetmetadata.cxx
@@ -161,13 +161,13 @@ void ResultSetMetaData::checkForTypes()
             extractConnectionFromStatement( m_origin->getStatement() )->createStatement();
         DisposeGuard guard( stmt );
         OUStringBuffer buf(128);
-        buf.appendAscii( "SELECT oid, typname, typtype FROM pg_type WHERE ");
+        buf.append( "SELECT oid, typname, typtype FROM pg_type WHERE ");
         for( int i  = 0 ; i < m_colCount ; i ++ )
         {
             if( i > 0 )
-                buf.appendAscii( " OR " );
+                buf.append( " OR " );
             int oid = m_colDesc[i].typeOid;
-            buf.appendAscii( "oid=" );
+            buf.append( "oid=" );
             buf.append( (sal_Int32) oid );
         }
         Reference< XResultSet > rs = stmt->executeQuery( buf.makeStringAndClear() );
@@ -459,9 +459,9 @@ void ResultSetMetaData::checkColumnIndex(sal_Int32 columnIndex)
     {
         OUStringBuffer buf(128);
 
-        buf.appendAscii( "pq_resultsetmetadata: index out of range (expected 1 to " );
+        buf.append( "pq_resultsetmetadata: index out of range (expected 1 to " );
         buf.append( m_colCount );
-        buf.appendAscii( ", got " );
+        buf.append( ", got " );
         buf.append( columnIndex );
         throw SQLException(
             buf.makeStringAndClear(), *this, OUString(), 1, Any() );
diff --git a/connectivity/source/drivers/postgresql/pq_sequenceresultsetmetadata.cxx b/connectivity/source/drivers/postgresql/pq_sequenceresultsetmetadata.cxx
index dc34aa715e59..548aee69001a 100644
--- a/connectivity/source/drivers/postgresql/pq_sequenceresultsetmetadata.cxx
+++ b/connectivity/source/drivers/postgresql/pq_sequenceresultsetmetadata.cxx
@@ -202,9 +202,9 @@ void SequenceResultSetMetaData::checkColumnIndex(sal_Int32 columnIndex)
     {
         OUStringBuffer buf(128);
 
-        buf.appendAscii( "pq_sequenceresultsetmetadata: index out of range (expected 1 to " );
+        buf.append( "pq_sequenceresultsetmetadata: index out of range (expected 1 to " );
         buf.append( m_colCount );
-        buf.appendAscii( ", got " );
+        buf.append( ", got " );
         buf.append( columnIndex );
         throw SQLException(
             buf.makeStringAndClear(), *this, OUString(), 1, Any() );
diff --git a/connectivity/source/drivers/postgresql/pq_statement.cxx b/connectivity/source/drivers/postgresql/pq_statement.cxx
index 52eb1f29f272..e37e7f9d5dc6 100644
--- a/connectivity/source/drivers/postgresql/pq_statement.cxx
+++ b/connectivity/source/drivers/postgresql/pq_statement.cxx
@@ -246,18 +246,18 @@ void Statement::raiseSQLException(
     throw( SQLException )
 {
     OUStringBuffer buf(128);
-    buf.appendAscii( "pq_driver: ");
+    buf.append( "pq_driver: ");
     if( errorType )
     {
-        buf.appendAscii( "[" );
+        buf.append( "[" );
         buf.appendAscii( errorType );
-        buf.appendAscii( "]" );
+        buf.append( "]" );
     }
     buf.append(
         OUString( errorMsg, strlen(errorMsg) , m_pSettings->encoding ) );
-    buf.appendAscii( " (caused by statement '" );
+    buf.append( " (caused by statement '" );
     buf.append( sql );
-    buf.appendAscii( "')" );
+    buf.append( "')" );
     OUString error = buf.makeStringAndClear();
     log( m_pSettings, LogLevel::ERROR, error );
     throw SQLException( error, *this, OUString(), 1, Any() );
@@ -297,18 +297,18 @@ static void raiseSQLException(
     throw( SQLException )
 {
     OUStringBuffer buf(128);
-    buf.appendAscii( "pq_driver: ");
+    buf.append( "pq_driver: ");
     if( errorType )
     {
-        buf.appendAscii( "[" );
+        buf.append( "[" );
         buf.appendAscii( errorType );
-        buf.appendAscii( "]" );
+        buf.append( "]" );
     }
     buf.append(
         OUString( errorMsg, strlen(errorMsg) , pSettings->encoding ) );
-    buf.appendAscii( " (caused by statement '" );
+    buf.append( " (caused by statement '" );
     buf.append( OStringToOUString( sql, pSettings->encoding ) );
-    buf.appendAscii( "')" );
+    buf.append( "')" );
     OUString error = buf.makeStringAndClear();
     log( pSettings, LogLevel::ERROR, error );
     throw SQLException( error, owner, OUString(), 1, Any() );
@@ -939,9 +939,9 @@ sal_Bool Statement::convertFastPropertyValue(
     default:
     {
         OUStringBuffer buf(128);
-        buf.appendAscii( "pq_statement: Invalid property handle (" );
+        buf.append( "pq_statement: Invalid property handle (" );
         buf.append( nHandle );
-        buf.appendAscii( ")" );
+        buf.append( ")" );
         throw IllegalArgumentException( buf.makeStringAndClear(), *this, 2 );
     }
     }
diff --git a/connectivity/source/drivers/postgresql/pq_tools.cxx b/connectivity/source/drivers/postgresql/pq_tools.cxx
index 37eec4e5ad0b..450a9be6bb5b 100644
--- a/connectivity/source/drivers/postgresql/pq_tools.cxx
+++ b/connectivity/source/drivers/postgresql/pq_tools.cxx
@@ -646,11 +646,11 @@ com::sun::star::uno::Sequence< Any > parseArray( const OUString & str ) throw( S
             {
 
                 OUStringBuffer buf;
-                buf.appendAscii( "error during array parsing, didn't expect a } at position " );
+                buf.append( "error during array parsing, didn't expect a } at position " );
                 buf.append( (sal_Int32) i );
-                buf.appendAscii( " ('" );
+                buf.append( " ('" );
                 buf.append( str );
-                buf.appendAscii( "')" );
+                buf.append( "')" );
                 throw SQLException(
                     buf.makeStringAndClear(),
                     Reference< XInterface > (), OUString(), 1, Any() );
diff --git a/connectivity/source/drivers/postgresql/pq_updateableresultset.cxx b/connectivity/source/drivers/postgresql/pq_updateableresultset.cxx
index 95eb19b1e152..0c8721cd4f8f 100644
--- a/connectivity/source/drivers/postgresql/pq_updateableresultset.cxx
+++ b/connectivity/source/drivers/postgresql/pq_updateableresultset.cxx
@@ -353,18 +353,18 @@ void UpdateableResultSet::deleteRow(  ) throw (SQLException, RuntimeException, s
     if( m_row < 0 || m_row >= m_rowCount )
     {
         OUStringBuffer buf( 128 );
-        buf.appendAscii( "deleteRow cannot be called on invalid row (" );
+        buf.append( "deleteRow cannot be called on invalid row (" );
         buf.append( m_row );
-        buf.appendAscii( ")" );
+        buf.append( ")" );
         throw SQLException( buf.makeStringAndClear() , *this, OUString(), 0, Any() );
     }
 
     Reference< XStatement > stmt = extractConnectionFromStatement(m_owner)->createStatement();
     DisposeGuard dispGuard( stmt );
     OUStringBuffer buf( 128 );
-    buf.appendAscii( "DELETE FROM " );
+    buf.append( "DELETE FROM " );
     bufferQuoteQualifiedIdentifier( buf, m_schema, m_table, *m_ppSettings );
-    buf.appendAscii( " " );
+    buf.append( " " );
     buf.append( buildWhereClause() );
 
     stmt->executeUpdate( buf.makeStringAndClear() );
diff --git a/connectivity/source/drivers/postgresql/pq_xbase.cxx b/connectivity/source/drivers/postgresql/pq_xbase.cxx
index 5e1d9918d99b..7473bc76181b 100644
--- a/connectivity/source/drivers/postgresql/pq_xbase.cxx
+++ b/connectivity/source/drivers/postgresql/pq_xbase.cxx
@@ -102,9 +102,9 @@ void ReflectionBase::setPropertyValue_NoBroadcast_public(
     if( -1 == nHandle  )
     {
         OUStringBuffer buf(128);
-        buf.appendAscii( "Unknown property '" );
+        buf.append( "Unknown property '" );
         buf.append( name );
-        buf.appendAscii( "' in " );
+        buf.append( "' in " );
         buf.append( m_implName );
         throw com::sun::star::uno::RuntimeException( buf.makeStringAndClear() , *this );
     }
diff --git a/connectivity/source/drivers/postgresql/pq_xcolumns.cxx b/connectivity/source/drivers/postgresql/pq_xcolumns.cxx
index 33a1c27cad4e..333192d848f5 100644
--- a/connectivity/source/drivers/postgresql/pq_xcolumns.cxx
+++ b/connectivity/source/drivers/postgresql/pq_xcolumns.cxx
@@ -517,11 +517,11 @@ void Columns::dropByIndex( sal_Int32 index )
     if( index < 0 ||  index >= m_values.getLength() )
     {
         OUStringBuffer buf( 128 );
-        buf.appendAscii( "COLUMNS: Index out of range (allowed 0 to " );
+        buf.append( "COLUMNS: Index out of range (allowed 0 to " );
         buf.append((sal_Int32)(m_values.getLength() -1) );
-        buf.appendAscii( ", got " );
+        buf.append( ", got " );
         buf.append( index );
-        buf.appendAscii( ")" );
+        buf.append( ")" );
         throw com::sun::star::lang::IndexOutOfBoundsException(
             buf.makeStringAndClear(), *this );
     }
@@ -533,9 +533,9 @@ void Columns::dropByIndex( sal_Int32 index )
     set->getPropertyValue( st.NAME ) >>= name;
 
     OUStringBuffer update( 128 );
-    update.appendAscii( "ALTER TABLE ONLY");
+    update.append( "ALTER TABLE ONLY");
     bufferQuoteQualifiedIdentifier( update, m_schemaName, m_tableName, m_pSettings );
-    update.appendAscii( "DROP COLUMN" );
+    update.append( "DROP COLUMN" );
     bufferQuoteIdentifier( update, name, m_pSettings );
     Reference< XStatement > stmt = m_origin->createStatement( );
     DisposeGuard disposeIt( stmt );
diff --git a/connectivity/source/drivers/postgresql/pq_xcontainer.cxx b/connectivity/source/drivers/postgresql/pq_xcontainer.cxx
index c597fc7b6a74..fc4969e17ea3 100644
--- a/connectivity/source/drivers/postgresql/pq_xcontainer.cxx
+++ b/connectivity/source/drivers/postgresql/pq_xcontainer.cxx
@@ -165,11 +165,11 @@ Any Container::getByName( const OUString& aName )
     if( ii == m_name2index.end() )
     {
         OUStringBuffer buf(128);
-        buf.appendAscii( "Element "  );
+        buf.append( "Element "  );
         buf.append( aName );
-        buf.appendAscii( " unknown in " );
+        buf.append( " unknown in " );
         buf.append( m_type );
-        buf.appendAscii( "-Container" );
+        buf.append( "-Container" );
         throw NoSuchElementException( buf.makeStringAndClear() , *this );
     }
     OSL_ASSERT( ii->second >= 0 && ii->second < m_values.getLength() );
@@ -217,11 +217,11 @@ Any Container::getByIndex( sal_Int32 Index )
     if( Index < 0 || Index >= m_values.getLength() )
     {
         OUStringBuffer buf(128);
-        buf.appendAscii( "Index " );
+        buf.append( "Index " );
         buf.append( Index );
-        buf.appendAscii(" out of range for " );
+        buf.append(" out of range for " );
         buf.append( m_type );
-        buf.appendAscii("-Container, expected 0 <= x <= " );
+        buf.append("-Container, expected 0 <= x <= " );
         buf.append( (sal_Int32 ) (m_values.getLength() -1));
         throw IndexOutOfBoundsException( buf.makeStringAndClear(), *this );
     }
@@ -329,15 +329,15 @@ void Container::dropByName( const OUString& elementName )
     if( ii == m_name2index.end() )
     {
         OUStringBuffer buf( 128 );
-        buf.appendAscii( "Column " );
+        buf.append( "Column " );
         buf.append( elementName );
-        buf.appendAscii( " is unknown in " );
+        buf.append( " is unknown in " );
         buf.append( m_type );
 //         buf.appendAscii( " " );
 //         buf.append( m_schemaName );
 //         buf.appendAscii( "." );
 //         buf.append( m_tableName );
-        buf.appendAscii( " container, so it can't be dropped" );
+        buf.append( " container, so it can't be dropped" );
         throw com::sun::star::container::NoSuchElementException(
             buf.makeStringAndClear(), *this );
     }
@@ -353,11 +353,11 @@ void Container::dropByIndex( sal_Int32 index )
     if( index < 0 ||  index >= m_values.getLength() )
     {
         OUStringBuffer buf( 128 );
-        buf.appendAscii( "Index out of range (allowed 0 to " );
+        buf.append( "Index out of range (allowed 0 to " );
         buf.append((sal_Int32)(m_values.getLength() -1) );
-        buf.appendAscii( ", got " );
+        buf.append( ", got " );
         buf.append( index );
-        buf.appendAscii( ") in " );
+        buf.append( ") in " );
         buf.append( m_type );
         throw com::sun::star::lang::IndexOutOfBoundsException(
             buf.makeStringAndClear(), *this );
@@ -408,11 +408,11 @@ void Container::append(
     if( hasByName( name ) )
     {
         OUStringBuffer buf( 128 );
-        buf.appendAscii( "a ");
+        buf.append( "a ");
         buf.append( m_type );
-        buf.appendAscii( " with name " );
+        buf.append( " with name " );
         buf.append( name );
-        buf.appendAscii( " already exists in this container" );
+        buf.append( " already exists in this container" );
         throw com::sun::star::container::ElementExistException(
             buf.makeStringAndClear() , *this );
     }
diff --git a/connectivity/source/drivers/postgresql/pq_xindexes.cxx b/connectivity/source/drivers/postgresql/pq_xindexes.cxx
index d3951f8a741d..5bc09afd0aab 100644
--- a/connectivity/source/drivers/postgresql/pq_xindexes.cxx
+++ b/connectivity/source/drivers/postgresql/pq_xindexes.cxx
@@ -259,11 +259,11 @@ void Indexes::dropByIndex( sal_Int32 index )
     if( index < 0 ||  index >= m_values.getLength() )
     {
         OUStringBuffer buf( 128 );
-        buf.appendAscii( "Indexes: Index out of range (allowed 0 to " );
+        buf.append( "Indexes: Index out of range (allowed 0 to " );
         buf.append( (sal_Int32) (m_values.getLength() -1) );
-        buf.appendAscii( ", got " );
+        buf.append( ", got " );
         buf.append( index );
-        buf.appendAscii( ")" );
+        buf.append( ")" );
         throw com::sun::star::lang::IndexOutOfBoundsException(
             buf.makeStringAndClear(), *this );
     }
diff --git a/connectivity/source/drivers/postgresql/pq_xusers.cxx b/connectivity/source/drivers/postgresql/pq_xusers.cxx
index 6d7cf0b27af2..6b8f2f517394 100644
--- a/connectivity/source/drivers/postgresql/pq_xusers.cxx
+++ b/connectivity/source/drivers/postgresql/pq_xusers.cxx
@@ -157,9 +157,9 @@ void Users::dropByName( const OUString& elementName )
     if( ii == m_name2index.end() )
     {
         OUStringBuffer buf( 128 );
-        buf.appendAscii( "User " );
+        buf.append( "User " );
         buf.append( elementName );
-        buf.appendAscii( " is unknown, so it can't be dropped" );
+        buf.append( " is unknown, so it can't be dropped" );
         throw com::sun::star::container::NoSuchElementException(
             buf.makeStringAndClear(), *this );
     }
@@ -176,11 +176,11 @@ void Users::dropByIndex( sal_Int32 index )
     if( index < 0 ||  index >= m_values.getLength() )
     {
         OUStringBuffer buf( 128 );
-        buf.appendAscii( "USERS: Index out of range (allowed 0 to " );
+        buf.append( "USERS: Index out of range (allowed 0 to " );
         buf.append( (sal_Int32) (m_values.getLength() -1) );
-        buf.appendAscii( ", got " );
+        buf.append( ", got " );
         buf.append( index );
-        buf.appendAscii( ")" );
+        buf.append( ")" );
         throw com::sun::star::lang::IndexOutOfBoundsException(
             buf.makeStringAndClear(), *this );
     }
@@ -191,7 +191,7 @@ void Users::dropByIndex( sal_Int32 index )
     set->getPropertyValue( getStatics().NAME ) >>= name;
 
     OUStringBuffer update( 128 );
-    update.appendAscii( "DROP USER " );
+    update.append( "DROP USER " );
     bufferQuoteIdentifier( update, name, m_pSettings );
 
     Reference< XStatement > stmt = m_origin->createStatement( );
diff --git a/connectivity/source/drivers/postgresql/pq_xview.cxx b/connectivity/source/drivers/postgresql/pq_xview.cxx
index e2e0aaf10845..e090562cbaf5 100644
--- a/connectivity/source/drivers/postgresql/pq_xview.cxx
+++ b/connectivity/source/drivers/postgresql/pq_xview.cxx
@@ -162,9 +162,9 @@ void View::rename( const OUString& newName )
     if( ! oldName.equals( newTableName ) )
     {
         OUStringBuffer buf(128);
-        buf.appendAscii( "ALTER TABLE" );
+        buf.append( "ALTER TABLE" );
         bufferQuoteQualifiedIdentifier( buf, schema, oldName, m_pSettings );
-        buf.appendAscii( "RENAME TO" );
+        buf.append( "RENAME TO" );
         bufferQuoteIdentifier( buf, newTableName, m_pSettings );
         Reference< XStatement > statement = m_conn->createStatement();
         statement->executeUpdate( buf.makeStringAndClear() );
diff --git a/connectivity/source/parse/sqlnode.cxx b/connectivity/source/parse/sqlnode.cxx
index 97274b5ca5cc..9de4ee88d9be 100644
--- a/connectivity/source/parse/sqlnode.cxx
+++ b/connectivity/source/parse/sqlnode.cxx
@@ -398,7 +398,7 @@ void OSQLParseNode::impl_parseNodeToString_throw(OUStringBuffer& rString, const
     {
         bSimple=false;
         if(!rString.isEmpty())
-            rString.appendAscii(" ");
+            rString.append(" ");
         if (nCount == 1)    // ?
             m_aChildren[0]->impl_parseNodeToString_throw( rString, rParam, false );
         else if (nCount == 2)   // :Name
@@ -484,7 +484,7 @@ void OSQLParseNode::impl_parseNodeToString_throw(OUStringBuffer& rString, const
 
                     // In the comma lists, put commas in-between all subtrees
                     if ((m_eNodeType == SQL_NODE_COMMALISTRULE)     && (i < (nCount - 1)))
-                        aStringPara.appendAscii(",");
+                        aStringPara.append(",");
                 }
                 else
                     i++;
@@ -562,7 +562,7 @@ void OSQLParseNode::impl_parseNodeToString_throw(OUStringBuffer& rString, const
 
                     // In the comma lists, put commas in-between all subtrees
                     if ((m_eNodeType == SQL_NODE_COMMALISTRULE)     && (i != m_aChildren.end()))
-                        rString.appendAscii(",");
+                        rString.append(",");
                 }
             }
             else
@@ -574,9 +574,9 @@ void OSQLParseNode::impl_parseNodeToString_throw(OUStringBuffer& rString, const
                 if ((m_eNodeType == SQL_NODE_COMMALISTRULE)     && (i != m_aChildren.end()))
                 {
                     if (SQL_ISRULE(this,value_exp_commalist) && rParam.bPredicate)
-                        rString.appendAscii(";");
+                        rString.append(";");
                     else
-                        rString.appendAscii(",");
+                        rString.append(",");
                 }
             }
             // The right hand-side of these operators is not simple
@@ -677,15 +677,15 @@ bool OSQLParseNode::impl_parseTableNameNodeToString_throw( OUStringBuffer& rStri
             }
         }
 
-        rString.appendAscii( " ( " );
+        rString.append( " ( " );
         rString.append(sCommand);
-        rString.appendAscii( " )" );
+        rString.append( " )" );
 
         // append the query name as table alias, since it might be referenced in other
         // parts of the statement - but only if there's no other alias name present
         if ( !lcl_isAliasNamePresent( *this ) )
         {
-            rString.appendAscii( " AS " );
+            rString.append( " AS " );
             if ( rParam.bQuote )
                 rString.append(SetQuotation( sTableOrQueryName,
                     rParam.aMetaData.getIdentifierQuoteString(), rParam.aMetaData.getIdentifierQuoteString() ));
@@ -743,7 +743,7 @@ void OSQLParseNode::impl_parseLikeNodeToString_throw( OUStringBuffer& rString, c
     if (pParaNode->isToken())
     {
         OUString aStr = ConvertLikeToken(pParaNode, pEscNode, rParam.bInternational);
-        rString.appendAscii(" ");
+        rString.append(" ");
         rString.append(SetQuotation(aStr,OUString("\'"),OUString("\'\'")));
     }
     else
@@ -1732,7 +1732,7 @@ bool OSQLParseNode::addDateValue(OUStringBuffer& rString, const SQLParseNodePara
             }
 
             if (!rString.isEmpty())
-                rString.appendAscii(" ");
+                rString.append(" ");
             rString.append(suQuote);
             const OUString sTokenValue = pODBCNode->m_aChildren[1]->getTokenValue();
             if (SQL_ISTOKEN(pODBCNodeChild, D))
@@ -2432,14 +2432,14 @@ void OSQLParseNode::parseLeaf(OUStringBuffer& rString, const SQLParseNodeParamet
         case SQL_NODE_KEYWORD:
         {
             if (!rString.isEmpty())
-                rString.appendAscii(" ");
+                rString.append(" ");
 
             const OString sT = OSQLParser::TokenIDToStr(m_nNodeID, rParam.bInternational ? &rParam.m_rContext :  NULL);
             rString.append(OStringToOUString(sT,RTL_TEXTENCODING_UTF8));
         }   break;
         case SQL_NODE_STRING:
             if (!rString.isEmpty())
-                rString.appendAscii(" ");
+                rString.append(" ");
             rString.append(SetQuotation(m_aNodeValue,OUString("\'"),OUString("\'\'")));
             break;
         case SQL_NODE_NAME:
@@ -2453,16 +2453,16 @@ void OSQLParseNode::parseLeaf(OUStringBuffer& rString, const SQLParseNodeParamet
                         if  (   rParam.aMetaData.getCatalogSeparator().isEmpty()
                                 || rString[rString.getLength() - 1] != rParam.aMetaData.getCatalogSeparator().toChar()
                             )
-                            rString.appendAscii(" "); break;
+                            rString.append(" "); break;
                 }
             }
             if (rParam.bQuote)
             {
                 if (rParam.bPredicate)
                 {
-                    rString.appendAscii("[");
+                    rString.append("[");
                     rString.append(m_aNodeValue);
-                    rString.appendAscii("]");
+                    rString.append("]");
                 }
                 else
                     rString.append(SetQuotation(m_aNodeValue,
@@ -2473,10 +2473,10 @@ void OSQLParseNode::parseLeaf(OUStringBuffer& rString, const SQLParseNodeParamet
             break;
         case SQL_NODE_ACCESS_DATE:
             if (!rString.isEmpty())
-                rString.appendAscii(" ");
-            rString.appendAscii("#");
+                rString.append(" ");
+            rString.append("#");
             rString.append(m_aNodeValue);
-            rString.appendAscii("#");
+            rString.append("#");
             break;
 
         case SQL_NODE_INTNUM:
@@ -2487,7 +2487,7 @@ void OSQLParseNode::parseLeaf(OUStringBuffer& rString, const SQLParseNodeParamet
                     aTmp = aTmp.replace('.', rParam.cDecSep);
 
                 if (!rString.isEmpty())
-                    rString.appendAscii(" ");
+                    rString.append(" ");
                 rString.append(aTmp);
 
             }   break;
@@ -2509,7 +2509,7 @@ void OSQLParseNode::parseLeaf(OUStringBuffer& rString, const SQLParseNodeParamet
                         if  (   rParam.aMetaData.getCatalogSeparator().isEmpty()
                             ||  rString[rString.getLength() - 1] != rParam.aMetaData.getCatalogSeparator().toChar()
                             )
-                            rString.appendAscii(" "); break;
+                            rString.append(" "); break;
                 }
             }
             rString.append(m_aNodeValue);