14 files changed, 207 insertions, 208 deletions

diff --git a/connectivity/source/drivers/dbase/DCatalog.cxx b/connectivity/source/drivers/dbase/DCatalog.cxx
index 981be00e2855..6c67969ed46f 100644
--- a/connectivity/source/drivers/dbase/DCatalog.cxx
+++ b/connectivity/source/drivers/dbase/DCatalog.cxx
@@ -39,9 +39,9 @@ ODbaseCatalog::ODbaseCatalog(ODbaseConnection* _pCon) : file::OFileCatalog(_pCon
 void ODbaseCatalog::refreshTables()
 {
     TStringVector aVector;
-    Sequence< ::rtl::OUString > aTypes;
+    Sequence< OUString > aTypes;
     Reference< XResultSet > xResult = m_xMetaData->getTables(Any(),
-        ::rtl::OUString("%"),::rtl::OUString("%"),aTypes);
+        OUString("%"),OUString("%"),aTypes);
 
     if(xResult.is())
     {
diff --git a/connectivity/source/drivers/dbase/DCode.cxx b/connectivity/source/drivers/dbase/DCode.cxx
index d10da503da97..9d9b0827eab9 100644
--- a/connectivity/source/drivers/dbase/DCode.cxx
+++ b/connectivity/source/drivers/dbase/DCode.cxx
@@ -48,13 +48,13 @@ OFILEOperandAttr::OFILEOperandAttr(sal_uInt16 _nPos,
 {
     if(_xIndexes.is())
     {
-        ::rtl::OUString sName;
+        OUString sName;
         Reference<XPropertySetInfo> xColInfo = _xColumn->getPropertySetInfo();
         Reference<XPropertySet> xIndex;
 
-        Sequence< ::rtl::OUString> aSeq = _xIndexes->getElementNames();
-        const ::rtl::OUString* pBegin = aSeq.getConstArray();
-        const ::rtl::OUString* pEnd   = pBegin + aSeq.getLength();
+        Sequence< OUString> aSeq = _xIndexes->getElementNames();
+        const OUString* pBegin = aSeq.getConstArray();
+        const OUString* pEnd   = pBegin + aSeq.getLength();
         for(;pBegin != pEnd;++pBegin)
         {
             _xIndexes->getByName(*pBegin) >>= xIndex;
diff --git a/connectivity/source/drivers/dbase/DColumns.cxx b/connectivity/source/drivers/dbase/DColumns.cxx
index 9bdffaa6f48c..eaa6d1a605e1 100644
--- a/connectivity/source/drivers/dbase/DColumns.cxx
+++ b/connectivity/source/drivers/dbase/DColumns.cxx
@@ -32,7 +32,7 @@ using namespace ::com::sun::star::sdbcx;
 using namespace ::com::sun::star::sdbc;
 using namespace ::com::sun::star::container;
 
-sdbcx::ObjectType ODbaseColumns::createObject(const ::rtl::OUString& _rName)
+sdbcx::ObjectType ODbaseColumns::createObject(const OUString& _rName)
 {
 
     ODbaseTable* pTable = (ODbaseTable*)m_pTable;
@@ -59,7 +59,7 @@ Reference< XPropertySet > ODbaseColumns::createDescriptor()
 // -----------------------------------------------------------------------------
 // -------------------------------------------------------------------------
 // XAppend
-sdbcx::ObjectType ODbaseColumns::appendObject( const ::rtl::OUString& _rForName, const Reference< XPropertySet >& descriptor )
+sdbcx::ObjectType ODbaseColumns::appendObject( const OUString& _rForName, const Reference< XPropertySet >& descriptor )
 {
     if ( m_pTable->isNew() )
         return cloneDescriptor( descriptor );
@@ -70,7 +70,7 @@ sdbcx::ObjectType ODbaseColumns::appendObject( const ::rtl::OUString& _rForName,
 // -----------------------------------------------------------------------------
 // -------------------------------------------------------------------------
 // XDrop
-void ODbaseColumns::dropObject(sal_Int32 _nPos,const ::rtl::OUString /*_sElementName*/)
+void ODbaseColumns::dropObject(sal_Int32 _nPos,const OUString /*_sElementName*/)
 {
     if(!m_pTable->isNew())
         m_pTable->dropColumn(_nPos);
diff --git a/connectivity/source/drivers/dbase/DConnection.cxx b/connectivity/source/drivers/dbase/DConnection.cxx
index aa88ae2290bf..99658b39e542 100644
--- a/connectivity/source/drivers/dbase/DConnection.cxx
+++ b/connectivity/source/drivers/dbase/DConnection.cxx
@@ -45,7 +45,7 @@ DBG_NAME(ODbaseConnection)
 ODbaseConnection::ODbaseConnection(ODriver* _pDriver) : OConnection(_pDriver)
 {
     DBG_CTOR(ODbaseConnection,NULL);
-    m_aFilenameExtension = rtl::OUString("dbf");
+    m_aFilenameExtension = OUString("dbf");
 }
 //-----------------------------------------------------------------------------
 ODbaseConnection::~ODbaseConnection()
@@ -98,7 +98,7 @@ Reference< XStatement > SAL_CALL ODbaseConnection::createStatement(  ) throw(SQL
     return xReturn;
 }
 // --------------------------------------------------------------------------------
-Reference< XPreparedStatement > SAL_CALL ODbaseConnection::prepareStatement( const ::rtl::OUString& sql ) throw(SQLException, RuntimeException)
+Reference< XPreparedStatement > SAL_CALL ODbaseConnection::prepareStatement( const OUString& sql ) throw(SQLException, RuntimeException)
 {
     ::osl::MutexGuard aGuard( m_aMutex );
     checkDisposed(OConnection_BASE::rBHelper.bDisposed);
@@ -111,7 +111,7 @@ Reference< XPreparedStatement > SAL_CALL ODbaseConnection::prepareStatement( con
     return pStmt;
 }
 // --------------------------------------------------------------------------------
-Reference< XPreparedStatement > SAL_CALL ODbaseConnection::prepareCall( const ::rtl::OUString& /*sql*/ ) throw(SQLException, RuntimeException)
+Reference< XPreparedStatement > SAL_CALL ODbaseConnection::prepareCall( const OUString& /*sql*/ ) throw(SQLException, RuntimeException)
 {
     ::dbtools::throwFeatureNotImplementedException( "XConnection::prepareCall", *this );
     return NULL;
diff --git a/connectivity/source/drivers/dbase/DDatabaseMetaData.cxx b/connectivity/source/drivers/dbase/DDatabaseMetaData.cxx
index 9cd9613a082d..c4623c0fa2fa 100644
--- a/connectivity/source/drivers/dbase/DDatabaseMetaData.cxx
+++ b/connectivity/source/drivers/dbase/DDatabaseMetaData.cxx
@@ -70,19 +70,19 @@ Reference< XResultSet > ODbaseDatabaseMetaData::impl_getTypeInfo_throw(  )
         aRow.reserve(18);
 
         aRow.push_back(ODatabaseMetaDataResultSet::getEmptyValue());
-        aRow.push_back(new ORowSetValueDecorator(::rtl::OUString("VARCHAR")));
+        aRow.push_back(new ORowSetValueDecorator(OUString("VARCHAR")));
         aRow.push_back(new ORowSetValueDecorator(DataType::VARCHAR));
         aRow.push_back(new ORowSetValueDecorator((sal_Int32)254));
         aRow.push_back(ODatabaseMetaDataResultSet::getQuoteValue());
         aRow.push_back(ODatabaseMetaDataResultSet::getQuoteValue());
-        aRow.push_back(new ORowSetValueDecorator(::rtl::OUString("length")));
+        aRow.push_back(new ORowSetValueDecorator(OUString("length")));
         aRow.push_back(new ORowSetValueDecorator((sal_Int32)ColumnValue::NULLABLE));
         aRow.push_back(ODatabaseMetaDataResultSet::get1Value());
         aRow.push_back(new ORowSetValueDecorator((sal_Int32)ColumnSearch::FULL));
         aRow.push_back(ODatabaseMetaDataResultSet::get1Value());
         aRow.push_back(ODatabaseMetaDataResultSet::get0Value());
         aRow.push_back(ODatabaseMetaDataResultSet::get0Value());
-        aRow.push_back(new ORowSetValueDecorator(::rtl::OUString("C")));
+        aRow.push_back(new ORowSetValueDecorator(OUString("C")));
         aRow.push_back(ODatabaseMetaDataResultSet::get0Value());
         aRow.push_back(ODatabaseMetaDataResultSet::get0Value());
         aRow.push_back(ODatabaseMetaDataResultSet::getEmptyValue());
@@ -91,62 +91,62 @@ Reference< XResultSet > ODbaseDatabaseMetaData::impl_getTypeInfo_throw(  )
 
         aRows.push_back(aRow);
 
-        aRow[1] = new ORowSetValueDecorator(::rtl::OUString("LONGVARCHAR"));
+        aRow[1] = new ORowSetValueDecorator(OUString("LONGVARCHAR"));
         aRow[2] = new ORowSetValueDecorator(DataType::LONGVARCHAR);
         aRow[3] = new ORowSetValueDecorator((sal_Int32)2147483647);
         aRow[6] = new ORowSetValueDecorator();
-        aRow[13] = new ORowSetValueDecorator(::rtl::OUString("M"));
+        aRow[13] = new ORowSetValueDecorator(OUString("M"));
         aRows.push_back(aRow);
 
-        aRow[1] = new ORowSetValueDecorator(::rtl::OUString("DATE"));
+        aRow[1] = new ORowSetValueDecorator(OUString("DATE"));
         aRow[2] = new ORowSetValueDecorator(DataType::DATE);
         aRow[3] = new ORowSetValueDecorator((sal_Int32)10);
-        aRow[13] = new ORowSetValueDecorator(::rtl::OUString("D"));
+        aRow[13] = new ORowSetValueDecorator(OUString("D"));
         aRows.push_back(aRow);
 
-        aRow[1] = new ORowSetValueDecorator(::rtl::OUString("BOOLEAN"));
+        aRow[1] = new ORowSetValueDecorator(OUString("BOOLEAN"));
         aRow[2] = new ORowSetValueDecorator(DataType::BIT);
         aRow[3] = ODatabaseMetaDataResultSet::get1Value();
         aRow[4] = ODatabaseMetaDataResultSet::getEmptyValue();
         aRow[5] = ODatabaseMetaDataResultSet::getEmptyValue();
-        aRow[6] = new ORowSetValueDecorator(::rtl::OUString());
+        aRow[6] = new ORowSetValueDecorator(OUString());
         aRow[9] = ODatabaseMetaDataResultSet::getBasicValue();
-        aRow[13] = new ORowSetValueDecorator(::rtl::OUString("L"));
+        aRow[13] = new ORowSetValueDecorator(OUString("L"));
         aRows.push_back(aRow);
 
-        aRow[1] = new ORowSetValueDecorator(::rtl::OUString("DOUBLE"));
+        aRow[1] = new ORowSetValueDecorator(OUString("DOUBLE"));
         aRow[2] = new ORowSetValueDecorator(DataType::DOUBLE);
         aRow[3] = new ORowSetValueDecorator((sal_Int32)8);
-        aRow[13] = new ORowSetValueDecorator(::rtl::OUString("B"));
+        aRow[13] = new ORowSetValueDecorator(OUString("B"));
         aRows.push_back(aRow);
 
         aRow[11] = new ORowSetValueDecorator(sal_True);
-        aRow[13] = new ORowSetValueDecorator(::rtl::OUString("Y"));
+        aRow[13] = new ORowSetValueDecorator(OUString("Y"));
         aRows.push_back(aRow);
 
-        aRow[1] = new ORowSetValueDecorator(::rtl::OUString("TIMESTAMP"));
+        aRow[1] = new ORowSetValueDecorator(OUString("TIMESTAMP"));
         aRow[2] = new ORowSetValueDecorator(DataType::TIMESTAMP);
         aRow[11] = new ORowSetValueDecorator(sal_False);
-        aRow[13] = new ORowSetValueDecorator(::rtl::OUString("T"));
+        aRow[13] = new ORowSetValueDecorator(OUString("T"));
         aRows.push_back(aRow);
 
-        aRow[1] = new ORowSetValueDecorator(::rtl::OUString("INTEGER"));
+        aRow[1] = new ORowSetValueDecorator(OUString("INTEGER"));
         aRow[2] = new ORowSetValueDecorator(DataType::INTEGER);
         aRow[3] = new ORowSetValueDecorator((sal_Int32)10);
-        aRow[13] = new ORowSetValueDecorator(::rtl::OUString("I"));
+        aRow[13] = new ORowSetValueDecorator(OUString("I"));
         aRows.push_back(aRow);
 
-        aRow[1] = new ORowSetValueDecorator(::rtl::OUString("DECIMAL"));
+        aRow[1] = new ORowSetValueDecorator(OUString("DECIMAL"));
         aRow[2] = new ORowSetValueDecorator(DataType::DECIMAL);
         aRow[3] = new ORowSetValueDecorator((sal_Int32)20);
-        aRow[6] = new ORowSetValueDecorator(::rtl::OUString("length,scale"));
-        aRow[13] = new ORowSetValueDecorator(::rtl::OUString("F"));
+        aRow[6] = new ORowSetValueDecorator(OUString("length,scale"));
+        aRow[13] = new ORowSetValueDecorator(OUString("F"));
         aRows.push_back(aRow);
 
-        aRow[1] = new ORowSetValueDecorator(::rtl::OUString("NUMERIC"));
+        aRow[1] = new ORowSetValueDecorator(OUString("NUMERIC"));
         aRow[2] = new ORowSetValueDecorator(DataType::DECIMAL);
         aRow[3] = new ORowSetValueDecorator((sal_Int32)16);
-        aRow[13] = new ORowSetValueDecorator(::rtl::OUString("N"));
+        aRow[13] = new ORowSetValueDecorator(OUString("N"));
         aRow[15] = new ORowSetValueDecorator((sal_Int32)16);
         aRows.push_back(aRow);
     }
@@ -156,8 +156,8 @@ Reference< XResultSet > ODbaseDatabaseMetaData::impl_getTypeInfo_throw(  )
 }
 // -------------------------------------------------------------------------
 Reference< XResultSet > SAL_CALL ODbaseDatabaseMetaData::getColumns(
-    const Any& /*catalog*/, const ::rtl::OUString& /*schemaPattern*/, const ::rtl::OUString& tableNamePattern,
-        const ::rtl::OUString& columnNamePattern ) throw(SQLException, RuntimeException)
+    const Any& /*catalog*/, const OUString& /*schemaPattern*/, const OUString& tableNamePattern,
+        const OUString& columnNamePattern ) throw(SQLException, RuntimeException)
 {
     RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "dbase", "Ocke.Janssen@sun.com", "ODbaseDatabaseMetaData::getColumns" );
     ::osl::MutexGuard aGuard( m_aMutex );
@@ -175,9 +175,9 @@ Reference< XResultSet > SAL_CALL ODbaseDatabaseMetaData::getColumns(
     ODatabaseMetaDataResultSet::ORow aRow(19);
 
     aRow[10] = new ORowSetValueDecorator((sal_Int32)10);
-    Sequence< ::rtl::OUString> aTabNames(xNames->getElementNames());
-    const ::rtl::OUString* pTabBegin    = aTabNames.getConstArray();
-    const ::rtl::OUString* pTabEnd      = pTabBegin + aTabNames.getLength();
+    Sequence< OUString> aTabNames(xNames->getElementNames());
+    const OUString* pTabBegin    = aTabNames.getConstArray();
+    const OUString* pTabEnd      = pTabBegin + aTabNames.getLength();
     for(;pTabBegin != pTabEnd;++pTabBegin)
     {
         if(match(tableNamePattern,*pTabBegin,'\0'))
@@ -191,10 +191,10 @@ Reference< XResultSet > SAL_CALL ODbaseDatabaseMetaData::getColumns(
             if(!xColumns.is())
                 throw SQLException();
 
-            Sequence< ::rtl::OUString> aColNames(xColumns->getElementNames());
+            Sequence< OUString> aColNames(xColumns->getElementNames());
 
-            const ::rtl::OUString* pBegin = aColNames.getConstArray();
-            const ::rtl::OUString* pEnd = pBegin + aColNames.getLength();
+            const OUString* pBegin = aColNames.getConstArray();
+            const OUString* pEnd = pBegin + aColNames.getLength();
             Reference< XPropertySet> xColumn;
             for(sal_Int32 i=1;pBegin != pEnd;++pBegin,++i)
             {
@@ -226,13 +226,13 @@ Reference< XResultSet > SAL_CALL ODbaseDatabaseMetaData::getColumns(
                     switch(sal_Int32(aRow[11]->getValue()))
                     {
                     case ColumnValue::NO_NULLS:
-                        aRow[18] = new ORowSetValueDecorator(::rtl::OUString("NO"));
+                        aRow[18] = new ORowSetValueDecorator(OUString("NO"));
                         break;
                     case ColumnValue::NULLABLE:
-                        aRow[18] = new ORowSetValueDecorator(::rtl::OUString("YES"));
+                        aRow[18] = new ORowSetValueDecorator(OUString("YES"));
                         break;
                     default:
-                        aRow[18] = new ORowSetValueDecorator(::rtl::OUString());
+                        aRow[18] = new ORowSetValueDecorator(OUString());
                     }
                     aRows.push_back(aRow);
                 }
@@ -247,7 +247,7 @@ Reference< XResultSet > SAL_CALL ODbaseDatabaseMetaData::getColumns(
 }
 // -------------------------------------------------------------------------
 Reference< XResultSet > SAL_CALL ODbaseDatabaseMetaData::getIndexInfo(
-    const Any& /*catalog*/, const ::rtl::OUString& /*schema*/, const ::rtl::OUString& table,
+    const Any& /*catalog*/, const OUString& /*schema*/, const OUString& table,
         sal_Bool unique, sal_Bool /*approximate*/ ) throw(SQLException, RuntimeException)
 {
     RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "dbase", "Ocke.Janssen@sun.com", "ODbaseDatabaseMetaData::getIndexInfo" );
@@ -264,8 +264,8 @@ Reference< XResultSet > SAL_CALL ODbaseDatabaseMetaData::getIndexInfo(
     ODatabaseMetaDataResultSet::ORows aRows;
     ODatabaseMetaDataResultSet::ORow aRow(14);
 
-    aRow[5]     = new ORowSetValueDecorator(::rtl::OUString());
-    aRow[10]    = new ORowSetValueDecorator(::rtl::OUString("A"));
+    aRow[5]     = new ORowSetValueDecorator(OUString());
+    aRow[10]    = new ORowSetValueDecorator(OUString("A"));
 
     Reference< XIndexesSupplier> xTable;
     ::cppu::extractInterface(xTable,xNames->getByName(table));
@@ -276,10 +276,10 @@ Reference< XResultSet > SAL_CALL ODbaseDatabaseMetaData::getIndexInfo(
     if(!xIndexes.is())
         throw SQLException();
 
-    Sequence< ::rtl::OUString> aIdxNames(xIndexes->getElementNames());
+    Sequence< OUString> aIdxNames(xIndexes->getElementNames());
 
-    const ::rtl::OUString* pBegin = aIdxNames.getConstArray();
-    const ::rtl::OUString* pEnd = pBegin + aIdxNames.getLength();
+    const OUString* pBegin = aIdxNames.getConstArray();
+    const OUString* pEnd = pBegin + aIdxNames.getLength();
     Reference< XPropertySet> xIndex;
     for(;pBegin != pEnd;++pBegin)
     {
@@ -304,10 +304,10 @@ Reference< XResultSet > SAL_CALL ODbaseDatabaseMetaData::getIndexInfo(
 
         Reference<XColumnsSupplier> xColumnsSup(xIndex,UNO_QUERY);
         Reference< XNameAccess> xColumns = xColumnsSup->getColumns();
-        Sequence< ::rtl::OUString> aColNames(xColumns->getElementNames());
+        Sequence< OUString> aColNames(xColumns->getElementNames());
 
-        const ::rtl::OUString* pColBegin = aColNames.getConstArray();
-        const ::rtl::OUString* pColEnd = pColBegin + aColNames.getLength();
+        const OUString* pColBegin = aColNames.getConstArray();
+        const OUString* pColEnd = pColBegin + aColNames.getLength();
         Reference< XPropertySet> xColumn;
         for(sal_Int32 j=1;pColBegin != pColEnd;++pColBegin,++j)
         {
@@ -323,11 +323,11 @@ Reference< XResultSet > SAL_CALL ODbaseDatabaseMetaData::getIndexInfo(
     return xRef;
 }
 // -------------------------------------------------------------------------
-::rtl::OUString SAL_CALL ODbaseDatabaseMetaData::getURL(  ) throw(SQLException, RuntimeException)
+OUString SAL_CALL ODbaseDatabaseMetaData::getURL(  ) throw(SQLException, RuntimeException)
 {
     RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "dbase", "Ocke.Janssen@sun.com", "ODbaseDatabaseMetaData::getURL" );
     ::osl::MutexGuard aGuard( m_aMutex );
-    return ::rtl::OUString("sdbc:dbase:") + m_pConnection->getURL();
+    return OUString("sdbc:dbase:") + m_pConnection->getURL();
 }
 // -------------------------------------------------------------------------
 sal_Int32 SAL_CALL ODbaseDatabaseMetaData::getMaxBinaryLiteralLength(  ) throw(SQLException, RuntimeException)
@@ -378,7 +378,7 @@ sal_Bool SAL_CALL ODbaseDatabaseMetaData::isReadOnly(  ) throw(SQLException, Run
     ::osl::MutexGuard aGuard( m_aMutex );
 
     sal_Bool bReadOnly = sal_False;
-    static ::rtl::OUString sReadOnly(  "IsReadOnly" );
+    static OUString sReadOnly(  "IsReadOnly" );
     ::ucbhelper::Content aFile(m_pConnection->getContent(),Reference< XCommandEnvironment >(), comphelper::getProcessComponentContext());
     aFile.getPropertyValue(sReadOnly) >>= bReadOnly;
 
diff --git a/connectivity/source/drivers/dbase/DDriver.cxx b/connectivity/source/drivers/dbase/DDriver.cxx
index 6da0aa49118f..02837f09ef2e 100644
--- a/connectivity/source/drivers/dbase/DDriver.cxx
+++ b/connectivity/source/drivers/dbase/DDriver.cxx
@@ -34,13 +34,13 @@ using namespace ::com::sun::star::lang;
 
 // static ServiceInfo
 //------------------------------------------------------------------------------
-rtl::OUString ODriver::getImplementationName_Static(  ) throw(RuntimeException)
+OUString ODriver::getImplementationName_Static(  ) throw(RuntimeException)
 {
-    return rtl::OUString("com.sun.star.comp.sdbc.dbase.ODriver");
+    return OUString("com.sun.star.comp.sdbc.dbase.ODriver");
 }
 
 //------------------------------------------------------------------
-::rtl::OUString SAL_CALL ODriver::getImplementationName(  ) throw(RuntimeException)
+OUString SAL_CALL ODriver::getImplementationName(  ) throw(RuntimeException)
 {
     return getImplementationName_Static();
 }
@@ -51,7 +51,7 @@ rtl::OUString ODriver::getImplementationName_Static(  ) throw(RuntimeException)
     return *(new ODriver(_rxFactory));
 }
 // --------------------------------------------------------------------------------
-Reference< XConnection > SAL_CALL ODriver::connect( const ::rtl::OUString& url, const Sequence< PropertyValue >& info ) throw(SQLException, RuntimeException)
+Reference< XConnection > SAL_CALL ODriver::connect( const OUString& url, const Sequence< PropertyValue >& info ) throw(SQLException, RuntimeException)
 {
     ::osl::MutexGuard aGuard( m_aMutex );
     if (ODriver_BASE::rBHelper.bDisposed)
@@ -68,47 +68,47 @@ Reference< XConnection > SAL_CALL ODriver::connect( const ::rtl::OUString& url,
     return xCon;
 }
 // --------------------------------------------------------------------------------
-sal_Bool SAL_CALL ODriver::acceptsURL( const ::rtl::OUString& url ) throw(SQLException, RuntimeException)
+sal_Bool SAL_CALL ODriver::acceptsURL( const OUString& url ) throw(SQLException, RuntimeException)
 {
     return url.startsWith("sdbc:dbase:");
 }
 // -----------------------------------------------------------------------------
-Sequence< DriverPropertyInfo > SAL_CALL ODriver::getPropertyInfo( const ::rtl::OUString& url, const Sequence< PropertyValue >& /*info*/ ) throw(SQLException, RuntimeException)
+Sequence< DriverPropertyInfo > SAL_CALL ODriver::getPropertyInfo( const OUString& url, const Sequence< PropertyValue >& /*info*/ ) throw(SQLException, RuntimeException)
 {
     if ( acceptsURL(url) )
     {
         ::std::vector< DriverPropertyInfo > aDriverInfo;
 
-        Sequence< ::rtl::OUString > aBoolean(2);
-        aBoolean[0] = ::rtl::OUString("0");
-        aBoolean[1] = ::rtl::OUString("1");
+        Sequence< OUString > aBoolean(2);
+        aBoolean[0] = OUString("0");
+        aBoolean[1] = OUString("1");
 
         aDriverInfo.push_back(DriverPropertyInfo(
-                ::rtl::OUString("CharSet")
-                ,::rtl::OUString("CharSet of the database.")
+                OUString("CharSet")
+                ,OUString("CharSet of the database.")
                 ,sal_False
-                ,::rtl::OUString()
-                ,Sequence< ::rtl::OUString >())
+                ,OUString()
+                ,Sequence< OUString >())
                 );
         aDriverInfo.push_back(DriverPropertyInfo(
-                ::rtl::OUString("ShowDeleted")
-                ,::rtl::OUString("Display inactive records.")
+                OUString("ShowDeleted")
+                ,OUString("Display inactive records.")
                 ,sal_False
-                ,::rtl::OUString("0")
+                ,OUString("0")
                 ,aBoolean)
                 );
         aDriverInfo.push_back(DriverPropertyInfo(
-                ::rtl::OUString("EnableSQL92Check")
-                ,::rtl::OUString("Use SQL92 naming constraints.")
+                OUString("EnableSQL92Check")
+                ,OUString("Use SQL92 naming constraints.")
                 ,sal_False
-                ,::rtl::OUString("0")
+                ,OUString("0")
                 ,aBoolean)
                 );
         return Sequence< DriverPropertyInfo >(&(aDriverInfo[0]),aDriverInfo.size());
     }
 
     SharedResources aResources;
-    const ::rtl::OUString sMessage = aResources.getResourceString(STR_URI_SYNTAX_ERROR);
+    const OUString sMessage = aResources.getResourceString(STR_URI_SYNTAX_ERROR);
     ::dbtools::throwGenericSQLException(sMessage ,*this);
     return Sequence< DriverPropertyInfo >();
 }
diff --git a/connectivity/source/drivers/dbase/DIndex.cxx b/connectivity/source/drivers/dbase/DIndex.cxx
index 1e70a5cb84a9..bd2ce0d8a351 100644
--- a/connectivity/source/drivers/dbase/DIndex.cxx
+++ b/connectivity/source/drivers/dbase/DIndex.cxx
@@ -68,8 +68,8 @@ ODbaseIndex::ODbaseIndex(ODbaseTable* _pTable) : OIndex(sal_True/*_pTable->getCo
 // -------------------------------------------------------------------------
 ODbaseIndex::ODbaseIndex(   ODbaseTable* _pTable,
                             const NDXHeader& _rHeader,
-                            const ::rtl::OUString& _rName)
-    :OIndex(_rName,::rtl::OUString(),_rHeader.db_unique,sal_False,sal_False,sal_True)
+                            const OUString& _rName)
+    :OIndex(_rName,OUString(),_rHeader.db_unique,sal_False,sal_False,sal_True)
     ,m_pFileStream(NULL)
     ,m_aHeader(_rHeader)
     ,m_nCurNode(NODE_NOTFOUND)
@@ -92,7 +92,7 @@ void ODbaseIndex::refreshColumns()
     {
         OSL_ENSURE(m_pFileStream,"FileStream is not opened!");
         OSL_ENSURE(m_aHeader.db_name[0] != '\0',"Invalid name for the column!");
-        aVector.push_back(::rtl::OUString::createFromAscii(m_aHeader.db_name));
+        aVector.push_back(OUString::createFromAscii(m_aHeader.db_name));
     }
 
     if(m_pColumns)
@@ -141,7 +141,7 @@ sal_Bool ODbaseIndex::openIndexFile()
 {
     if(!m_pFileStream)
     {
-        ::rtl::OUString sFile = getCompletePath();
+        OUString sFile = getCompletePath();
         if(UCBContentHelper::Exists(sFile))
         {
             m_pFileStream = OFileTable::createStream_simpleError(sFile, STREAM_READWRITE | STREAM_NOCREATE | STREAM_SHARE_DENYWRITE);
@@ -156,7 +156,7 @@ sal_Bool ODbaseIndex::openIndexFile()
         }
         if(!m_pFileStream)
         {
-            const ::rtl::OUString sError( m_pTable->getConnection()->getResources().getResourceStringWithSubstitution(
+            const OUString sError( m_pTable->getConnection()->getResources().getResourceStringWithSubstitution(
                 STR_COULD_NOT_LOAD_FILE,
                 "$filename$", sFile
              ) );
@@ -363,12 +363,12 @@ SvStream& connectivity::dbase::operator << (SvStream &rStream, ODbaseIndex& rInd
     return rStream;
 }
 // -------------------------------------------------------------------------
-::rtl::OUString ODbaseIndex::getCompletePath()
+OUString ODbaseIndex::getCompletePath()
 {
-    ::rtl::OUString sDir = m_pTable->getConnection()->getURL();
+    OUString sDir = m_pTable->getConnection()->getURL();
     sDir += OMetaConnection::getPropMap().getNameByIndex(PROPERTY_ID_DELIMITER);
     sDir += m_Name;
-    sDir += ::rtl::OUString(".ndx");
+    sDir += OUString(".ndx");
     return sDir;
 }
 //------------------------------------------------------------------
@@ -376,44 +376,44 @@ void ODbaseIndex::createINFEntry()
 {
     // synchronize inf-file
     String sEntry = m_Name;
-    sEntry += rtl::OUString(".ndx");
+    sEntry += OUString(".ndx");
 
-    ::rtl::OUString sCfgFile(m_pTable->getConnection()->getURL());
+    OUString sCfgFile(m_pTable->getConnection()->getURL());
     sCfgFile += OMetaConnection::getPropMap().getNameByIndex(PROPERTY_ID_DELIMITER);
     sCfgFile += m_pTable->getName();
-    sCfgFile += ::rtl::OUString(".inf");
+    sCfgFile += OUString(".inf");
 
-    rtl::OUString sPhysicalPath;
+    OUString sPhysicalPath;
     LocalFileHelper::ConvertURLToPhysicalName(sCfgFile,sPhysicalPath);
 
     Config aInfFile(sPhysicalPath);
     aInfFile.SetGroup(dBASE_III_GROUP);
 
     sal_uInt16 nSuffix = aInfFile.GetKeyCount();
-    rtl::OString aNewEntry,aKeyName;
+    OString aNewEntry,aKeyName;
     sal_Bool bCase = isCaseSensitive();
     while (aNewEntry.isEmpty())
     {
-        aNewEntry = rtl::OString(RTL_CONSTASCII_STRINGPARAM("NDX"));
+        aNewEntry = OString(RTL_CONSTASCII_STRINGPARAM("NDX"));
         aNewEntry += OString::number(++nSuffix);
         for (sal_uInt16 i = 0; i < aInfFile.GetKeyCount(); i++)
         {
             aKeyName = aInfFile.GetKeyName(i);
             if (bCase ? aKeyName.equals(aNewEntry) : aKeyName.equalsIgnoreAsciiCase(aNewEntry))
             {
-                aNewEntry = rtl::OString();
+                aNewEntry = OString();
                 break;
             }
         }
     }
-    aInfFile.WriteKey(aNewEntry, rtl::OUStringToOString(sEntry, m_pTable->getConnection()->getTextEncoding()));
+    aInfFile.WriteKey(aNewEntry, OUStringToOString(sEntry, m_pTable->getConnection()->getTextEncoding()));
 }
 // -------------------------------------------------------------------------
 sal_Bool ODbaseIndex::DropImpl()
 {
     closeImpl();
 
-    ::rtl::OUString sPath = getCompletePath();
+    OUString sPath = getCompletePath();
     if(UCBContentHelper::Exists(sPath))
     {
         if(!UCBContentHelper::Kill(sPath))
@@ -421,21 +421,21 @@ sal_Bool ODbaseIndex::DropImpl()
     }
 
     // synchronize inf-file
-    ::rtl::OUString sCfgFile(m_pTable->getConnection()->getURL());
+    OUString sCfgFile(m_pTable->getConnection()->getURL());
     sCfgFile += OMetaConnection::getPropMap().getNameByIndex(PROPERTY_ID_DELIMITER);
     sCfgFile += m_pTable->getName();
-    sCfgFile += ::rtl::OUString(".inf");
+    sCfgFile += OUString(".inf");
 
-    rtl::OUString sPhysicalPath;
+    OUString sPhysicalPath;
     OSL_VERIFY_RES( LocalFileHelper::ConvertURLToPhysicalName(sCfgFile, sPhysicalPath),
         "Can not convert Config Filename into Physical Name!");
 
     Config aInfFile(sPhysicalPath);
     aInfFile.SetGroup(dBASE_III_GROUP);
     sal_uInt16 nKeyCnt = aInfFile.GetKeyCount();
-    rtl::OString aKeyName;
+    OString aKeyName;
     String sEntry = m_Name;
-    sEntry += rtl::OUString(".ndx");
+    sEntry += OUString(".ndx");
 
     // delete entries from the inf file
     for (sal_uInt16 nKey = 0; nKey < nKeyCnt; nKey++)
@@ -444,7 +444,7 @@ sal_Bool ODbaseIndex::DropImpl()
         aKeyName = aInfFile.GetKeyName( nKey );
         if (aKeyName.copy(0,3).equalsL(RTL_CONSTASCII_STRINGPARAM("NDX")))
         {
-            if(sEntry == String(rtl::OStringToOUString(aInfFile.ReadKey(aKeyName),m_pTable->getConnection()->getTextEncoding())))
+            if(sEntry == String(OStringToOUString(aInfFile.ReadKey(aKeyName),m_pTable->getConnection()->getTextEncoding())))
             {
                 aInfFile.DeleteKey(aKeyName);
                 break;
@@ -454,7 +454,7 @@ sal_Bool ODbaseIndex::DropImpl()
     return sal_True;
 }
 // -------------------------------------------------------------------------
-void ODbaseIndex::impl_killFileAndthrowError_throw(sal_uInt16 _nErrorId,const ::rtl::OUString& _sFile)
+void ODbaseIndex::impl_killFileAndthrowError_throw(sal_uInt16 _nErrorId,const OUString& _sFile)
 {
     closeImpl();
     if(UCBContentHelper::Exists(_sFile))
@@ -465,10 +465,10 @@ void ODbaseIndex::impl_killFileAndthrowError_throw(sal_uInt16 _nErrorId,const ::
 sal_Bool ODbaseIndex::CreateImpl()
 {
     // Create the Index
-    const ::rtl::OUString sFile = getCompletePath();
+    const OUString sFile = getCompletePath();
     if(UCBContentHelper::Exists(sFile))
     {
-        const ::rtl::OUString sError( m_pTable->getConnection()->getResources().getResourceStringWithSubstitution(
+        const OUString sError( m_pTable->getConnection()->getResources().getResourceStringWithSubstitution(
             STR_COULD_NOT_CREATE_INDEX_NAME,
             "$filename$", sFile
          ) );
@@ -488,7 +488,7 @@ sal_Bool ODbaseIndex::CreateImpl()
     m_pFileStream = OFileTable::createStream_simpleError(sFile,STREAM_READWRITE | STREAM_SHARE_DENYWRITE | STREAM_TRUNC);
     if (!m_pFileStream)
     {
-        const ::rtl::OUString sError( m_pTable->getConnection()->getResources().getResourceStringWithSubstitution(
+        const OUString sError( m_pTable->getConnection()->getResources().getResourceStringWithSubstitution(
             STR_COULD_NOT_LOAD_FILE,
             "$filename$", sFile
          ) );
@@ -552,7 +552,7 @@ sal_Bool ODbaseIndex::CreateImpl()
 
     m_pFileStream->SetStreamSize(DINDEX_PAGE_SIZE);
 
-    rtl::OString aCol(rtl::OUStringToOString(aName, m_pTable->getConnection()->getTextEncoding()));
+    OString aCol(OUStringToOString(aName, m_pTable->getConnection()->getTextEncoding()));
     strncpy(m_aHeader.db_name, aCol.getStr(), std::min<size_t>(sizeof(m_aHeader.db_name), aCol.getLength()));
     m_aHeader.db_unique  = m_IsUnique ? 1: 0;
     m_aHeader.db_keyrec  = m_aHeader.db_keylen + 8;
diff --git a/connectivity/source/drivers/dbase/DIndexColumns.cxx b/connectivity/source/drivers/dbase/DIndexColumns.cxx
index 73aa3d525cda..9a2da6e39659 100644
--- a/connectivity/source/drivers/dbase/DIndexColumns.cxx
+++ b/connectivity/source/drivers/dbase/DIndexColumns.cxx
@@ -35,7 +35,7 @@ using namespace ::com::sun::star::sdbc;
 using namespace ::com::sun::star::container;
 
 
-sdbcx::ObjectType ODbaseIndexColumns::createObject(const ::rtl::OUString& _rName)
+sdbcx::ObjectType ODbaseIndexColumns::createObject(const OUString& _rName)
 {
     const ODbaseTable* pTable = m_pIndex->getTable();
 
@@ -51,7 +51,7 @@ sdbcx::ObjectType ODbaseIndexColumns::createObject(const ::rtl::OUString& _rName
 
     sdbcx::ObjectType xRet = new sdbcx::OIndexColumn(sal_True,_rName
                                                     ,getString(xCol->getPropertyValue(OMetaConnection::getPropMap().getNameByIndex(PROPERTY_ID_TYPENAME)))
-                                                    ,::rtl::OUString()
+                                                    ,OUString()
                                                     ,getINT32(xCol->getPropertyValue(OMetaConnection::getPropMap().getNameByIndex(PROPERTY_ID_ISNULLABLE)))
                                                     ,getINT32(xCol->getPropertyValue(OMetaConnection::getPropMap().getNameByIndex(PROPERTY_ID_PRECISION)))
                                                     ,getINT32(xCol->getPropertyValue(OMetaConnection::getPropMap().getNameByIndex(PROPERTY_ID_SCALE)))
@@ -78,7 +78,7 @@ Reference< XPropertySet > ODbaseIndexColumns::createDescriptor()
     return new sdbcx::OIndexColumn(m_pIndex->getTable()->getConnection()->getMetaData()->supportsMixedCaseQuotedIdentifiers());
 }
 // -------------------------------------------------------------------------
-sdbcx::ObjectType ODbaseIndexColumns::appendObject( const ::rtl::OUString& /*_rForName*/, const Reference< XPropertySet >& descriptor )
+sdbcx::ObjectType ODbaseIndexColumns::appendObject( const OUString& /*_rForName*/, const Reference< XPropertySet >& descriptor )
 {
     return cloneDescriptor( descriptor );
 }
diff --git a/connectivity/source/drivers/dbase/DIndexes.cxx b/connectivity/source/drivers/dbase/DIndexes.cxx
index 154e67b2db47..f96224e43c86 100644
--- a/connectivity/source/drivers/dbase/DIndexes.cxx
+++ b/connectivity/source/drivers/dbase/DIndexes.cxx
@@ -37,15 +37,15 @@ using namespace ::com::sun::star::sdbc;
 using namespace ::com::sun::star::container;
 using namespace ::com::sun::star::lang;
 
-sdbcx::ObjectType ODbaseIndexes::createObject(const ::rtl::OUString& _rName)
+sdbcx::ObjectType ODbaseIndexes::createObject(const OUString& _rName)
 {
-    ::rtl::OUString sFile = m_pTable->getConnection()->getURL();
+    OUString sFile = m_pTable->getConnection()->getURL();
     sFile += OMetaConnection::getPropMap().getNameByIndex(PROPERTY_ID_DELIMITER);
     sFile += _rName;
-    sFile += ::rtl::OUString(".ndx");
+    sFile += OUString(".ndx");
     if ( !UCBContentHelper::Exists(sFile) )
     {
-        const ::rtl::OUString sError( m_pTable->getConnection()->getResources().getResourceStringWithSubstitution(
+        const OUString sError( m_pTable->getConnection()->getResources().getResourceStringWithSubstitution(
                 STR_COULD_NOT_LOAD_FILE,
                 "$filename$", sFile
             ) );
@@ -70,7 +70,7 @@ sdbcx::ObjectType ODbaseIndexes::createObject(const ::rtl::OUString& _rName)
     }
     else
     {
-        const ::rtl::OUString sError( m_pTable->getConnection()->getResources().getResourceStringWithSubstitution(
+        const OUString sError( m_pTable->getConnection()->getResources().getResourceStringWithSubstitution(
                 STR_COULD_NOT_LOAD_FILE,
                 "$filename$", sFile
              ) );
@@ -91,7 +91,7 @@ Reference< XPropertySet > ODbaseIndexes::createDescriptor()
 }
 // -------------------------------------------------------------------------
 // XAppend
-sdbcx::ObjectType ODbaseIndexes::appendObject( const ::rtl::OUString& _rForName, const Reference< XPropertySet >& descriptor )
+sdbcx::ObjectType ODbaseIndexes::appendObject( const OUString& _rForName, const Reference< XPropertySet >& descriptor )
 {
     Reference<XUnoTunnel> xTunnel(descriptor,UNO_QUERY);
     if(xTunnel.is())
@@ -105,7 +105,7 @@ sdbcx::ObjectType ODbaseIndexes::appendObject( const ::rtl::OUString& _rForName,
 }
 // -------------------------------------------------------------------------
 // XDrop
-void ODbaseIndexes::dropObject(sal_Int32 _nPos,const ::rtl::OUString /*_sElementName*/)
+void ODbaseIndexes::dropObject(sal_Int32 _nPos,const OUString /*_sElementName*/)
 {
     Reference< XUnoTunnel> xTunnel(getObject(_nPos),UNO_QUERY);
     if ( xTunnel.is() )
diff --git a/connectivity/source/drivers/dbase/DResultSet.cxx b/connectivity/source/drivers/dbase/DResultSet.cxx
index df8bc000008e..b5e0d13563f5 100644
--- a/connectivity/source/drivers/dbase/DResultSet.cxx
+++ b/connectivity/source/drivers/dbase/DResultSet.cxx
@@ -46,24 +46,24 @@ ODbaseResultSet::ODbaseResultSet( OStatement_Base* pStmt,connectivity::OSQLParse
     registerProperty(OMetaConnection::getPropMap().getNameByIndex(PROPERTY_ID_ISBOOKMARKABLE),         PROPERTY_ID_ISBOOKMARKABLE,       PropertyAttribute::READONLY,&m_bBookmarkable,                ::getBooleanCppuType());
 }
 // -------------------------------------------------------------------------
-::rtl::OUString SAL_CALL ODbaseResultSet::getImplementationName(  ) throw ( RuntimeException)
+OUString SAL_CALL ODbaseResultSet::getImplementationName(  ) throw ( RuntimeException)
 {
-    return ::rtl::OUString("com.sun.star.sdbcx.dbase.ResultSet");
+    return OUString("com.sun.star.sdbcx.dbase.ResultSet");
 }
 // -------------------------------------------------------------------------
-Sequence< ::rtl::OUString > SAL_CALL ODbaseResultSet::getSupportedServiceNames(  ) throw( RuntimeException)
+Sequence< OUString > SAL_CALL ODbaseResultSet::getSupportedServiceNames(  ) throw( RuntimeException)
 {
-     Sequence< ::rtl::OUString > aSupported(2);
-    aSupported[0] = ::rtl::OUString("com.sun.star.sdbc.ResultSet");
-    aSupported[1] = ::rtl::OUString("com.sun.star.sdbcx.ResultSet");
+     Sequence< OUString > aSupported(2);
+    aSupported[0] = OUString("com.sun.star.sdbc.ResultSet");
+    aSupported[1] = OUString("com.sun.star.sdbcx.ResultSet");
     return aSupported;
 }
 // -------------------------------------------------------------------------
-sal_Bool SAL_CALL ODbaseResultSet::supportsService( const ::rtl::OUString& _rServiceName ) throw( RuntimeException)
+sal_Bool SAL_CALL ODbaseResultSet::supportsService( const OUString& _rServiceName ) throw( RuntimeException)
 {
-    Sequence< ::rtl::OUString > aSupported(getSupportedServiceNames());
-    const ::rtl::OUString* pSupported = aSupported.getConstArray();
-    const ::rtl::OUString* pEnd = pSupported + aSupported.getLength();
+    Sequence< OUString > aSupported(getSupportedServiceNames());
+    const OUString* pSupported = aSupported.getConstArray();
+    const OUString* pEnd = pSupported + aSupported.getLength();
     for (;pSupported != pEnd && !pSupported->equals(_rServiceName); ++pSupported)
         ;
 
@@ -123,7 +123,7 @@ sal_Int32 SAL_CALL ODbaseResultSet::compareBookmarks( const Any& lhs, const Any&
     if ( !( lhs  >>= nFirst ) || !( rhs >>= nSecond ) )
     {
         ::connectivity::SharedResources aResources;
-        const ::rtl::OUString sMessage = aResources.getResourceString(STR_INVALID_BOOKMARK);
+        const OUString sMessage = aResources.getResourceString(STR_INVALID_BOOKMARK);
         ::dbtools::throwGenericSQLException(sMessage ,*this);
     } // if ( !( lhs  >>= nFirst ) || !( rhs >>= nSecond ) )
 
diff --git a/connectivity/source/drivers/dbase/DTable.cxx b/connectivity/source/drivers/dbase/DTable.cxx
index 386d802a1764..61f3c8d01e71 100644
--- a/connectivity/source/drivers/dbase/DTable.cxx
+++ b/connectivity/source/drivers/dbase/DTable.cxx
@@ -320,7 +320,7 @@ void ODbaseTable::fillColumns()
 
     String aStrFieldName;
     aStrFieldName.AssignAscii("Column");
-    ::rtl::OUString aTypeName;
+    OUString aTypeName;
     const sal_Bool bCase = getConnection()->getMetaData()->supportsMixedCaseQuotedIdentifiers();
     const bool bFoxPro = m_aHeader.db_typ == VisualFoxPro || m_aHeader.db_typ == VisualFoxProAuto || m_aHeader.db_typ == FoxProMemo;
 
@@ -343,7 +343,7 @@ void ODbaseTable::fillColumns()
         char cType[2];
         cType[0] = aDBFColumn.db_typ;
         cType[1] = 0;
-        aTypeName = ::rtl::OUString::createFromAscii(cType);
+        aTypeName = OUString::createFromAscii(cType);
 OSL_TRACE("column type: %c",aDBFColumn.db_typ);
 
         switch (aDBFColumn.db_typ)
@@ -427,8 +427,8 @@ OSL_TRACE("column type: %c",aDBFColumn.db_typ);
 
         Reference< XPropertySet> xCol = new sdbcx::OColumn(aColumnName,
                                                     aTypeName,
-                                                    ::rtl::OUString(),
-                                                    ::rtl::OUString(),
+                                                    OUString(),
+                                                    OUString(),
                                                     ColumnValue::NULLABLE,
                                                     nPrecision,
                                                     aDBFColumn.db_dez,
@@ -458,11 +458,11 @@ ODbaseTable::ODbaseTable(sdbcx::OCollection* _pTables,ODbaseConnection* _pConnec
 }
 // -------------------------------------------------------------------------
 ODbaseTable::ODbaseTable(sdbcx::OCollection* _pTables,ODbaseConnection* _pConnection,
-                    const ::rtl::OUString& _Name,
-                    const ::rtl::OUString& _Type,
-                    const ::rtl::OUString& _Description ,
-                    const ::rtl::OUString& _SchemaName,
-                    const ::rtl::OUString& _CatalogName
+                    const OUString& _Name,
+                    const OUString& _Type,
+                    const OUString& _Description ,
+                    const OUString& _SchemaName,
+                    const OUString& _CatalogName
                 ) : ODbaseTable_BASE(_pTables,_pConnection,_Name,
                                   _Type,
                                   _Description,
@@ -609,18 +609,18 @@ sal_Bool ODbaseTable::ReadMemoHeader()
     return sal_True;
 }
 // -------------------------------------------------------------------------
-String ODbaseTable::getEntry(OConnection* _pConnection,const ::rtl::OUString& _sName )
+String ODbaseTable::getEntry(OConnection* _pConnection,const OUString& _sName )
 {
     RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "dbase", "Ocke.Janssen@sun.com", "ODbaseTable::getEntry" );
-    ::rtl::OUString sURL;
+    OUString sURL;
     try
     {
         Reference< XResultSet > xDir = _pConnection->getDir()->getStaticResultSet();
         Reference< XRow> xRow(xDir,UNO_QUERY);
-        ::rtl::OUString sName;
-        ::rtl::OUString sExt;
+        OUString sName;
+        OUString sExt;
         INetURLObject aURL;
-        static const ::rtl::OUString s_sSeparator("/");
+        static const OUString s_sSeparator("/");
         xDir->beforeFirst();
         while(xDir->next())
         {
@@ -635,7 +635,7 @@ String ODbaseTable::getEntry(OConnection* _pConnection,const ::rtl::OUString& _s
             // name and extension have to coincide
             if ( _pConnection->matchesExtension( sExt ) )
             {
-                sName = sName.replaceAt(sName.getLength()-(sExt.getLength()+1),sExt.getLength()+1,::rtl::OUString());
+                sName = sName.replaceAt(sName.getLength()-(sExt.getLength()+1),sExt.getLength()+1,OUString());
                 if ( sName == _sName )
                 {
                     Reference< XContentAccess > xContentAccess( xDir, UNO_QUERY );
@@ -683,7 +683,7 @@ void ODbaseTable::refreshIndexes()
         Config aInfFile(aURL.getFSysPath(INetURLObject::FSYS_DETECT));
         aInfFile.SetGroup(dBASE_III_GROUP);
         sal_uInt16 nKeyCnt = aInfFile.GetKeyCount();
-        rtl::OString aKeyName;
+        OString aKeyName;
 
         for (sal_uInt16 nKey = 0; nKey < nKeyCnt; nKey++)
         {
@@ -692,8 +692,8 @@ void ODbaseTable::refreshIndexes()
             //...if yes, add the index list of the table
             if (aKeyName.copy(0,3).equalsL(RTL_CONSTASCII_STRINGPARAM("NDX")))
             {
-                rtl::OString aIndexName = aInfFile.ReadKey(aKeyName);
-                aURL.setName(rtl::OStringToOUString(aIndexName, m_eEncoding));
+                OString aIndexName = aInfFile.ReadKey(aKeyName);
+                aURL.setName(OStringToOUString(aIndexName, m_eEncoding));
                 try
                 {
                     Content aCnt(aURL.GetMainURL(INetURLObject::NO_DECODE),Reference<XCommandEnvironment>(), comphelper::getProcessComponentContext());
@@ -873,7 +873,7 @@ sal_Bool ODbaseTable::fetchRow(OValueRefRow& _rRow,const OSQLColumns & _rCols, s
             else
             {
                 // Commit the string.  Use intern() to ref-count it.
-                *(_rRow->get())[i] = ::rtl::OUString::intern(pData, static_cast<sal_Int32>(nLastPos+1), m_eEncoding);
+                *(_rRow->get())[i] = OUString::intern(pData, static_cast<sal_Int32>(nLastPos+1), m_eEncoding);
             }
         } // if (nType == DataType::CHAR || nType == DataType::VARCHAR)
         else if ( DataType::TIMESTAMP == nType )
@@ -946,7 +946,7 @@ sal_Bool ODbaseTable::fetchRow(OValueRefRow& _rRow,const OSQLColumns & _rCols, s
                 continue;
             }
 
-            ::rtl::OUString aStr = ::rtl::OUString::intern(pData+nPos1, nPos2-nPos1+1, m_eEncoding);
+            OUString aStr = OUString::intern(pData+nPos1, nPos2-nPos1+1, m_eEncoding);
 
             switch (nType)
             {
@@ -1026,9 +1026,9 @@ sal_Bool ODbaseTable::CreateImpl()
     RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "dbase", "Ocke.Janssen@sun.com", "ODbaseTable::CreateImpl" );
     OSL_ENSURE(!m_pFileStream, "SequenceError");
 
-    if ( m_pConnection->isCheckEnabled() && ::dbtools::convertName2SQLName(m_Name,::rtl::OUString()) != m_Name )
+    if ( m_pConnection->isCheckEnabled() && ::dbtools::convertName2SQLName(m_Name,OUString()) != m_Name )
     {
-        const ::rtl::OUString sError( getConnection()->getResources().getResourceStringWithSubstitution(
+        const OUString sError( getConnection()->getResources().getResourceStringWithSubstitution(
                 STR_SQL_NAME_ERROR,
                 "$name$", m_Name
              ) );
@@ -1040,7 +1040,7 @@ sal_Bool ODbaseTable::CreateImpl()
     String aName = getEntry(m_pConnection,m_Name);
     if(!aName.Len())
     {
-        ::rtl::OUString aIdent = m_pConnection->getContent()->getIdentifier()->getContentIdentifier();
+        OUString aIdent = m_pConnection->getContent()->getIdentifier()->getContentIdentifier();
         if ( aIdent.lastIndexOf('/') != (aIdent.getLength()-1) )
             aIdent += "/";
         aIdent += m_Name;
@@ -1114,7 +1114,7 @@ sal_Bool ODbaseTable::CreateImpl()
             catch(const Exception&)
             {
 
-                const ::rtl::OUString sError( getConnection()->getResources().getResourceStringWithSubstitution(
+                const OUString sError( getConnection()->getResources().getResourceStringWithSubstitution(
                         STR_COULD_NOT_DELETE_FILE,
                         "$name$", aName
                      ) );
@@ -1136,7 +1136,7 @@ sal_Bool ODbaseTable::CreateImpl()
     return sal_True;
 }
 // -----------------------------------------------------------------------------
-void ODbaseTable::throwInvalidColumnType(const sal_uInt16 _nErrorId,const ::rtl::OUString& _sColumnName)
+void ODbaseTable::throwInvalidColumnType(const sal_uInt16 _nErrorId,const OUString& _sColumnName)
 {
     RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "dbase", "Ocke.Janssen@sun.com", "ODbaseTable::throwInvalidColumnType" );
     try
@@ -1148,7 +1148,7 @@ void ODbaseTable::throwInvalidColumnType(const sal_uInt16 _nErrorId,const ::rtl:
     {
     }
 
-    const ::rtl::OUString sError( getConnection()->getResources().getResourceStringWithSubstitution(
+    const OUString sError( getConnection()->getResources().getResourceStringWithSubstitution(
             _nErrorId,
             "$columnname$", _sColumnName
          ) );
@@ -1170,7 +1170,7 @@ sal_Bool ODbaseTable::CreateFile(const INetURLObject& aFile, sal_Bool& bCreateMe
     sal_uInt8 nDbaseType = dBaseIII;
     Reference<XIndexAccess> xColumns(getColumns(),UNO_QUERY);
     Reference<XPropertySet> xCol;
-    const ::rtl::OUString sPropType = OMetaConnection::getPropMap().getNameByIndex(PROPERTY_ID_TYPE);
+    const OUString sPropType = OMetaConnection::getPropMap().getNameByIndex(PROPERTY_ID_TYPE);
 
     try
     {
@@ -1223,10 +1223,10 @@ sal_Bool ODbaseTable::CreateFile(const INetURLObject& aFile, sal_Bool& bCreateMe
 
     sal_uInt16 nRecLength = 1;                                              // Length 1 for deleted flag
     sal_Int32  nMaxFieldLength = m_pConnection->getMetaData()->getMaxColumnNameLength();
-    ::rtl::OUString aName;
-    const ::rtl::OUString sPropName = OMetaConnection::getPropMap().getNameByIndex(PROPERTY_ID_NAME);
-    const ::rtl::OUString sPropPrec = OMetaConnection::getPropMap().getNameByIndex(PROPERTY_ID_PRECISION);
-    const ::rtl::OUString sPropScale = OMetaConnection::getPropMap().getNameByIndex(PROPERTY_ID_SCALE);
+    OUString aName;
+    const OUString sPropName = OMetaConnection::getPropMap().getNameByIndex(PROPERTY_ID_NAME);
+    const OUString sPropPrec = OMetaConnection::getPropMap().getNameByIndex(PROPERTY_ID_PRECISION);
+    const OUString sPropScale = OMetaConnection::getPropMap().getNameByIndex(PROPERTY_ID_SCALE);
 
     try
     {
@@ -1240,7 +1240,7 @@ sal_Bool ODbaseTable::CreateFile(const INetURLObject& aFile, sal_Bool& bCreateMe
 
             xCol->getPropertyValue(sPropName) >>= aName;
 
-            ::rtl::OString aCol;
+            OString aCol;
             if ( DBTypeConversion::convertUnicodeString( aName, aCol, m_eEncoding ) > nMaxFieldLength)
             {
                 throwInvalidColumnType( STR_INVALID_COLUMN_NAME_LENGTH, aName );
@@ -1425,7 +1425,7 @@ sal_Bool ODbaseTable::CreateMemoFile(const INetURLObject& aFile)
     return sal_True;
 }
 //------------------------------------------------------------------
-sal_Bool ODbaseTable::Drop_Static(const ::rtl::OUString& _sUrl,sal_Bool _bHasMemoFields,OCollection* _pIndexes )
+sal_Bool ODbaseTable::Drop_Static(const OUString& _sUrl,sal_Bool _bHasMemoFields,OCollection* _pIndexes )
 {
     RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "dbase", "Ocke.Janssen@sun.com", "ODbaseTable::Drop_Static" );
     INetURLObject aURL;
@@ -1595,7 +1595,7 @@ sal_Bool ODbaseTable::DeleteRow(const OSQLColumns& _rCols)
         return sal_False;
 
     Reference<XPropertySet> xCol;
-    ::rtl::OUString aColName;
+    OUString aColName;
     ::comphelper::UStringMixEqual aCase(isCaseSensitive());
     for (sal_uInt16 i = 0; i < m_pColumns->getCount(); i++)
     {
@@ -1644,7 +1644,7 @@ Reference<XPropertySet> ODbaseTable::isUniqueByColumnName(sal_Int32 _nColumnPos)
         Reference<XPropertySet> xCol;
         m_pColumns->getByIndex(_nColumnPos) >>= xCol;
         OSL_ENSURE(xCol.is(),"ODbaseTable::isUniqueByColumnName column is null!");
-        ::rtl::OUString sColName;
+        OUString sColName;
         xCol->getPropertyValue(OMetaConnection::getPropMap().getNameByIndex(PROPERTY_ID_NAME)) >>= sColName;
 
         Reference<XPropertySet> xIndex;
@@ -1663,7 +1663,7 @@ Reference<XPropertySet> ODbaseTable::isUniqueByColumnName(sal_Int32 _nColumnPos)
     return Reference<XPropertySet>();
 }
 //------------------------------------------------------------------
-static double toDouble(const rtl::OString& rString)
+static double toDouble(const OString& rString)
 {
     return ::rtl::math::stringToDouble( rString, '.', ',', NULL, NULL );
 }
@@ -1681,7 +1681,7 @@ sal_Bool ODbaseTable::UpdateBuffer(OValueRefVector& rRow, OValueRefRow pOrgRow,
     Reference<XPropertySet> xCol;
     Reference<XPropertySet> xIndex;
     sal_uInt16 i;
-    ::rtl::OUString aColName;
+    OUString aColName;
     const sal_Int32 nColumnCount = m_pColumns->getCount();
     ::std::vector< Reference<XPropertySet> > aIndexedCols(nColumnCount);
 
@@ -1735,7 +1735,7 @@ sal_Bool ODbaseTable::UpdateBuffer(OValueRefVector& rRow, OValueRefRow pOrgRow,
                         xCol->getPropertyValue(OMetaConnection::getPropMap().getNameByIndex(PROPERTY_ID_NAME)) >>= aColName;
                         xCol.clear();
                     } // if ( !aColName.getLength() )
-                    const ::rtl::OUString sError( getConnection()->getResources().getResourceStringWithSubstitution(
+                    const OUString sError( getConnection()->getResources().getResourceStringWithSubstitution(
                             STR_DUPLICATE_VALUE_IN_COLUMN
                             ,"$columnname$", aColName
                          ) );
@@ -1913,7 +1913,7 @@ sal_Bool ODbaseTable::UpdateBuffer(OValueRefVector& rRow, OValueRefRow pOrgRow,
 
                     // one, because const_cast GetFormatPrecision on SvNumberFormat is not constant,
                     // even though it really could and should be
-                    const rtl::OString aDefaultValue( ::rtl::math::doubleToString( n, rtl_math_StringFormat_F, nScale, '.', NULL, 0));
+                    const OString aDefaultValue( ::rtl::math::doubleToString( n, rtl_math_StringFormat_F, nScale, '.', NULL, 0));
                     const sal_Int32 nValueLen = aDefaultValue.getLength();
                     if ( nValueLen <= nLen )
                     {
@@ -1927,13 +1927,13 @@ sal_Bool ODbaseTable::UpdateBuffer(OValueRefVector& rRow, OValueRefRow pOrgRow,
                         m_pColumns->getByIndex(i) >>= xCol;
                         OSL_ENSURE(xCol.is(),"ODbaseTable::UpdateBuffer column is null!");
                         xCol->getPropertyValue(OMetaConnection::getPropMap().getNameByIndex(PROPERTY_ID_NAME)) >>= aColName;
-                        ::std::list< ::std::pair<const sal_Char* , ::rtl::OUString > > aStringToSubstitutes;
-                        aStringToSubstitutes.push_back(::std::pair<const sal_Char* , ::rtl::OUString >("$columnname$", aColName));
+                        ::std::list< ::std::pair<const sal_Char* , OUString > > aStringToSubstitutes;
+                        aStringToSubstitutes.push_back(::std::pair<const sal_Char* , OUString >("$columnname$", aColName));
                         aStringToSubstitutes.push_back(::std::pair<const sal_Char* , OUString >("$precision$", OUString::number(nLen)));
                         aStringToSubstitutes.push_back(::std::pair<const sal_Char* , OUString >("$scale$", OUString::number(nScale)));
-                        aStringToSubstitutes.push_back(::std::pair<const sal_Char* , ::rtl::OUString >("$value$", ::rtl::OStringToOUString(aDefaultValue,RTL_TEXTENCODING_UTF8)));
+                        aStringToSubstitutes.push_back(::std::pair<const sal_Char* , OUString >("$value$", OStringToOUString(aDefaultValue,RTL_TEXTENCODING_UTF8)));
 
-                        const ::rtl::OUString sError( getConnection()->getResources().getResourceStringWithSubstitution(
+                        const OUString sError( getConnection()->getResources().getResourceStringWithSubstitution(
                                 STR_INVALID_COLUMN_DECIMAL_VALUE
                                 ,aStringToSubstitutes
                              ) );
@@ -1956,9 +1956,9 @@ sal_Bool ODbaseTable::UpdateBuffer(OValueRefVector& rRow, OValueRefRow pOrgRow,
                     if (!m_pMemoStream || !WriteMemo(thisColVal, nBlockNo))
                         break;
 
-                    rtl::OString aBlock(OString::number(nBlockNo));
+                    OString aBlock(OString::number(nBlockNo));
                     //align aBlock at the right of a nLen sequence, fill to the left with '0'
-                    rtl::OStringBuffer aStr;
+                    OStringBuffer aStr;
                     comphelper::string::padToLength(aStr, nLen - aBlock.getLength(), '0');
                     aStr.append(aBlock);
 
@@ -1969,10 +1969,10 @@ sal_Bool ODbaseTable::UpdateBuffer(OValueRefVector& rRow, OValueRefRow pOrgRow,
                 {
                     memset(pData,' ',nLen); // Clear to NULL
 
-                    ::rtl::OUString sStringToWrite( thisColVal.getString() );
+                    OUString sStringToWrite( thisColVal.getString() );
 
                     // convert the string, using the connection's encoding
-                    ::rtl::OString sEncoded;
+                    OString sEncoded;
 
                     DBTypeConversion::convertUnicodeStringToLength( sStringToWrite, sEncoded, nLen, m_eEncoding );
                     memcpy( pData, sEncoded.getStr(), sEncoded.getLength() );
@@ -1992,7 +1992,7 @@ sal_Bool ODbaseTable::UpdateBuffer(OValueRefVector& rRow, OValueRefRow pOrgRow,
             if ( xCol.is() )
                 xCol->getPropertyValue(OMetaConnection::getPropMap().getNameByIndex(PROPERTY_ID_NAME)) >>= aColName;
 
-            const ::rtl::OUString sError( getConnection()->getResources().getResourceStringWithSubstitution(
+            const OUString sError( getConnection()->getResources().getResourceStringWithSubstitution(
                     STR_INVALID_COLUMN_VALUE,
                     "$columnname$", aColName
                  ) );
@@ -2011,7 +2011,7 @@ sal_Bool ODbaseTable::WriteMemo(const ORowSetValue& aVariable, sal_uIntPtr& rBlo
     RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "dbase", "Ocke.Janssen@sun.com", "ODbaseTable::WriteMemo" );
     // if the BlockNo 0 is given, the block will be appended at the end
     sal_uIntPtr nSize = 0;
-    ::rtl::OString aStr;
+    OString aStr;
     ::com::sun::star::uno::Sequence<sal_Int8> aValue;
     sal_uInt8 nHeader[4];
     const bool bBinary = aVariable.getTypeKind() == DataType::LONGVARBINARY && m_aMemoHeader.db_typ == MemoFoxPro;
@@ -2142,7 +2142,7 @@ sal_Bool ODbaseTable::WriteMemo(const ORowSetValue& aVariable, sal_uIntPtr& rBlo
 
 // -----------------------------------------------------------------------------
 // XAlterTable
-void SAL_CALL ODbaseTable::alterColumnByName( const ::rtl::OUString& colName, const Reference< XPropertySet >& descriptor ) throw(SQLException, NoSuchElementException, RuntimeException)
+void SAL_CALL ODbaseTable::alterColumnByName( const OUString& colName, const Reference< XPropertySet >& descriptor ) throw(SQLException, NoSuchElementException, RuntimeException)
 {
     RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "dbase", "Ocke.Janssen@sun.com", "ODbaseTable::alterColumnByName" );
     ::osl::MutexGuard aGuard(m_aMutex);
@@ -2196,7 +2196,7 @@ void ODbaseTable::alterColumn(sal_Int32 index,
 
         pNewTable = new ODbaseTable(m_pTables,static_cast<ODbaseConnection*>(m_pConnection));
         Reference<XPropertySet> xHoldTable = pNewTable;
-        pNewTable->setPropertyValue(OMetaConnection::getPropMap().getNameByIndex(PROPERTY_ID_NAME),makeAny(::rtl::OUString(sTempName)));
+        pNewTable->setPropertyValue(OMetaConnection::getPropMap().getNameByIndex(PROPERTY_ID_NAME),makeAny(OUString(sTempName)));
         Reference<XAppend> xAppend(pNewTable->getColumns(),UNO_QUERY);
         OSL_ENSURE(xAppend.is(),"ODbaseTable::alterColumn: No XAppend interface!");
 
@@ -2235,7 +2235,7 @@ void ODbaseTable::alterColumn(sal_Int32 index,
         // construct the new table
         if(!pNewTable->CreateImpl())
         {
-            const ::rtl::OUString sError( getConnection()->getResources().getResourceStringWithSubstitution(
+            const OUString sError( getConnection()->getResources().getResourceStringWithSubstitution(
                     STR_COLUMN_NOT_ALTERABLE,
                     "$columnname$", ::comphelper::getString(descriptor->getPropertyValue(OMetaConnection::getPropMap().getNameByIndex(PROPERTY_ID_NAME)))
                  ) );
@@ -2283,7 +2283,7 @@ Reference< XDatabaseMetaData> ODbaseTable::getMetaData() const
     return getConnection()->getMetaData();
 }
 // -------------------------------------------------------------------------
-void SAL_CALL ODbaseTable::rename( const ::rtl::OUString& newName ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::container::ElementExistException, ::com::sun::star::uno::RuntimeException)
+void SAL_CALL ODbaseTable::rename( const OUString& newName ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::container::ElementExistException, ::com::sun::star::uno::RuntimeException)
 {
     RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "dbase", "Ocke.Janssen@sun.com", "ODbaseTable::rename" );
     ::osl::MutexGuard aGuard(m_aMutex);
@@ -2302,15 +2302,15 @@ void SAL_CALL ODbaseTable::rename( const ::rtl::OUString& newName ) throw(::com:
 }
 namespace
 {
-    void renameFile(OConnection* _pConenction,const ::rtl::OUString& oldName,
-                    const ::rtl::OUString& newName,const String& _sExtension)
+    void renameFile(OConnection* _pConenction,const OUString& oldName,
+                    const OUString& newName,const String& _sExtension)
     {
         String aName = ODbaseTable::getEntry(_pConenction,oldName);
         if(!aName.Len())
         {
-            ::rtl::OUString aIdent = _pConenction->getContent()->getIdentifier()->getContentIdentifier();
+            OUString aIdent = _pConenction->getContent()->getIdentifier()->getContentIdentifier();
             if ( aIdent.lastIndexOf('/') != (aIdent.getLength()-1) )
-                aIdent += ::rtl::OUString("/");
+                aIdent += OUString("/");
             aIdent += oldName;
             aName = aIdent;
         }
@@ -2329,7 +2329,7 @@ namespace
             Sequence< PropertyValue > aProps( 1 );
             aProps[0].Name      = "Title";
             aProps[0].Handle    = -1; // n/a
-            aProps[0].Value     = makeAny( ::rtl::OUString(sNewName) );
+            aProps[0].Value     = makeAny( OUString(sNewName) );
             Sequence< Any > aValues;
             aContent.executeCommand( "setPropertyValues",makeAny(aProps) ) >>= aValues;
             if(aValues.getLength() && aValues[0].hasValue())
@@ -2342,7 +2342,7 @@ namespace
     }
 }
 // -------------------------------------------------------------------------
-void SAL_CALL ODbaseTable::renameImpl( const ::rtl::OUString& newName ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::container::ElementExistException, ::com::sun::star::uno::RuntimeException)
+void SAL_CALL ODbaseTable::renameImpl( const OUString& newName ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::container::ElementExistException, ::com::sun::star::uno::RuntimeException)
 {
     RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "dbase", "Ocke.Janssen@sun.com", "ODbaseTable::getEntry" );
     ::osl::MutexGuard aGuard(m_aMutex);
@@ -2353,7 +2353,7 @@ void SAL_CALL ODbaseTable::renameImpl( const ::rtl::OUString& newName ) throw(::
     renameFile(m_pConnection,m_Name,newName,m_pConnection->getExtension());
     if ( HasMemoFields() )
     {  // delete the memo fields
-        rtl::OUString sExt("dbt");
+        OUString sExt("dbt");
         renameFile(m_pConnection,m_Name,newName,sExt);
     }
 }
@@ -2365,7 +2365,7 @@ void ODbaseTable::addColumn(const Reference< XPropertySet >& _xNewColumn)
 
     ODbaseTable* pNewTable = new ODbaseTable(m_pTables,static_cast<ODbaseConnection*>(m_pConnection));
     Reference< XPropertySet > xHold = pNewTable;
-    pNewTable->setPropertyValue(OMetaConnection::getPropMap().getNameByIndex(PROPERTY_ID_NAME),makeAny(::rtl::OUString(sTempName)));
+    pNewTable->setPropertyValue(OMetaConnection::getPropMap().getNameByIndex(PROPERTY_ID_NAME),makeAny(OUString(sTempName)));
     {
         Reference<XAppend> xAppend(pNewTable->getColumns(),UNO_QUERY);
         sal_Bool bCase = getConnection()->getMetaData()->supportsMixedCaseQuotedIdentifiers();
@@ -2394,7 +2394,7 @@ void ODbaseTable::addColumn(const Reference< XPropertySet >& _xNewColumn)
     // construct the new table
     if(!pNewTable->CreateImpl())
     {
-        const ::rtl::OUString sError( getConnection()->getResources().getResourceStringWithSubstitution(
+        const OUString sError( getConnection()->getResources().getResourceStringWithSubstitution(
                 STR_COLUMN_NOT_ADDABLE,
                 "$columnname$", ::comphelper::getString(_xNewColumn->getPropertyValue(OMetaConnection::getPropMap().getNameByIndex(PROPERTY_ID_NAME)))
              ) );
@@ -2438,7 +2438,7 @@ void ODbaseTable::dropColumn(sal_Int32 _nPos)
 
     ODbaseTable* pNewTable = new ODbaseTable(m_pTables,static_cast<ODbaseConnection*>(m_pConnection));
     Reference< XPropertySet > xHold = pNewTable;
-    pNewTable->setPropertyValue(OMetaConnection::getPropMap().getNameByIndex(PROPERTY_ID_NAME),makeAny(::rtl::OUString(sTempName)));
+    pNewTable->setPropertyValue(OMetaConnection::getPropMap().getNameByIndex(PROPERTY_ID_NAME),makeAny(OUString(sTempName)));
     {
         Reference<XAppend> xAppend(pNewTable->getColumns(),UNO_QUERY);
         sal_Bool bCase = getConnection()->getMetaData()->supportsMixedCaseQuotedIdentifiers();
@@ -2467,7 +2467,7 @@ void ODbaseTable::dropColumn(sal_Int32 _nPos)
     if(!pNewTable->CreateImpl())
     {
         xHold = pNewTable = NULL;
-        const ::rtl::OUString sError( getConnection()->getResources().getResourceStringWithSubstitution(
+        const OUString sError( getConnection()->getResources().getResourceStringWithSubstitution(
                 STR_COLUMN_NOT_DROP,
                 "$position$", OUString::number(_nPos)
              ) );
@@ -2490,7 +2490,7 @@ void ODbaseTable::dropColumn(sal_Int32 _nPos)
 String ODbaseTable::createTempFile()
 {
     RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "dbase", "Ocke.Janssen@sun.com", "ODbaseTable::createTempFile" );
-    ::rtl::OUString aIdent = m_pConnection->getContent()->getIdentifier()->getContentIdentifier();
+    OUString aIdent = m_pConnection->getContent()->getIdentifier()->getContentIdentifier();
     if ( aIdent.lastIndexOf('/') != (aIdent.getLength()-1) )
         aIdent += "/";
     String sTempName(aIdent);
@@ -2576,7 +2576,7 @@ void ODbaseTable::throwInvalidDbaseFormat()
     FileClose();
     // no dbase file
 
-    const ::rtl::OUString sError( getConnection()->getResources().getResourceStringWithSubstitution(
+    const OUString sError( getConnection()->getResources().getResourceStringWithSubstitution(
                 STR_INVALID_DBASE_FILE,
                 "$filename$", getEntry(m_pConnection,m_Name)
              ) );
@@ -2685,7 +2685,7 @@ sal_Bool ODbaseTable::ReadMemo(sal_uIntPtr nBlockNo, ORowSetValue& aVariable)
         case MemodBaseIII: // dBase III-Memofield, ends with Ctrl-Z
         {
             const char cEOF = (char) DBF_EOL;
-            rtl::OStringBuffer aBStr;
+            OStringBuffer aBStr;
             static char aBuf[514];
             aBuf[512] = 0;          // avoid random value
             sal_Bool bReady = sal_False;
@@ -2704,7 +2704,7 @@ sal_Bool ODbaseTable::ReadMemo(sal_uIntPtr nBlockNo, ORowSetValue& aVariable)
 
             } while (!bReady && !m_pMemoStream->IsEof());
 
-            aVariable = rtl::OStringToOUString(aBStr.makeStringAndClear(),
+            aVariable = OStringToOUString(aBStr.makeStringAndClear(),
                 m_eEncoding);
 
         } break;
@@ -2733,11 +2733,11 @@ sal_Bool ODbaseTable::ReadMemo(sal_uIntPtr nBlockNo, ORowSetValue& aVariable)
             {
                 if ( bIsText )
                 {
-                    rtl::OStringBuffer aBuffer(read_uInt8s_ToOString(*m_pMemoStream, nLength));
+                    OStringBuffer aBuffer(read_uInt8s_ToOString(*m_pMemoStream, nLength));
                     //pad it out with ' ' to expected length on short read
                     sal_Int32 nRequested = sal::static_int_cast<sal_Int32>(nLength);
                     comphelper::string::padToLength(aBuffer, nRequested, ' ');
-                    aVariable = rtl::OStringToOUString(aBuffer.makeStringAndClear(), m_eEncoding);
+                    aVariable = OStringToOUString(aBuffer.makeStringAndClear(), m_eEncoding);
                 } // if ( bIsText )
                 else
                 {
diff --git a/connectivity/source/drivers/dbase/DTables.cxx b/connectivity/source/drivers/dbase/DTables.cxx
index 18c9f96f3a58..79cd308cd438 100644
--- a/connectivity/source/drivers/dbase/DTables.cxx
+++ b/connectivity/source/drivers/dbase/DTables.cxx
@@ -43,10 +43,10 @@ using namespace ::com::sun::star::sdbc;
 using namespace ::com::sun::star::lang;
 using namespace ::com::sun::star::container;
 
-sdbcx::ObjectType ODbaseTables::createObject(const ::rtl::OUString& _rName)
+sdbcx::ObjectType ODbaseTables::createObject(const OUString& _rName)
 {
     ODbaseTable* pRet = new ODbaseTable(this,(ODbaseConnection*)static_cast<OFileCatalog&>(m_rParent).getConnection(),
-                                        _rName,::rtl::OUString("TABLE"));
+                                        _rName,OUString("TABLE"));
 
     sdbcx::ObjectType xRet = pRet;
     pRet->construct();
@@ -64,7 +64,7 @@ Reference< XPropertySet > ODbaseTables::createDescriptor()
 }
 // -------------------------------------------------------------------------
 // XAppend
-sdbcx::ObjectType ODbaseTables::appendObject( const ::rtl::OUString& _rForName, const Reference< XPropertySet >& descriptor )
+sdbcx::ObjectType ODbaseTables::appendObject( const OUString& _rForName, const Reference< XPropertySet >& descriptor )
 {
     Reference<XUnoTunnel> xTunnel(descriptor,UNO_QUERY);
     if(xTunnel.is())
@@ -92,7 +92,7 @@ sdbcx::ObjectType ODbaseTables::appendObject( const ::rtl::OUString& _rForName,
 }
 // -------------------------------------------------------------------------
 // XDrop
-void ODbaseTables::dropObject(sal_Int32 _nPos,const ::rtl::OUString _sElementName)
+void ODbaseTables::dropObject(sal_Int32 _nPos,const OUString _sElementName)
 {
     Reference< XUnoTunnel> xTunnel;
     try
@@ -113,7 +113,7 @@ void ODbaseTables::dropObject(sal_Int32 _nPos,const ::rtl::OUString _sElementNam
     }
     else
     {
-        const ::rtl::OUString sError( static_cast<OFileCatalog&>(m_rParent).getConnection()->getResources().getResourceStringWithSubstitution(
+        const OUString sError( static_cast<OFileCatalog&>(m_rParent).getConnection()->getResources().getResourceStringWithSubstitution(
                     STR_TABLE_NOT_DROP,
                     "$tablename$", _sElementName
                  ) );
diff --git a/connectivity/source/drivers/dbase/Dservices.cxx b/connectivity/source/drivers/dbase/Dservices.cxx
index 7f861137d7d1..f38922058754 100644
--- a/connectivity/source/drivers/dbase/Dservices.cxx
+++ b/connectivity/source/drivers/dbase/Dservices.cxx
@@ -21,7 +21,6 @@
 #include <cppuhelper/factory.hxx>
 
 using namespace connectivity::dbase;
-using ::rtl::OUString;
 using ::com::sun::star::uno::Reference;
 using ::com::sun::star::uno::Sequence;
 using ::com::sun::star::lang::XSingleServiceFactory;
diff --git a/connectivity/source/drivers/dbase/dindexnode.cxx b/connectivity/source/drivers/dbase/dindexnode.cxx
index f2ec9c8e3aab..75f959e48dc2 100644
--- a/connectivity/source/drivers/dbase/dindexnode.cxx
+++ b/connectivity/source/drivers/dbase/dindexnode.cxx
@@ -45,7 +45,7 @@ ONDXKey::ONDXKey(const ORowSetValue& rVal, sal_Int32 eType, sal_uInt32 nRec)
 {
 }
 // -----------------------------------------------------------------------------
-ONDXKey::ONDXKey(const rtl::OUString& aStr, sal_uInt32 nRec)
+ONDXKey::ONDXKey(const OUString& aStr, sal_uInt32 nRec)
     : ONDXKey_BASE(::com::sun::star::sdbc::DataType::VARCHAR)
      ,nRecord(nRec)
 {
@@ -665,12 +665,12 @@ void ONDXNode::Read(SvStream &rStream, ODbaseIndex& rIndex)
     else
     {
         sal_uInt16 nLen = rIndex.getHeader().db_keylen;
-        rtl::OString aBuf = read_uInt8s_ToOString(rStream, nLen);
+        OString aBuf = read_uInt8s_ToOString(rStream, nLen);
         //get length minus trailing whitespace
         sal_Int32 nContentLen = aBuf.getLength();
         while (nContentLen && aBuf[nContentLen-1] == ' ')
             --nContentLen;
-        aKey = ONDXKey(::rtl::OUString(aBuf.getStr(), nContentLen, rIndex.m_pTable->getConnection()->getTextEncoding()) ,aKey.nRecord);
+        aKey = ONDXKey(OUString(aBuf.getStr(), nContentLen, rIndex.m_pTable->getConnection()->getTextEncoding()) ,aKey.nRecord);
     }
     rStream >> aChild;
 }
@@ -706,8 +706,8 @@ void ONDXNode::Write(SvStream &rStream, const ONDXPage& rPage) const
         memset(&pBuf[0], 0x20, nLen);
         if (!aKey.getValue().isNull())
         {
-            ::rtl::OUString sValue = aKey.getValue();
-            rtl::OString aText(rtl::OUStringToOString(sValue, rIndex.m_pTable->getConnection()->getTextEncoding()));
+            OUString sValue = aKey.getValue();
+            OString aText(OUStringToOString(sValue, rIndex.m_pTable->getConnection()->getTextEncoding()));
             strncpy(reinterpret_cast<char *>(&pBuf[0]), aText.getStr(),
                 std::min<size_t>(nLen, aText.getLength()));
         }
@@ -909,7 +909,7 @@ void ONDXPage::PrintPage()
         }
         else
         {
-            OSL_TRACE("SDB: [%d,%s,%d]",rKey.GetRecord(), rtl::OUStringToOString(rKey.getValue().getString(), rIndex.m_pTable->getConnection()->getTextEncoding()).getStr(),rNode.GetChild().GetPagePos());
+            OSL_TRACE("SDB: [%d,%s,%d]",rKey.GetRecord(), OUStringToOString(rKey.getValue().getString(), rIndex.m_pTable->getConnection()->getTextEncoding()).getStr(),rNode.GetChild().GetPagePos());
         }
     }
     OSL_TRACE("SDB: -----------------------------------------------");