fdo#38838, ::rtl::OUString to OUString, String to OUString

::rtl::OUString was replaced to OUString and all occurences of String was replaced to OUString in dbaccess/source/core/api

Change-Id: I9771708408e04dcebe18f49a75c83036740f0ca2
Reviewed-on: https://gerrit.libreoffice.org/2239
Reviewed-by: Caolán McNamara <caolanm@redhat.com>
Tested-by: Caolán McNamara <caolanm@redhat.com>

3 files changed, 105 insertions, 110 deletions

diff --git a/dbaccess/source/core/api/RowSet.cxx b/dbaccess/source/core/api/RowSet.cxx
index 9d6489942fc4..f3654a6fa67c 100644
--- a/dbaccess/source/core/api/RowSet.cxx
+++ b/dbaccess/source/core/api/RowSet.cxx
@@ -169,16 +169,16 @@ ORowSet::ORowSet( const Reference< ::com::sun::star::lang::XMultiServiceFactory
 
     // sdb.RowSet Properties
     registerMayBeVoidProperty(PROPERTY_ACTIVE_CONNECTION,PROPERTY_ID_ACTIVE_CONNECTION, PropertyAttribute::MAYBEVOID|PropertyAttribute::TRANSIENT|PropertyAttribute::BOUND, &m_aActiveConnection,   ::getCppuType(static_cast< Reference< XConnection >* >(0)));
-    registerProperty(PROPERTY_DATASOURCENAME,       PROPERTY_ID_DATASOURCENAME,         PropertyAttribute::BOUND,       &m_aDataSourceName,     ::getCppuType(static_cast< ::rtl::OUString*>(0)));
-    registerProperty(PROPERTY_COMMAND,              PROPERTY_ID_COMMAND,                PropertyAttribute::BOUND,       &m_aCommand,            ::getCppuType(static_cast< ::rtl::OUString*>(0)));
+    registerProperty(PROPERTY_DATASOURCENAME,       PROPERTY_ID_DATASOURCENAME,         PropertyAttribute::BOUND,       &m_aDataSourceName,     ::getCppuType(static_cast< OUString*>(0)));
+    registerProperty(PROPERTY_COMMAND,              PROPERTY_ID_COMMAND,                PropertyAttribute::BOUND,       &m_aCommand,            ::getCppuType(static_cast< OUString*>(0)));
     registerProperty(PROPERTY_COMMAND_TYPE,         PROPERTY_ID_COMMAND_TYPE,           PropertyAttribute::BOUND,       &m_nCommandType,        ::getCppuType(static_cast< sal_Int32*>(0)));
-    registerProperty(PROPERTY_ACTIVECOMMAND,        PROPERTY_ID_ACTIVECOMMAND,          nRBT,                           &m_aActiveCommand,      ::getCppuType(static_cast< ::rtl::OUString*>(0)));
+    registerProperty(PROPERTY_ACTIVECOMMAND,        PROPERTY_ID_ACTIVECOMMAND,          nRBT,                           &m_aActiveCommand,      ::getCppuType(static_cast< OUString*>(0)));
     registerProperty(PROPERTY_IGNORERESULT,         PROPERTY_ID_IGNORERESULT,           PropertyAttribute::BOUND,       &m_bIgnoreResult,       ::getBooleanCppuType());
-    registerProperty(PROPERTY_FILTER,               PROPERTY_ID_FILTER,                 PropertyAttribute::BOUND,       &m_aFilter,             ::getCppuType(static_cast< ::rtl::OUString*>(0)));
-    registerProperty(PROPERTY_HAVING_CLAUSE,        PROPERTY_ID_HAVING_CLAUSE,          PropertyAttribute::BOUND,       &m_aHavingClause,       ::getCppuType(static_cast< ::rtl::OUString*>(0)));
-    registerProperty(PROPERTY_GROUP_BY,             PROPERTY_ID_GROUP_BY,               PropertyAttribute::BOUND,       &m_aGroupBy,            ::getCppuType(static_cast< ::rtl::OUString*>(0)));
+    registerProperty(PROPERTY_FILTER,               PROPERTY_ID_FILTER,                 PropertyAttribute::BOUND,       &m_aFilter,             ::getCppuType(static_cast< OUString*>(0)));
+    registerProperty(PROPERTY_HAVING_CLAUSE,        PROPERTY_ID_HAVING_CLAUSE,          PropertyAttribute::BOUND,       &m_aHavingClause,       ::getCppuType(static_cast< OUString*>(0)));
+    registerProperty(PROPERTY_GROUP_BY,             PROPERTY_ID_GROUP_BY,               PropertyAttribute::BOUND,       &m_aGroupBy,            ::getCppuType(static_cast< OUString*>(0)));
     registerProperty(PROPERTY_APPLYFILTER,          PROPERTY_ID_APPLYFILTER,            PropertyAttribute::BOUND,       &m_bApplyFilter,        ::getBooleanCppuType());
-    registerProperty(PROPERTY_ORDER,                PROPERTY_ID_ORDER,                  PropertyAttribute::BOUND,       &m_aOrder,              ::getCppuType(static_cast< ::rtl::OUString*>(0)));
+    registerProperty(PROPERTY_ORDER,                PROPERTY_ID_ORDER,                  PropertyAttribute::BOUND,       &m_aOrder,              ::getCppuType(static_cast< OUString*>(0)));
     registerProperty(PROPERTY_PRIVILEGES,           PROPERTY_ID_PRIVILEGES,             nRT,                            &m_nPrivileges,         ::getCppuType(static_cast< sal_Int32*>(0)));
     registerProperty(PROPERTY_ISMODIFIED,           PROPERTY_ID_ISMODIFIED,             nBT,                            &m_bModified,           ::getBooleanCppuType());
     registerProperty(PROPERTY_ISNEW,                PROPERTY_ID_ISNEW,                  nRBT,                           &m_bNew,                ::getBooleanCppuType());
@@ -194,19 +194,19 @@ ORowSet::ORowSet( const Reference< ::com::sun::star::lang::XMultiServiceFactory
     registerProperty(PROPERTY_FETCHSIZE,            PROPERTY_ID_FETCHSIZE,              PropertyAttribute::TRANSIENT,   &m_nFetchSize,          ::getCppuType(static_cast< sal_Int32*>(0)));
 
     // sdbc.RowSet Properties
-    registerProperty(PROPERTY_URL,                  PROPERTY_ID_URL,                    0,                              &m_aURL,                ::getCppuType(static_cast< ::rtl::OUString*>(0)));
+    registerProperty(PROPERTY_URL,                  PROPERTY_ID_URL,                    0,                              &m_aURL,                ::getCppuType(static_cast< OUString*>(0)));
     registerProperty(PROPERTY_TRANSACTIONISOLATION, PROPERTY_ID_TRANSACTIONISOLATION,   PropertyAttribute::TRANSIENT,   &m_nTransactionIsolation,::getCppuType(static_cast< sal_Int32*>(0)));
     registerMayBeVoidProperty(PROPERTY_TYPEMAP,     PROPERTY_ID_TYPEMAP,                PropertyAttribute::MAYBEVOID|PropertyAttribute::TRANSIENT,  &m_aTypeMap,            ::getCppuType(static_cast< Reference< XNameAccess >* >(0)));
     registerProperty(PROPERTY_ESCAPE_PROCESSING,PROPERTY_ID_ESCAPE_PROCESSING,  PropertyAttribute::BOUND,       &m_bUseEscapeProcessing,::getBooleanCppuType()  );
     registerProperty(PROPERTY_QUERYTIMEOUT,         PROPERTY_ID_QUERYTIMEOUT,           PropertyAttribute::TRANSIENT,   &m_nQueryTimeOut,       ::getCppuType(static_cast< sal_Int32*>(0)));
     registerProperty(PROPERTY_MAXFIELDSIZE,         PROPERTY_ID_MAXFIELDSIZE,           PropertyAttribute::TRANSIENT,   &m_nMaxFieldSize,       ::getCppuType(static_cast< sal_Int32*>(0)));
     registerProperty(PROPERTY_MAXROWS,              PROPERTY_ID_MAXROWS,                0,                              &m_nMaxRows,            ::getCppuType(static_cast< sal_Int32*>(0)) );
-    registerProperty(PROPERTY_USER,                 PROPERTY_ID_USER,                   PropertyAttribute::TRANSIENT,   &m_aUser,               ::getCppuType(static_cast< ::rtl::OUString*>(0)));
-    registerProperty(PROPERTY_PASSWORD,             PROPERTY_ID_PASSWORD,               PropertyAttribute::TRANSIENT,   &m_aPassword,           ::getCppuType(static_cast< ::rtl::OUString*>(0)));
+    registerProperty(PROPERTY_USER,                 PROPERTY_ID_USER,                   PropertyAttribute::TRANSIENT,   &m_aUser,               ::getCppuType(static_cast< OUString*>(0)));
+    registerProperty(PROPERTY_PASSWORD,             PROPERTY_ID_PASSWORD,               PropertyAttribute::TRANSIENT,   &m_aPassword,           ::getCppuType(static_cast< OUString*>(0)));
 
-    registerProperty(PROPERTY_UPDATE_CATALOGNAME,   PROPERTY_ID_UPDATE_CATALOGNAME,     PropertyAttribute::BOUND,       &m_aUpdateCatalogName,  ::getCppuType(static_cast< ::rtl::OUString*>(0)));
-    registerProperty(PROPERTY_UPDATE_SCHEMANAME,    PROPERTY_ID_UPDATE_SCHEMANAME,      PropertyAttribute::BOUND,       &m_aUpdateSchemaName,   ::getCppuType(static_cast< ::rtl::OUString*>(0)));
-    registerProperty(PROPERTY_UPDATE_TABLENAME,     PROPERTY_ID_UPDATE_TABLENAME,       PropertyAttribute::BOUND,       &m_aUpdateTableName,    ::getCppuType(static_cast< ::rtl::OUString*>(0)));
+    registerProperty(PROPERTY_UPDATE_CATALOGNAME,   PROPERTY_ID_UPDATE_CATALOGNAME,     PropertyAttribute::BOUND,       &m_aUpdateCatalogName,  ::getCppuType(static_cast< OUString*>(0)));
+    registerProperty(PROPERTY_UPDATE_SCHEMANAME,    PROPERTY_ID_UPDATE_SCHEMANAME,      PropertyAttribute::BOUND,       &m_aUpdateSchemaName,   ::getCppuType(static_cast< OUString*>(0)));
+    registerProperty(PROPERTY_UPDATE_TABLENAME,     PROPERTY_ID_UPDATE_TABLENAME,       PropertyAttribute::BOUND,       &m_aUpdateTableName,    ::getCppuType(static_cast< OUString*>(0)));
 
     // ???
     registerProperty(PROPERTY_CHANGE_NOTIFICATION_ENABLED, PROPERTY_ID_PROPCHANGE_NOTIFY, PropertyAttribute::BOUND,     &m_bPropChangeNotifyEnabled, ::getBooleanCppuType());
@@ -269,7 +269,7 @@ void ORowSet::getPropertyDefaultByHandle( sal_Int32 _nHandle, Any& _rDefault ) c
         case PROPERTY_ID_UPDATE_CATALOGNAME:
         case PROPERTY_ID_UPDATE_SCHEMANAME:
         case PROPERTY_ID_UPDATE_TABLENAME:
-            _rDefault <<= ::rtl::OUString();
+            _rDefault <<= OUString();
             break;
     }
 }
@@ -476,17 +476,17 @@ rtl::OUString ORowSet::getImplementationName_static(  ) throw(RuntimeException)
 }
 
 // ::com::sun::star::XServiceInfo
-::rtl::OUString SAL_CALL ORowSet::getImplementationName(  ) throw(RuntimeException)
+OUString SAL_CALL ORowSet::getImplementationName(  ) throw(RuntimeException)
 {
     return getImplementationName_static();
 }
 
-sal_Bool SAL_CALL ORowSet::supportsService( const ::rtl::OUString& _rServiceName ) throw(RuntimeException)
+sal_Bool SAL_CALL ORowSet::supportsService( const OUString& _rServiceName ) throw(RuntimeException)
 {
     return ::comphelper::findValue(getSupportedServiceNames(), _rServiceName, sal_True).getLength() != 0;
 }
 
-Sequence< ::rtl::OUString > ORowSet::getSupportedServiceNames_static(  ) throw (RuntimeException)
+Sequence< OUString > ORowSet::getSupportedServiceNames_static(  ) throw (RuntimeException)
 {
     Sequence< rtl::OUString > aSNS( 5 );
     aSNS[0] = SERVICE_SDBC_RESULTSET;
@@ -497,7 +497,7 @@ Sequence< ::rtl::OUString > ORowSet::getSupportedServiceNames_static(  ) throw (
     return aSNS;
 }
 
-Sequence< ::rtl::OUString > SAL_CALL ORowSet::getSupportedServiceNames(  ) throw(RuntimeException)
+Sequence< OUString > SAL_CALL ORowSet::getSupportedServiceNames(  ) throw(RuntimeException)
 {
     return getSupportedServiceNames_static();
 }
@@ -752,7 +752,7 @@ void SAL_CALL ORowSet::updateDouble( sal_Int32 columnIndex, double x ) throw(SQL
     updateValue(columnIndex,x);
 }
 
-void SAL_CALL ORowSet::updateString( sal_Int32 columnIndex, const ::rtl::OUString& x ) throw(SQLException, RuntimeException)
+void SAL_CALL ORowSet::updateString( sal_Int32 columnIndex, const OUString& x ) throw(SQLException, RuntimeException)
 {
     updateValue(columnIndex,x);
 }
@@ -1306,7 +1306,7 @@ const ORowSetValue& ORowSet::getInsertValue(sal_Int32 columnIndex)
     return getValue(columnIndex);
 }
 
-::rtl::OUString SAL_CALL ORowSet::getString( sal_Int32 columnIndex ) throw(SQLException, RuntimeException)
+OUString SAL_CALL ORowSet::getString( sal_Int32 columnIndex ) throw(SQLException, RuntimeException)
 {
     ::osl::MutexGuard aGuard( *m_pMutex );
     return getInsertValue(columnIndex);
@@ -1503,7 +1503,7 @@ Reference< XIndexAccess > SAL_CALL ORowSet::getParameters(  ) throw (RuntimeExce
     {
         try
         {
-            ::rtl::OUString sNotInterestedIn;
+            OUString sNotInterestedIn;
             impl_initComposer_throw( sNotInterestedIn );
         }
         catch( const Exception& )
@@ -1623,7 +1623,7 @@ void ORowSet::setStatementResultSetType( const Reference< XPropertySet >& _rxSta
 
 Reference< XResultSet > ORowSet::impl_prepareAndExecute_throw()
 {
-    ::rtl::OUString sCommandToExecute;
+    OUString sCommandToExecute;
     sal_Bool bUseEscapeProcessing = impl_initComposer_throw( sCommandToExecute );
 
     Reference< XResultSet> xResultSet;
@@ -1669,8 +1669,8 @@ Reference< XResultSet > ORowSet::impl_prepareAndExecute_throw()
         // append information about what we were actually going to execute
         try
         {
-            String sQuery = bUseEscapeProcessing && m_xComposer.is() ? m_xComposer->getQuery() : m_aActiveCommand;
-            String sInfo( DBA_RES_PARAM( RID_STR_COMMAND_LEADING_TO_ERROR, "$command$", sQuery ) );
+            OUString sQuery = bUseEscapeProcessing && m_xComposer.is() ? m_xComposer->getQuery() : m_aActiveCommand;
+            OUString sInfo(DBA_RES_PARAM( RID_STR_COMMAND_LEADING_TO_ERROR, "$command$", sQuery )  );
             aError.append( SQLExceptionInfo::SQL_CONTEXT, sInfo );
         }
         catch( const Exception& ) { DBG_UNHANDLED_EXCEPTION(); }
@@ -1693,7 +1693,7 @@ void ORowSet::impl_initializeColumnSettings_nothrow( const Reference< XPropertyS
         Reference< XPropertySetInfo > xInfo( _rxTemplateColumn->getPropertySetInfo(), UNO_QUERY_THROW );
 
         // a number of properties is plain copied
-        const ::rtl::OUString aPropertyNames[] = {
+        const OUString aPropertyNames[] = {
             PROPERTY_ALIGN, PROPERTY_RELATIVEPOSITION, PROPERTY_WIDTH, PROPERTY_HIDDEN, PROPERTY_CONTROLMODEL,
             PROPERTY_HELPTEXT, PROPERTY_CONTROLDEFAULT
         };
@@ -1736,7 +1736,7 @@ void ORowSet::impl_initializeColumnSettings_nothrow( const Reference< XPropertyS
             // no chance
             return;
 
-        ::rtl::OUString sTableName;
+        OUString sTableName;
         OSL_VERIFY( _rxTemplateColumn->getPropertyValue( PROPERTY_TABLENAME ) >>= sTableName );
 
         Reference< XNameAccess > xTables( impl_getTables_throw(), UNO_QUERY_THROW );
@@ -1747,10 +1747,10 @@ void ORowSet::impl_initializeColumnSettings_nothrow( const Reference< XPropertyS
         Reference< XColumnsSupplier > xTableColSup( xTables->getByName( sTableName ), UNO_QUERY_THROW );
         Reference< XNameAccess > xTableCols( xTableColSup->getColumns(), UNO_QUERY_THROW );
 
-        ::rtl::OUString sTableColumnName;
+        OUString sTableColumnName;
 
         // get the "Name" or (preferred) "RealName" property of the column
-        ::rtl::OUString sNamePropertyName( PROPERTY_NAME );
+        OUString sNamePropertyName( PROPERTY_NAME );
         if ( xInfo->hasPropertyByName( PROPERTY_REALNAME ) )
             sNamePropertyName = PROPERTY_REALNAME;
         OSL_VERIFY( _rxTemplateColumn->getPropertyValue( sNamePropertyName ) >>= sTableColumnName );
@@ -1790,7 +1790,7 @@ void ORowSet::execute_NoApprove_NoNewConn(ResettableMutexGuard& _rClearForNotifi
         // let the warnings container know about the new "external warnings"
         m_aWarnings.setExternalWarnings( Reference< XWarningsSupplier >( xResultSet, UNO_QUERY ) );
 
-        ::rtl::OUString aComposedUpdateTableName;
+        OUString aComposedUpdateTableName;
         if ( !m_aUpdateTableName.isEmpty() )
             aComposedUpdateTableName = composeTableName( m_xActiveConnection->getMetaData(), m_aUpdateCatalogName, m_aUpdateSchemaName, m_aUpdateTableName, sal_False, ::dbtools::eInDataManipulation );
 
@@ -1819,8 +1819,8 @@ void ORowSet::execute_NoApprove_NoNewConn(ResettableMutexGuard& _rClearForNotifi
             m_xNumberFormatTypes.set(xNumberFormat->getNumberFormats(),UNO_QUERY);
 
         ::rtl::Reference< ::connectivity::OSQLColumns> aColumns = new ::connectivity::OSQLColumns();
-        ::std::vector< ::rtl::OUString> aNames;
-        ::rtl::OUString aDescription;
+        ::std::vector< OUString> aNames;
+        OUString aDescription;
 
         const ::std::map<sal_Int32,sal_Int32>& rKeyColumns = m_pCache->getKeyColumns();
         if(!m_xColumns.is())
@@ -1841,15 +1841,15 @@ void ORowSet::execute_NoApprove_NoNewConn(ResettableMutexGuard& _rClearForNotifi
                     for (sal_Int32 i = 0 ; i < nCount; ++i)
                     {
                         // retrieve the name of the column
-                        ::rtl::OUString sName = xMetaData->getColumnName(i + 1);
+                        OUString sName = xMetaData->getColumnName(i + 1);
                         // check for duplicate entries
                         if(aColumnMap.find(sName) != aColumnMap.end())
                         {
-                            ::rtl::OUString sAlias(sName);
+                            OUString sAlias(sName);
                             sal_Int32 searchIndex=1;
                             while(aColumnMap.find(sAlias) != aColumnMap.end())
                             {
-                                (sAlias = sName) += ::rtl::OUString::valueOf(searchIndex++);
+                                (sAlias = sName) += OUString::valueOf(searchIndex++);
                             }
                             sName = sAlias;
                         }
@@ -1859,7 +1859,7 @@ void ORowSet::execute_NoApprove_NoNewConn(ResettableMutexGuard& _rClearForNotifi
                                                                             i+1,
                                                                             m_xActiveConnection->getMetaData(),
                                                                             aDescription,
-                                                                            ::rtl::OUString(),
+                                                                            OUString(),
                                                                             m_aCurrentRow);
                         aColumnMap.insert(StringMap::value_type(sName,0));
                         aColumns->get().push_back(pColumn);
@@ -1903,8 +1903,8 @@ void ORowSet::execute_NoApprove_NoNewConn(ResettableMutexGuard& _rClearForNotifi
 
             for(sal_Int32 i=1; i <= nCount ;++i)
             {
-                ::rtl::OUString sName = xMeta->getColumnName(i);
-                ::rtl::OUString sColumnLabel = xMeta->getColumnLabel(i);
+                OUString sName = xMeta->getColumnName(i);
+                OUString sColumnLabel = xMeta->getColumnLabel(i);
 
                 // retrieve the column number |i|
                 Reference<XPropertySet> xColumn;
@@ -1920,7 +1920,7 @@ void ORowSet::execute_NoApprove_NoNewConn(ResettableMutexGuard& _rClearForNotifi
                     {
                         xColumn = NULL;
                         bReFetchName = sal_True;
-                        sColumnLabel = ::rtl::OUString();
+                        sColumnLabel = OUString();
                     }
                     if(!xColumn.is())
                     {
@@ -1932,7 +1932,7 @@ void ORowSet::execute_NoApprove_NoNewConn(ResettableMutexGuard& _rClearForNotifi
                         }
                         else
                         {
-                            Sequence< ::rtl::OUString> aSeq = m_xColumns->getElementNames();
+                            Sequence< OUString> aSeq = m_xColumns->getElementNames();
                             if( i <= aSeq.getLength())
                             {
                                 m_xColumns->getByName(aSeq.getConstArray()[i-1]) >>= xColumn;
@@ -1950,7 +1950,7 @@ void ORowSet::execute_NoApprove_NoNewConn(ResettableMutexGuard& _rClearForNotifi
                     if(xInfo.is() && xInfo->hasPropertyByName(PROPERTY_DESCRIPTION))
                         aDescription = comphelper::getString(xColumn->getPropertyValue(PROPERTY_DESCRIPTION));
 
-                    ::rtl::OUString sParseLabel;
+                    OUString sParseLabel;
                     if ( xColumn.is() )
                     {
                         xColumn->getPropertyValue(PROPERTY_LABEL) >>= sParseLabel;
@@ -2178,7 +2178,7 @@ Reference< XConnection >  ORowSet::calcConnection(const Reference< XInteractionH
             catch ( const Exception& )
             {
                 Any aError = ::cppu::getCaughtException();
-                ::rtl::OUString sMessage = ResourceManager::loadString( RID_NO_SUCH_DATA_SOURCE,
+                OUString sMessage = ResourceManager::loadString( RID_NO_SUCH_DATA_SOURCE,
                     "$name$", m_aDataSourceName, "$error$", extractExceptionMessage( m_aContext, aError ) );
                 ::dbtools::throwGenericSQLException( sMessage, *this );
             }
@@ -2220,9 +2220,9 @@ Reference< XNameAccess > ORowSet::impl_getTables_throw()
 
         m_pTables = new OTableContainer(*this,m_aMutex,m_xActiveConnection,bCase,NULL,NULL,NULL,m_nInAppend);
         xTables = m_pTables;
-        Sequence< ::rtl::OUString> aTableFilter(1);
-        aTableFilter[0] = ::rtl::OUString("%");
-        m_pTables->construct(aTableFilter,Sequence< ::rtl::OUString>());
+        Sequence< OUString> aTableFilter(1);
+        aTableFilter[0] = OUString("%");
+        m_pTables->construct(aTableFilter,Sequence< OUString>());
     }
 
     return xTables;
@@ -2245,7 +2245,7 @@ void ORowSet::impl_resetTables_nothrow()
     DELETEZ( m_pTables );
 }
 
-sal_Bool ORowSet::impl_initComposer_throw( ::rtl::OUString& _out_rCommandToExecute )
+sal_Bool ORowSet::impl_initComposer_throw( OUString& _out_rCommandToExecute )
 {
     sal_Bool bUseEscapeProcessing = impl_buildActiveCommand_throw( );
     _out_rCommandToExecute = m_aActiveCommand;
@@ -2268,15 +2268,15 @@ sal_Bool ORowSet::impl_initComposer_throw( ::rtl::OUString& _out_rCommandToExecu
     m_xComposer->setCommand( m_aCommand,m_nCommandType );
     m_aActiveCommand = m_xComposer->getQuery();
 
-    m_xComposer->setFilter( m_bApplyFilter ? m_aFilter : ::rtl::OUString() );
-    m_xComposer->setHavingClause( m_bApplyFilter ? m_aHavingClause : ::rtl::OUString() );
+    m_xComposer->setFilter( m_bApplyFilter ? m_aFilter : OUString() );
+    m_xComposer->setHavingClause( m_bApplyFilter ? m_aHavingClause : OUString() );
 
     if ( m_bIgnoreResult )
     {   // append a "0=1" filter
         // don't simply overwrite an existent filter, this would lead to problems if this existent
         // filter contains parameters (since a keyset may add parameters itself)
         m_xComposer->setElementaryQuery( m_xComposer->getQuery( ) );
-        m_xComposer->setFilter( ::rtl::OUString("0 = 1"  ) );
+        m_xComposer->setFilter( OUString("0 = 1"  ) );
     }
 
     m_xComposer->setOrder( m_aOrder );
@@ -2302,8 +2302,8 @@ sal_Bool ORowSet::impl_buildActiveCommand_throw()
     // the last use the command as it is
     sal_Bool bDoEscapeProcessing = m_bUseEscapeProcessing;
 
-    m_aActiveCommand = ::rtl::OUString();
-    ::rtl::OUString sCommand;
+    m_aActiveCommand = OUString();
+    OUString sCommand;
 
     if ( m_aCommand.isEmpty() )
         return bDoEscapeProcessing;
@@ -2321,15 +2321,14 @@ sal_Bool ORowSet::impl_buildActiveCommand_throw()
                 }
                 else
                 {
-                    String sMessage( DBACORE_RESSTRING( RID_STR_TABLE_DOES_NOT_EXIST ) );
-                    sMessage.SearchAndReplaceAscii( "$table$", m_aCommand );
-                    throwGenericSQLException(sMessage,*this);
+                    OUString sMessage( DBACORE_RESSTRING( RID_STR_TABLE_DOES_NOT_EXIST ) );
+                    throwGenericSQLException(sMessage.replaceAll( "$table$", m_aCommand ),*this);
                 }
             }
             else
             {
                 sCommand = rtl::OUString("SELECT * FROM ");
-                ::rtl::OUString sCatalog, sSchema, sTable;
+                OUString sCatalog, sSchema, sTable;
                 ::dbtools::qualifiedNameComponents( m_xActiveConnection->getMetaData(), m_aCommand, sCatalog, sSchema, sTable, ::dbtools::eInDataManipulation );
                 sCommand += ::dbtools::composeTableNameForSelect( m_xActiveConnection, sCatalog, sSchema, sTable );
             }
@@ -2357,7 +2356,7 @@ sal_Bool ORowSet::impl_buildActiveCommand_throw()
                             fireProperty(PROPERTY_ID_ESCAPE_PROCESSING,bOldValue,bDoEscapeProcessing);
                         }
 
-                        ::rtl::OUString aCatalog,aSchema,aTable;
+                        OUString aCatalog,aSchema,aTable;
                         xQuery->getPropertyValue(PROPERTY_UPDATE_CATALOGNAME)   >>= aCatalog;
                         xQuery->getPropertyValue(PROPERTY_UPDATE_SCHEMANAME)    >>= aSchema;
                         xQuery->getPropertyValue(PROPERTY_UPDATE_TABLENAME)     >>= aTable;
@@ -2367,13 +2366,12 @@ sal_Bool ORowSet::impl_buildActiveCommand_throw()
                 }
                 else
                 {
-                    String sMessage( DBACORE_RESSTRING( RID_STR_QUERY_DOES_NOT_EXIST ) );
-                    sMessage.SearchAndReplaceAscii( "$table$", m_aCommand );
-                    throwGenericSQLException(sMessage,*this);
+                    OUString sMessage( DBACORE_RESSTRING( RID_STR_QUERY_DOES_NOT_EXIST ) );
+                    throwGenericSQLException(sMessage.replaceAll( "$table$", m_aCommand ),*this);
                 }
             }
             else
-                throw SQLException(DBA_RES(RID_STR_NO_XQUERIESSUPPLIER),*this,::rtl::OUString(),0,Any());
+                throw SQLException(DBA_RES(RID_STR_NO_XQUERIESSUPPLIER),*this,OUString(),0,Any());
         }
         break;
 
@@ -2461,7 +2459,7 @@ void SAL_CALL ORowSet::setNull( sal_Int32 parameterIndex, sal_Int32 /*sqlType*/
     getParameterStorage( parameterIndex ).setNull();
 }
 
-void SAL_CALL ORowSet::setObjectNull( sal_Int32 parameterIndex, sal_Int32 sqlType, const ::rtl::OUString& /*typeName*/ ) throw(SQLException, RuntimeException)
+void SAL_CALL ORowSet::setObjectNull( sal_Int32 parameterIndex, sal_Int32 sqlType, const OUString& /*typeName*/ ) throw(SQLException, RuntimeException)
 {
     setNull( parameterIndex, sqlType );
 }
@@ -2508,7 +2506,7 @@ void SAL_CALL ORowSet::setDouble( sal_Int32 parameterIndex, double x ) throw(SQL
     setParameter(parameterIndex,x);
 }
 
-void SAL_CALL ORowSet::setString( sal_Int32 parameterIndex, const ::rtl::OUString& x ) throw(SQLException, RuntimeException)
+void SAL_CALL ORowSet::setString( sal_Int32 parameterIndex, const OUString& x ) throw(SQLException, RuntimeException)
 {
     setParameter(parameterIndex,x);
 }
@@ -2743,16 +2741,16 @@ ORowSetClone::ORowSetClone( const ::comphelper::ComponentContext& _rContext, ORo
     m_aOldRow = m_pCache->registerOldRow();
 
     ::rtl::Reference< ::connectivity::OSQLColumns> aColumns = new ::connectivity::OSQLColumns();
-    ::std::vector< ::rtl::OUString> aNames;
+    ::std::vector< OUString> aNames;
 
-    ::rtl::OUString aDescription;
+    OUString aDescription;
     Locale aLocale = SvtSysLocale().GetLanguageTag().getLocale();
 
     if ( rParent.m_pColumns )
     {
-        Sequence< ::rtl::OUString> aSeq = rParent.m_pColumns->getElementNames();
-        const ::rtl::OUString* pIter    = aSeq.getConstArray();
-        const ::rtl::OUString* pEnd     = pIter + aSeq.getLength();
+        Sequence< OUString> aSeq = rParent.m_pColumns->getElementNames();
+        const OUString* pIter    = aSeq.getConstArray();
+        const OUString* pEnd     = pIter + aSeq.getLength();
         aColumns->get().reserve(aSeq.getLength()+1);
         for(sal_Int32 i=1;pIter != pEnd ;++pIter,++i)
         {
@@ -2761,7 +2759,7 @@ ORowSetClone::ORowSetClone( const ::comphelper::ComponentContext& _rContext, ORo
             if(xColumn->getPropertySetInfo()->hasPropertyByName(PROPERTY_DESCRIPTION))
                 aDescription = comphelper::getString(xColumn->getPropertyValue(PROPERTY_DESCRIPTION));
 
-            ::rtl::OUString sParseLabel;
+            OUString sParseLabel;
             xColumn->getPropertyValue(PROPERTY_LABEL) >>= sParseLabel;
             ORowSetColumn* pColumn = new ORowSetColumn( rParent.getMetaData(),
                                                                 this,
@@ -2841,14 +2839,14 @@ rtl::OUString ORowSetClone::getImplementationName(  ) throw(RuntimeException)
     return rtl::OUString("com.sun.star.sdb.ORowSetClone");
 }
 
-sal_Bool ORowSetClone::supportsService( const ::rtl::OUString& _rServiceName ) throw (RuntimeException)
+sal_Bool ORowSetClone::supportsService( const OUString& _rServiceName ) throw (RuntimeException)
 {
     return ::comphelper::findValue(getSupportedServiceNames(), _rServiceName, sal_True).getLength() != 0;
 }
 
-Sequence< ::rtl::OUString > ORowSetClone::getSupportedServiceNames(  ) throw (RuntimeException)
+Sequence< OUString > ORowSetClone::getSupportedServiceNames(  ) throw (RuntimeException)
 {
-    Sequence< ::rtl::OUString > aSNS( 2 );
+    Sequence< OUString > aSNS( 2 );
     aSNS[0] = SERVICE_SDBC_RESULTSET;
     aSNS[1] = SERVICE_SDB_RESULTSET;
     return aSNS;
diff --git a/dbaccess/source/core/api/SingleSelectQueryComposer.cxx b/dbaccess/source/core/api/SingleSelectQueryComposer.cxx
index ca532914bbcd..89e9b021fded 100644
--- a/dbaccess/source/core/api/SingleSelectQueryComposer.cxx
+++ b/dbaccess/source/core/api/SingleSelectQueryComposer.cxx
@@ -396,9 +396,8 @@ void SAL_CALL OSingleSelectQueryComposer::setCommand( const OUString& Command,sa
             }
             else
             {
-                String sMessage( DBACORE_RESSTRING( RID_STR_QUERY_DOES_NOT_EXIST ) );
-                sMessage.SearchAndReplaceAscii( "$table$", Command );
-                throwGenericSQLException(sMessage,*this);
+                OUString sMessage( DBACORE_RESSTRING( RID_STR_QUERY_DOES_NOT_EXIST ) );
+                throwGenericSQLException(sMessage.replaceAll( "$table$", Command ),*this);
             }
 
             break;
@@ -480,9 +479,8 @@ OUString OSingleSelectQueryComposer::impl_getColumnName_throw(const Reference< X
 
     if ( !m_xMetaData->supportsOrderByUnrelated() && m_aCurrentColumns[SelectColumns] && !m_aCurrentColumns[SelectColumns]->hasByName(aName))
     {
-        String sError(DBACORE_RESSTRING(RID_STR_COLUMN_MUST_VISIBLE));
-        sError.SearchAndReplaceAscii("%name", aName);
-        throw SQLException(sError,*this,SQLSTATE_GENERAL,1000,Any() );
+        OUString sError(DBACORE_RESSTRING(RID_STR_COLUMN_MUST_VISIBLE));
+        throw SQLException(sError.replaceAll("%name", aName),*this,SQLSTATE_GENERAL,1000,Any() );
     }
 
     // Attach filter
diff --git a/dbaccess/source/core/api/tablecontainer.cxx b/dbaccess/source/core/api/tablecontainer.cxx
index fc14179d286c..5c44d0ec2409 100644
--- a/dbaccess/source/core/api/tablecontainer.cxx
+++ b/dbaccess/source/core/api/tablecontainer.cxx
@@ -70,13 +70,13 @@ using namespace ::connectivity::sdbcx;
 
 namespace
 {
-    sal_Bool lcl_isPropertySetDefaulted(const Sequence< ::rtl::OUString>& _aNames,const Reference<XPropertySet>& _xProp)
+    sal_Bool lcl_isPropertySetDefaulted(const Sequence< OUString>& _aNames,const Reference<XPropertySet>& _xProp)
     {
         Reference<XPropertyState> xState(_xProp,UNO_QUERY);
         if ( xState.is() )
         {
-            const ::rtl::OUString* pIter = _aNames.getConstArray();
-            const ::rtl::OUString* pEnd   = pIter + _aNames.getLength();
+            const OUString* pIter = _aNames.getConstArray();
+            const OUString* pEnd   = pIter + _aNames.getLength();
             for(;pIter != pEnd;++pIter)
             {
                 try
@@ -136,10 +136,10 @@ void OTableContainer::removeMasterContainerListener()
     }
 }
 
-::rtl::OUString OTableContainer::getTableTypeRestriction() const
+OUString OTableContainer::getTableTypeRestriction() const
 {
     // no restriction at all (other than the ones provided externally)
-    return ::rtl::OUString();
+    return OUString();
 }
 
 // XServiceInfo
@@ -147,7 +147,7 @@ IMPLEMENT_SERVICE_INFO2(OTableContainer, "com.sun.star.sdb.dbaccess.OTableContai
 
 namespace
 {
-void lcl_createDefintionObject(const ::rtl::OUString& _rName
+void lcl_createDefintionObject(const OUString& _rName
                            ,const Reference< XNameContainer >& _xTableDefinitions
                            ,Reference<XPropertySet>& _xTableDefinition
                            ,Reference<XNameAccess>& _xColumnDefinitions
@@ -172,7 +172,7 @@ void lcl_createDefintionObject(const ::rtl::OUString& _rName
 
 }
 
-connectivity::sdbcx::ObjectType OTableContainer::createObject(const ::rtl::OUString& _rName)
+connectivity::sdbcx::ObjectType OTableContainer::createObject(const OUString& _rName)
 {
     RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "api", "Ocke.Janssen@sun.com", "OTableContainer::createObject" );
     Reference<XColumnsSupplier > xSup;
@@ -194,7 +194,7 @@ connectivity::sdbcx::ObjectType OTableContainer::createObject(const ::rtl::OUStr
         }
         else
         {
-            ::rtl::OUString sCatalog,sSchema,sTable;
+            OUString sCatalog,sSchema,sTable;
             ::dbtools::qualifiedNameComponents(m_xMetaData,
                                                 _rName,
                                                 sCatalog,
@@ -204,8 +204,8 @@ connectivity::sdbcx::ObjectType OTableContainer::createObject(const ::rtl::OUStr
             Any aCatalog;
             if(!sCatalog.isEmpty())
                 aCatalog <<= sCatalog;
-            ::rtl::OUString sType,sDescription;
-            Sequence< ::rtl::OUString> aTypeFilter;
+            OUString sType,sDescription;
+            Sequence< OUString> aTypeFilter;
             getAllTableTypeFilter( aTypeFilter );
 
             Reference< XResultSet > xRes =  m_xMetaData.is() ? m_xMetaData->getTables(aCatalog,sSchema,sTable,aTypeFilter) : Reference< XResultSet >();
@@ -270,16 +270,15 @@ Reference< XPropertySet > OTableContainer::createDescriptor()
 }
 
 // XAppend
-ObjectType OTableContainer::appendObject( const ::rtl::OUString& _rForName, const Reference< XPropertySet >& descriptor )
+ObjectType OTableContainer::appendObject( const OUString& _rForName, const Reference< XPropertySet >& descriptor )
 {
     RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "api", "Ocke.Janssen@sun.com", "OTableContainer::appendObject" );
     // append the new table with a create stmt
-    ::rtl::OUString aName = getString(descriptor->getPropertyValue(PROPERTY_NAME));
+    OUString aName = getString(descriptor->getPropertyValue(PROPERTY_NAME));
     if(m_xMasterContainer.is() && m_xMasterContainer->hasByName(aName))
     {
-        String sMessage(DBACORE_RESSTRING(RID_STR_TABLE_IS_FILTERED));
-        sMessage.SearchAndReplaceAscii("$name$", aName);
-        throw SQLException(sMessage,static_cast<XTypeProvider*>(static_cast<OFilteredContainer*>(this)),SQLSTATE_GENERAL,1000,Any());
+        OUString sMessage(DBACORE_RESSTRING(RID_STR_TABLE_IS_FILTERED));
+        throw SQLException(sMessage.replaceAll("$name$", aName),static_cast<XTypeProvider*>(static_cast<OFilteredContainer*>(this)),SQLSTATE_GENERAL,1000,Any());
     }
 
     Reference< XConnection > xConnection( m_xConnection.get(), UNO_QUERY );
@@ -296,7 +295,7 @@ ObjectType OTableContainer::appendObject( const ::rtl::OUString& _rForName, cons
         }
         else
         {
-            ::rtl::OUString aSql = ::dbtools::createSqlCreateTableStatement(descriptor,m_xConnection);
+            OUString aSql = ::dbtools::createSqlCreateTableStatement(descriptor,m_xConnection);
 
             Reference<XConnection> xCon = m_xConnection;
             OSL_ENSURE(xCon.is(),"Connection is null!");
@@ -327,9 +326,9 @@ ObjectType OTableContainer::appendObject( const ::rtl::OUString& _rForName, cons
         if ( xNames.is() )
         {
             Reference<XPropertySet> xProp = xFac->createDataDescriptor();
-            Sequence< ::rtl::OUString> aSeq = xNames->getElementNames();
-            const ::rtl::OUString* pIter = aSeq.getConstArray();
-            const ::rtl::OUString* pEnd   = pIter + aSeq.getLength();
+            Sequence< OUString> aSeq = xNames->getElementNames();
+            const OUString* pIter = aSeq.getConstArray();
+            const OUString* pEnd   = pIter + aSeq.getLength();
             for(;pIter != pEnd;++pIter)
             {
                 if ( !xColumnDefinitions->hasByName(*pIter) )
@@ -345,12 +344,12 @@ ObjectType OTableContainer::appendObject( const ::rtl::OUString& _rForName, cons
             }
         }
     }
-    const static ::rtl::OUString s_pTableProps[] = {    ::rtl::OUString(PROPERTY_FILTER), ::rtl::OUString(PROPERTY_ORDER)
-                                                    , ::rtl::OUString(PROPERTY_APPLYFILTER), ::rtl::OUString(PROPERTY_FONT)
-                                                    , ::rtl::OUString(PROPERTY_ROW_HEIGHT), ::rtl::OUString(PROPERTY_TEXTCOLOR)
-                                                    , ::rtl::OUString(PROPERTY_TEXTLINECOLOR), ::rtl::OUString(PROPERTY_TEXTEMPHASIS)
-                                                    , ::rtl::OUString(PROPERTY_TEXTRELIEF) };
-    Sequence< ::rtl::OUString> aNames(s_pTableProps,sizeof(s_pTableProps)/sizeof(s_pTableProps[0]));
+    const static OUString s_pTableProps[] = {    OUString(PROPERTY_FILTER), OUString(PROPERTY_ORDER)
+                                                    , OUString(PROPERTY_APPLYFILTER), OUString(PROPERTY_FONT)
+                                                    , OUString(PROPERTY_ROW_HEIGHT), OUString(PROPERTY_TEXTCOLOR)
+                                                    , OUString(PROPERTY_TEXTLINECOLOR), OUString(PROPERTY_TEXTEMPHASIS)
+                                                    , OUString(PROPERTY_TEXTRELIEF) };
+    Sequence< OUString> aNames(s_pTableProps,sizeof(s_pTableProps)/sizeof(s_pTableProps[0]));
     if ( bModified || !lcl_isPropertySetDefaulted(aNames,xTableDefinition) )
         ::dbaccess::notifyDataSourceModified(m_xTableDefinitions,sal_True);
 
@@ -358,7 +357,7 @@ ObjectType OTableContainer::appendObject( const ::rtl::OUString& _rForName, cons
 }
 
 // XDrop
-void OTableContainer::dropObject(sal_Int32 _nPos,const ::rtl::OUString _sElementName)
+void OTableContainer::dropObject(sal_Int32 _nPos,const OUString _sElementName)
 {
     RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "api", "Ocke.Janssen@sun.com", "OTableContainer::dropObject" );
     m_bInDrop = sal_True;
@@ -369,7 +368,7 @@ void OTableContainer::dropObject(sal_Int32 _nPos,const ::rtl::OUString _sElement
             xDrop->dropByName(_sElementName);
         else
         {
-            ::rtl::OUString sCatalog,sSchema,sTable,sComposedName;
+            OUString sCatalog,sSchema,sTable,sComposedName;
 
             sal_Bool bIsView = sal_False;
             Reference<XPropertySet> xTable(getObject(_nPos),UNO_QUERY);
@@ -383,20 +382,20 @@ void OTableContainer::dropObject(sal_Int32 _nPos,const ::rtl::OUString _sElement
 
                 sComposedName = ::dbtools::composeTableName( m_xMetaData, sCatalog, sSchema, sTable, sal_True, ::dbtools::eInTableDefinitions );
 
-                ::rtl::OUString sType;
+                OUString sType;
                 xTable->getPropertyValue(PROPERTY_TYPE)         >>= sType;
-                bIsView = sType.equalsIgnoreAsciiCase(::rtl::OUString("VIEW"));
+                bIsView = sType.equalsIgnoreAsciiCase(OUString("VIEW"));
             }
 
             if(sComposedName.isEmpty())
                 ::dbtools::throwFunctionSequenceException(static_cast<XTypeProvider*>(static_cast<OFilteredContainer*>(this)));
 
-            ::rtl::OUString aSql("DROP ");
+            OUString aSql("DROP ");
 
             if ( bIsView ) // here we have a view
-                aSql += ::rtl::OUString("VIEW ");
+                aSql += OUString("VIEW ");
             else
-                aSql += ::rtl::OUString("TABLE ");
+                aSql += OUString("TABLE ");
             aSql += sComposedName;
             Reference<XConnection> xCon = m_xConnection;
             OSL_ENSURE(xCon.is(),"Connection is null!");
@@ -426,7 +425,7 @@ void SAL_CALL OTableContainer::elementInserted( const ContainerEvent& Event ) th
 {
     RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "api", "Ocke.Janssen@sun.com", "OTableContainer::elementInserted" );
     ::osl::MutexGuard aGuard(m_rMutex);
-    ::rtl::OUString sName;
+    OUString sName;
     Event.Accessor >>= sName;
     if ( !m_nInAppend && !hasByName(sName) )
     {
@@ -451,7 +450,7 @@ void SAL_CALL OTableContainer::elementReplaced( const ContainerEvent& Event ) th
     RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "api", "Ocke.Janssen@sun.com", "OTableContainer::elementReplaced" );
     // create a new config entry
     {
-        ::rtl::OUString sOldComposedName,sNewComposedName;
+        OUString sOldComposedName,sNewComposedName;
         Event.ReplacedElement   >>= sOldComposedName;
         Event.Accessor          >>= sNewComposedName;