mass removal of rtl:: prefixes for O(U)String*

Modules sal, salhelper, cppu, cppuhelper, codemaker (selectively) and odk
have kept them, in order not to break external API (the automatic using declaration
is LO-internal).

Change-Id: I588fc9e0c45b914f824f91c0376980621d730f09

19 files changed, 72 insertions, 88 deletions

diff --git a/mysqlc/source/mysqlc_connection.cxx b/mysqlc/source/mysqlc_connection.cxx
index b4ebe77d854a..bd9b1591209c 100644
--- a/mysqlc/source/mysqlc_connection.cxx
+++ b/mysqlc/source/mysqlc_connection.cxx
@@ -55,7 +55,6 @@ using namespace com::sun::star::lang;
 using namespace com::sun::star::beans;
 using namespace com::sun::star::sdbc;
 using ::osl::MutexGuard;
-using ::rtl::OUString;
 
 
 #define MYSQLC_URI_PREFIX "sdbc:mysqlc:"
@@ -210,9 +209,9 @@ void OConnection::construct(const OUString& url, const Sequence< PropertyValue >
     // Check if the server is 4.1 or above
     if (this->getMysqlVersion() < 40100) {
         throw SQLException(
-            ::rtl::OUString( "MariaDB LibreOffice Connector requires MySQL Server 4.1 or above"  ),
+            OUString( "MariaDB LibreOffice Connector requires MySQL Server 4.1 or above"  ),
             *this,
-            ::rtl::OUString(),
+            OUString(),
             0,
             Any());
     }
@@ -257,7 +256,7 @@ Reference< XPreparedStatement > SAL_CALL OConnection::prepareStatement(const OUS
     OSL_TRACE("OConnection::prepareStatement");
     MutexGuard aGuard(m_aMutex);
     checkDisposed(OConnection_BASE::rBHelper.bDisposed);
-    const ::rtl::OUString sSqlStatement = transFormPreparedStatement( _sSql );
+    const OUString sSqlStatement = transFormPreparedStatement( _sSql );
 
     Reference< XPreparedStatement > xStatement;
     try {
@@ -295,8 +294,8 @@ OUString SAL_CALL OConnection::nativeSQL(const OUString& _sSql)
     OSL_TRACE("OConnection::nativeSQL");
     MutexGuard aGuard(m_aMutex);
 
-    const ::rtl::OUString sSqlStatement = transFormPreparedStatement( _sSql );
-    ::rtl::OUString sNativeSQL;
+    const OUString sSqlStatement = transFormPreparedStatement( _sSql );
+    OUString sNativeSQL;
     try {
         sNativeSQL = mysqlc_sdbc_driver::convert(m_settings.cppConnection->nativeSQL(mysqlc_sdbc_driver::convert(sSqlStatement, getConnectionEncoding())),
                                                                                 getConnectionEncoding());
@@ -658,7 +657,7 @@ OUString OConnection::getMysqlVariable(const char *varname)
     checkDisposed(OConnection_BASE::rBHelper.bDisposed);
 
     OUString ret;
-    ::rtl::OUStringBuffer aStatement;
+    OUStringBuffer aStatement;
     aStatement.appendAscii( "SHOW SESSION VARIABLES LIKE '" );
     aStatement.appendAscii( varname );
     aStatement.append( sal_Unicode( '\'' ) );
@@ -717,16 +716,16 @@ sal_Int32 OConnection::getMysqlVersion()
 //  return 0;
 //}
 // -----------------------------------------------------------------------------
-::rtl::OUString OConnection::transFormPreparedStatement(const ::rtl::OUString& _sSQL)
+OUString OConnection::transFormPreparedStatement(const OUString& _sSQL)
 {
-    ::rtl::OUString sSqlStatement = _sSQL;
+    OUString sSqlStatement = _sSQL;
     if ( !m_xParameterSubstitution.is() ) {
         try {
             Sequence< Any > aArgs(1);
             Reference< XConnection> xCon = this;
-            aArgs[0] <<= NamedValue(::rtl::OUString("ActiveConnection"), makeAny(xCon));
+            aArgs[0] <<= NamedValue(OUString("ActiveConnection"), makeAny(xCon));
 
-            m_xParameterSubstitution.set(m_rDriver.getFactory()->createInstanceWithArguments(::rtl::OUString("org.openoffice.comp.helper.ParameterSubstitution"),aArgs),UNO_QUERY);
+            m_xParameterSubstitution.set(m_rDriver.getFactory()->createInstanceWithArguments(OUString("org.openoffice.comp.helper.ParameterSubstitution"),aArgs),UNO_QUERY);
         } catch(const Exception&) {}
     }
     if ( m_xParameterSubstitution.is() ) {
diff --git a/mysqlc/source/mysqlc_connection.hxx b/mysqlc/source/mysqlc_connection.hxx
index a03cbe33da32..e9619e9f94dc 100644
--- a/mysqlc/source/mysqlc_connection.hxx
+++ b/mysqlc/source/mysqlc_connection.hxx
@@ -58,7 +58,6 @@ namespace connectivity
 
     namespace mysqlc
     {
-        using ::rtl::OUString;
         using ::com::sun::star::sdbc::SQLWarning;
         using ::com::sun::star::sdbc::SQLException;
         using ::com::sun::star::uno::RuntimeException;
@@ -215,7 +214,7 @@ namespace connectivity
             // TODO: Not used
             //sal_Int32 sdbcColumnType(OUString typeName);
             inline const ConnectionSettings& getConnectionSettings() const { return m_settings; }
-            ::rtl::OUString transFormPreparedStatement(const ::rtl::OUString& _sSQL);
+            OUString transFormPreparedStatement(const OUString& _sSQL);
 
             // should we use the catalog on filebased databases
             inline sal_Bool             isCatalogUsed()     const { return m_bUseCatalog; }
diff --git a/mysqlc/source/mysqlc_databasemetadata.cxx b/mysqlc/source/mysqlc_databasemetadata.cxx
index 45b49f9e4ec0..b415238713c7 100644
--- a/mysqlc/source/mysqlc_databasemetadata.cxx
+++ b/mysqlc/source/mysqlc_databasemetadata.cxx
@@ -41,7 +41,6 @@ using namespace com::sun::star::uno;
 using namespace com::sun::star::lang;
 using namespace com::sun::star::beans;
 using namespace com::sun::star::sdbc;
-using ::rtl::OUString;
 using mysqlc_sdbc_driver::getStringFromAny;
 
 #include <cppconn/connection.h>
@@ -54,7 +53,6 @@ using mysqlc_sdbc_driver::getStringFromAny;
 
 static std::string wild("%");
 
-using ::rtl::OUStringToOString;
 
 // -----------------------------------------------------------------------------
 void lcl_setRows_throw(const Reference< XResultSet >& _xResultSet,sal_Int32 _nType,const std::vector< std::vector< Any > >& _rRows)
@@ -1497,7 +1495,7 @@ Reference< XResultSet > SAL_CALL ODatabaseMetaData::getTableTypes()
     const char * table_types[] = {"TABLE", "VIEW"};
     sal_Int32 requiredVersion[] = {0, 50000};
 
-    Reference< XResultSet > xResultSet(getOwnConnection().getDriver().getFactory()->createInstance(::rtl::OUString("org.openoffice.comp.helper.DatabaseMetaDataResultSet")),UNO_QUERY);
+    Reference< XResultSet > xResultSet(getOwnConnection().getDriver().getFactory()->createInstance(OUString("org.openoffice.comp.helper.DatabaseMetaDataResultSet")),UNO_QUERY);
     std::vector< std::vector< Any > > rRows;
     rtl_TextEncoding encoding = m_rConnection.getConnectionEncoding();
 
@@ -1519,7 +1517,7 @@ Reference< XResultSet > SAL_CALL ODatabaseMetaData::getTypeInfo()
     throw(SQLException, RuntimeException)
 {
     OSL_TRACE("ODatabaseMetaData::getTypeInfo");
-    Reference< XResultSet > xResultSet(getOwnConnection().getDriver().getFactory()->createInstance(::rtl::OUString("org.openoffice.comp.helper.DatabaseMetaDataResultSet")),UNO_QUERY);
+    Reference< XResultSet > xResultSet(getOwnConnection().getDriver().getFactory()->createInstance(OUString("org.openoffice.comp.helper.DatabaseMetaDataResultSet")),UNO_QUERY);
 
     std::vector< std::vector< Any > > rRows;
 
@@ -1563,7 +1561,7 @@ Reference< XResultSet > SAL_CALL ODatabaseMetaData::getCatalogs()
 {
     OSL_TRACE("ODatabaseMetaData::getCatalogs");
 
-    Reference< XResultSet > xResultSet(getOwnConnection().getDriver().getFactory()->createInstance(::rtl::OUString("org.openoffice.comp.helper.DatabaseMetaDataResultSet")),UNO_QUERY);
+    Reference< XResultSet > xResultSet(getOwnConnection().getDriver().getFactory()->createInstance(OUString("org.openoffice.comp.helper.DatabaseMetaDataResultSet")),UNO_QUERY);
     std::vector< std::vector< Any > > rRows;
 
     try {
@@ -1598,7 +1596,7 @@ Reference< XResultSet > SAL_CALL ODatabaseMetaData::getSchemas()
 {
     OSL_TRACE("ODatabaseMetaData::getSchemas");
 
-    Reference< XResultSet > xResultSet(getOwnConnection().getDriver().getFactory()->createInstance(::rtl::OUString("org.openoffice.comp.helper.DatabaseMetaDataResultSet")),UNO_QUERY);
+    Reference< XResultSet > xResultSet(getOwnConnection().getDriver().getFactory()->createInstance(OUString("org.openoffice.comp.helper.DatabaseMetaDataResultSet")),UNO_QUERY);
     std::vector< std::vector< Any > > rRows;
 
     try {
@@ -1643,7 +1641,7 @@ Reference< XResultSet > SAL_CALL ODatabaseMetaData::getColumnPrivileges(
     throw(SQLException, RuntimeException)
 {
     OSL_TRACE("ODatabaseMetaData::getColumnPrivileges");
-    Reference< XResultSet > xResultSet(getOwnConnection().getDriver().getFactory()->createInstance(::rtl::OUString("org.openoffice.comp.helper.DatabaseMetaDataResultSet")),UNO_QUERY);
+    Reference< XResultSet > xResultSet(getOwnConnection().getDriver().getFactory()->createInstance(OUString("org.openoffice.comp.helper.DatabaseMetaDataResultSet")),UNO_QUERY);
     std::vector< std::vector< Any > > rRows;
 
     std::string cat(catalog.hasValue()? OUStringToOString(getStringFromAny(catalog), m_rConnection.getConnectionEncoding()).getStr():""),
@@ -1686,7 +1684,7 @@ Reference< XResultSet > SAL_CALL ODatabaseMetaData::getColumns(
     throw(SQLException, RuntimeException)
 {
     OSL_TRACE("ODatabaseMetaData::getColumns");
-    Reference< XResultSet > xResultSet(getOwnConnection().getDriver().getFactory()->createInstance(::rtl::OUString("org.openoffice.comp.helper.DatabaseMetaDataResultSet")),UNO_QUERY);
+    Reference< XResultSet > xResultSet(getOwnConnection().getDriver().getFactory()->createInstance(OUString("org.openoffice.comp.helper.DatabaseMetaDataResultSet")),UNO_QUERY);
     std::vector< std::vector< Any > > rRows;
     std::string cat(catalog.hasValue()? OUStringToOString(getStringFromAny(catalog), m_rConnection.getConnectionEncoding()).getStr():""),
                 sPattern(OUStringToOString(schemaPattern, m_rConnection.getConnectionEncoding()).getStr()),
@@ -1739,7 +1737,7 @@ Reference< XResultSet > SAL_CALL ODatabaseMetaData::getTables(
 
     Reference< XResultSet > xResultSet(getOwnConnection().
         getDriver().getFactory()->createInstance(
-                ::rtl::OUString("org.openoffice.comp.helper.DatabaseMetaDataResultSet")),UNO_QUERY);
+                OUString("org.openoffice.comp.helper.DatabaseMetaDataResultSet")),UNO_QUERY);
     std::vector< std::vector< Any > > rRows;
 
     std::string cat(catalog.hasValue()? OUStringToOString(getStringFromAny(catalog), m_rConnection.getConnectionEncoding()).getStr():""),
@@ -1811,7 +1809,7 @@ Reference< XResultSet > SAL_CALL ODatabaseMetaData::getProcedures(
     throw(SQLException, RuntimeException)
 {
     OSL_TRACE("ODatabaseMetaData::getProcedures");
-    Reference< XResultSet > xResultSet(getOwnConnection().getDriver().getFactory()->createInstance(::rtl::OUString("org.openoffice.comp.helper.DatabaseMetaDataResultSet")),UNO_QUERY);
+    Reference< XResultSet > xResultSet(getOwnConnection().getDriver().getFactory()->createInstance(OUString("org.openoffice.comp.helper.DatabaseMetaDataResultSet")),UNO_QUERY);
     std::vector< std::vector< Any > > rRows;
 
     std::string cat(catalog.hasValue()? OUStringToOString(getStringFromAny(catalog), m_rConnection.getConnectionEncoding()).getStr():""),
@@ -1856,7 +1854,7 @@ Reference< XResultSet > SAL_CALL ODatabaseMetaData::getVersionColumns(
     throw(SQLException, RuntimeException)
 {
     OSL_TRACE("ODatabaseMetaData::getVersionColumns");
-    Reference< XResultSet > xResultSet(getOwnConnection().getDriver().getFactory()->createInstance(::rtl::OUString("org.openoffice.comp.helper.DatabaseMetaDataResultSet")),UNO_QUERY);
+    Reference< XResultSet > xResultSet(getOwnConnection().getDriver().getFactory()->createInstance(OUString("org.openoffice.comp.helper.DatabaseMetaDataResultSet")),UNO_QUERY);
     std::vector< std::vector< Any > > rRows;
     lcl_setRows_throw(xResultSet, 16,rRows);
     return xResultSet;
@@ -1872,7 +1870,7 @@ Reference< XResultSet > SAL_CALL ODatabaseMetaData::getExportedKeys(
     throw(SQLException, RuntimeException)
 {
     OSL_TRACE("ODatabaseMetaData::getExportedKeys");
-    Reference< XResultSet > xResultSet(getOwnConnection().getDriver().getFactory()->createInstance(::rtl::OUString("org.openoffice.comp.helper.DatabaseMetaDataResultSet")),UNO_QUERY);
+    Reference< XResultSet > xResultSet(getOwnConnection().getDriver().getFactory()->createInstance(OUString("org.openoffice.comp.helper.DatabaseMetaDataResultSet")),UNO_QUERY);
     std::vector< std::vector< Any > > rRows;
     std::string cat(catalog.hasValue()? OUStringToOString(getStringFromAny(catalog), m_rConnection.getConnectionEncoding()).getStr():""),
                 sch(OUStringToOString(schema, m_rConnection.getConnectionEncoding()).getStr()),
@@ -1913,7 +1911,7 @@ Reference< XResultSet > SAL_CALL ODatabaseMetaData::getImportedKeys(
 {
     OSL_TRACE("ODatabaseMetaData::getImportedKeys");
 
-    Reference< XResultSet > xResultSet(getOwnConnection().getDriver().getFactory()->createInstance(::rtl::OUString("org.openoffice.comp.helper.DatabaseMetaDataResultSet")),UNO_QUERY);
+    Reference< XResultSet > xResultSet(getOwnConnection().getDriver().getFactory()->createInstance(OUString("org.openoffice.comp.helper.DatabaseMetaDataResultSet")),UNO_QUERY);
     std::vector< std::vector< Any > > rRows;
 
     std::string cat(catalog.hasValue()? OUStringToOString(getStringFromAny(catalog), m_rConnection.getConnectionEncoding()).getStr():""),
@@ -1954,7 +1952,7 @@ Reference< XResultSet > SAL_CALL ODatabaseMetaData::getPrimaryKeys(
     throw(SQLException, RuntimeException)
 {
     OSL_TRACE("ODatabaseMetaData::getPrimaryKeys");
-    Reference< XResultSet > xResultSet(getOwnConnection().getDriver().getFactory()->createInstance(::rtl::OUString("org.openoffice.comp.helper.DatabaseMetaDataResultSet")),UNO_QUERY);
+    Reference< XResultSet > xResultSet(getOwnConnection().getDriver().getFactory()->createInstance(OUString("org.openoffice.comp.helper.DatabaseMetaDataResultSet")),UNO_QUERY);
     std::vector< std::vector< Any > > rRows;
 
     std::string cat(catalog.hasValue()? OUStringToOString(getStringFromAny(catalog), m_rConnection.getConnectionEncoding()).getStr():""),
@@ -1997,7 +1995,7 @@ Reference< XResultSet > SAL_CALL ODatabaseMetaData::getIndexInfo(
     throw(SQLException, RuntimeException)
 {
     OSL_TRACE("ODatabaseMetaData::getIndexInfo");
-    Reference< XResultSet > xResultSet(getOwnConnection().getDriver().getFactory()->createInstance(::rtl::OUString("org.openoffice.comp.helper.DatabaseMetaDataResultSet")),UNO_QUERY);
+    Reference< XResultSet > xResultSet(getOwnConnection().getDriver().getFactory()->createInstance(OUString("org.openoffice.comp.helper.DatabaseMetaDataResultSet")),UNO_QUERY);
     std::vector< std::vector< Any > > rRows;
 
     std::string cat(catalog.hasValue()? OUStringToOString(getStringFromAny(catalog), m_rConnection.getConnectionEncoding()).getStr():""),
@@ -2040,7 +2038,7 @@ Reference< XResultSet > SAL_CALL ODatabaseMetaData::getBestRowIdentifier(
     throw(SQLException, RuntimeException)
 {
     OSL_TRACE("ODatabaseMetaData::getBestRowIdentifier");
-    Reference< XResultSet > xResultSet(getOwnConnection().getDriver().getFactory()->createInstance(::rtl::OUString("org.openoffice.comp.helper.DatabaseMetaDataResultSet")),UNO_QUERY);
+    Reference< XResultSet > xResultSet(getOwnConnection().getDriver().getFactory()->createInstance(OUString("org.openoffice.comp.helper.DatabaseMetaDataResultSet")),UNO_QUERY);
     std::vector< std::vector< Any > > rRows;
 
     std::string cat(catalog.hasValue()? OUStringToOString(getStringFromAny(catalog), m_rConnection.getConnectionEncoding()).getStr():""),
@@ -2081,7 +2079,7 @@ Reference< XResultSet > SAL_CALL ODatabaseMetaData::getTablePrivileges(
     throw(SQLException, RuntimeException)
 {
     OSL_TRACE("ODatabaseMetaData::getTablePrivileges");
-    Reference< XResultSet > xResultSet(getOwnConnection().getDriver().getFactory()->createInstance(::rtl::OUString("org.openoffice.comp.helper.DatabaseMetaDataResultSet")),UNO_QUERY);
+    Reference< XResultSet > xResultSet(getOwnConnection().getDriver().getFactory()->createInstance(OUString("org.openoffice.comp.helper.DatabaseMetaDataResultSet")),UNO_QUERY);
     std::vector< std::vector< Any > > rRows;
 
     std::string cat(catalog.hasValue()? OUStringToOString(getStringFromAny(catalog), m_rConnection.getConnectionEncoding()).getStr():""),
@@ -2103,7 +2101,7 @@ Reference< XResultSet > SAL_CALL ODatabaseMetaData::getTablePrivileges(
                 aRow.push_back(makeAny( tableNamePattern ));                                      // TABLE_NAME
                 aRow.push_back(Any());                                                            // GRANTOR
                 aRow.push_back(userName);                                                         // GRANTEE
-                aRow.push_back(makeAny( ::rtl::OUString::createFromAscii( allPrivileges[i] ) ));  // PRIVILEGE
+                aRow.push_back(makeAny( OUString::createFromAscii( allPrivileges[i] ) ));  // PRIVILEGE
                 aRow.push_back(Any());                                                            // IS_GRANTABLE
 
                 rRows.push_back(aRow);
@@ -2146,7 +2144,7 @@ Reference< XResultSet > SAL_CALL ODatabaseMetaData::getCrossReference(
     throw(SQLException, RuntimeException)
 {
     OSL_TRACE("ODatabaseMetaData::getCrossReference");
-    Reference< XResultSet > xResultSet(getOwnConnection().getDriver().getFactory()->createInstance(::rtl::OUString("org.openoffice.comp.helper.DatabaseMetaDataResultSet")),UNO_QUERY);
+    Reference< XResultSet > xResultSet(getOwnConnection().getDriver().getFactory()->createInstance(OUString("org.openoffice.comp.helper.DatabaseMetaDataResultSet")),UNO_QUERY);
     std::vector< std::vector< Any > > rRows;
 
     std::string primaryCat(primaryCatalog.hasValue()? OUStringToOString(getStringFromAny(primaryCatalog), m_rConnection.getConnectionEncoding()).getStr():""),
diff --git a/mysqlc/source/mysqlc_databasemetadata.hxx b/mysqlc/source/mysqlc_databasemetadata.hxx
index e41201d1364b..a6a79e34f929 100644
--- a/mysqlc/source/mysqlc_databasemetadata.hxx
+++ b/mysqlc/source/mysqlc_databasemetadata.hxx
@@ -35,7 +35,6 @@ namespace connectivity
         typedef ::com::sun::star::uno::RuntimeException my_RuntimeException;
         typedef ::com::sun::star::uno::Reference< ::com::sun::star::sdbc::XResultSet > my_XResultSetRef;
         using ::com::sun::star::uno::Any;
-        using ::rtl::OUString;
 
         //**************************************************************
         //************ Class: ODatabaseMetaData
diff --git a/mysqlc/source/mysqlc_driver.cxx b/mysqlc/source/mysqlc_driver.cxx
index b399da89a09b..7a6a32640122 100644
--- a/mysqlc/source/mysqlc_driver.cxx
+++ b/mysqlc/source/mysqlc_driver.cxx
@@ -32,7 +32,6 @@ using namespace com::sun::star::lang;
 using namespace com::sun::star::beans;
 using namespace com::sun::star::sdbc;
 using namespace connectivity::mysqlc;
-using ::rtl::OUString;
 #include <stdio.h>
 
 #include <cppconn/exception.h>
@@ -83,7 +82,7 @@ OUString MysqlCDriver::getImplementationName_Static()
     throw(RuntimeException)
 {
     OSL_TRACE("MysqlCDriver::getImplementationName_Static");
-    return ::rtl::OUString( "com.sun.star.comp.sdbc.mysqlc.MysqlCDriver"  );
+    return OUString( "com.sun.star.comp.sdbc.mysqlc.MysqlCDriver"  );
 }
 /* }}} */
 
@@ -146,7 +145,7 @@ void MysqlCDriver::impl_initCppConn_lck_throw()
 #else
     if ( !m_bAttemptedLoadCppConn )
     {
-        const ::rtl::OUString sModuleName(CPPCONN_LIB );
+        const OUString sModuleName(CPPCONN_LIB );
         m_hCppConnModule = osl_loadModuleRelative( &thisModule, sModuleName.pData, 0 );
         m_bAttemptedLoadCppConn = true;
     }
@@ -156,16 +155,16 @@ void MysqlCDriver::impl_initCppConn_lck_throw()
     {
         OSL_FAIL( "MysqlCDriver::impl_initCppConn_lck_throw: could not load the " CPPCONN_LIB " library!");
         throw SQLException(
-            ::rtl::OUString( "Unable to load the " CPPCONN_LIB " library."  ),
+            OUString( "Unable to load the " CPPCONN_LIB " library."  ),
             *this,
-            ::rtl::OUString( "08001"  ),  // "unable to connect"
+            OUString( "08001"  ),  // "unable to connect"
             0,
             Any()
         );
     }
 
     // find the factory symbol
-    const ::rtl::OUString sSymbolName = ::rtl::OUString( "sql_mysql_get_driver_instance"  );
+    const OUString sSymbolName = OUString( "sql_mysql_get_driver_instance"  );
     typedef void* (* FGetMySQLDriver)();
 
     const FGetMySQLDriver pFactoryFunction = (FGetMySQLDriver)( osl_getFunctionSymbol( m_hCppConnModule, sSymbolName.pData ) );
@@ -173,9 +172,9 @@ void MysqlCDriver::impl_initCppConn_lck_throw()
     {
         OSL_FAIL( "MysqlCDriver::impl_initCppConn_lck_throw: could not find the factory symbol in " CPPCONN_LIB "!");
         throw SQLException(
-            ::rtl::OUString( CPPCONN_LIB " is invalid: missing the driver factory function."  ),
+            OUString( CPPCONN_LIB " is invalid: missing the driver factory function."  ),
             *this,
-            ::rtl::OUString( "08001"  ),  // "unable to connect"
+            OUString( "08001"  ),  // "unable to connect"
             0,
             Any()
         );
@@ -186,9 +185,9 @@ void MysqlCDriver::impl_initCppConn_lck_throw()
     if ( !cppDriver )
     {
         throw SQLException(
-            ::rtl::OUString( "Unable to obtain the MySQL_Driver instance from Connector/C++."  ),
+            OUString( "Unable to obtain the MySQL_Driver instance from Connector/C++."  ),
             *this,
-            ::rtl::OUString( "08001"  ),  // "unable to connect"
+            OUString( "08001"  ),  // "unable to connect"
             0,
             Any()
         );
@@ -211,7 +210,7 @@ Reference< XConnection > SAL_CALL MysqlCDriver::connect(const OUString& url, con
         impl_initCppConn_lck_throw();
         OSL_POSTCOND( cppDriver, "MySQLCDriver::connect: internal error." );
         if ( !cppDriver )
-            throw RuntimeException( ::rtl::OUString( "MySQLCDriver::connect: internal error."  ), *this );
+            throw RuntimeException( OUString( "MySQLCDriver::connect: internal error."  ), *this );
     }
 
     Reference< XConnection > xConn;
diff --git a/mysqlc/source/mysqlc_driver.hxx b/mysqlc/source/mysqlc_driver.hxx
index 97426243eba9..021c64e7c265 100644
--- a/mysqlc/source/mysqlc_driver.hxx
+++ b/mysqlc/source/mysqlc_driver.hxx
@@ -40,7 +40,6 @@ namespace connectivity
 {
     namespace mysqlc
     {
-        using ::rtl::OUString;
         using ::com::sun::star::sdbc::SQLException;
         using ::com::sun::star::uno::RuntimeException;
         using ::com::sun::star::uno::Exception;
diff --git a/mysqlc/source/mysqlc_general.cxx b/mysqlc/source/mysqlc_general.cxx
index bda703152022..6caccde4578f 100644
--- a/mysqlc/source/mysqlc_general.cxx
+++ b/mysqlc/source/mysqlc_general.cxx
@@ -28,7 +28,6 @@ using com::sun::star::uno::UNO_QUERY;
 using com::sun::star::uno::Reference;
 using com::sun::star::uno::XInterface;
 using com::sun::star::uno::Any;
-using ::rtl::OUString;
 
 namespace mysqlc_sdbc_driver
 {
@@ -36,11 +35,11 @@ namespace mysqlc_sdbc_driver
 void throwFeatureNotImplementedException( const sal_Char* _pAsciiFeatureName, const Reference< XInterface >& _rxContext, const Any* _pNextException )
     throw (SQLException)
 {
-    const ::rtl::OUString sMessage = ::rtl::OUString::createFromAscii( _pAsciiFeatureName ) + ::rtl::OUString( ": feature not implemented." );
+    const OUString sMessage = OUString::createFromAscii( _pAsciiFeatureName ) + OUString( ": feature not implemented." );
     throw SQLException(
         sMessage,
         _rxContext,
-        ::rtl::OUString("HYC00"),
+        OUString("HYC00"),
         0,
         _pNextException ? *_pNextException : Any()
     );
@@ -50,11 +49,11 @@ void throwFeatureNotImplementedException( const sal_Char* _pAsciiFeatureName, co
 void throwInvalidArgumentException( const sal_Char* _pAsciiFeatureName, const Reference< XInterface >& _rxContext, const Any* _pNextException )
     throw (SQLException)
 {
-    const ::rtl::OUString sMessage = ::rtl::OUString::createFromAscii( _pAsciiFeatureName ) + ::rtl::OUString( ": invalid arguments." );
+    const OUString sMessage = OUString::createFromAscii( _pAsciiFeatureName ) + OUString( ": invalid arguments." );
     throw SQLException(
         sMessage,
         _rxContext,
-        ::rtl::OUString("HYC00"),
+        OUString("HYC00"),
         0,
         _pNextException ? *_pNextException : Any()
     );
@@ -152,14 +151,14 @@ int mysqlToOOOType(int cppConnType)
 }
 
 
-::rtl::OUString convert(const ::std::string& _string, const rtl_TextEncoding encoding)
+OUString convert(const ::std::string& _string, const rtl_TextEncoding encoding)
 {
-    return ::rtl::OUString( _string.c_str(), _string.size(), encoding );
+    return OUString( _string.c_str(), _string.size(), encoding );
 }
 
-::std::string convert(const ::rtl::OUString& _string, const rtl_TextEncoding encoding)
+::std::string convert(const OUString& _string, const rtl_TextEncoding encoding)
 {
-    return ::std::string( ::rtl::OUStringToOString( _string, encoding ).getStr() );
+    return ::std::string( OUStringToOString( _string, encoding ).getStr() );
 }
 
 
diff --git a/mysqlc/source/mysqlc_general.hxx b/mysqlc/source/mysqlc_general.hxx
index 03a4a0f2e77e..6333ca8eba65 100644
--- a/mysqlc/source/mysqlc_general.hxx
+++ b/mysqlc/source/mysqlc_general.hxx
@@ -27,7 +27,7 @@
 
 namespace mysqlc_sdbc_driver
 {
-    rtl::OUString getStringFromAny(const ::com::sun::star::uno::Any& _rAny);
+    OUString getStringFromAny(const ::com::sun::star::uno::Any& _rAny);
 
     void throwFeatureNotImplementedException(
             const sal_Char* _pAsciiFeatureName,
@@ -48,9 +48,9 @@ namespace mysqlc_sdbc_driver
     int mysqlToOOOType(int mysqlType) throw ();
 
 
-    ::rtl::OUString convert(const ::std::string& _string, const rtl_TextEncoding encoding);
+    OUString convert(const ::std::string& _string, const rtl_TextEncoding encoding);
 
-    ::std::string convert(const ::rtl::OUString& _string, const rtl_TextEncoding encoding);
+    ::std::string convert(const OUString& _string, const rtl_TextEncoding encoding);
 }
 
 #endif
diff --git a/mysqlc/source/mysqlc_preparedstatement.cxx b/mysqlc/source/mysqlc_preparedstatement.cxx
index 774ac5810067..004acf9a3f40 100644
--- a/mysqlc/source/mysqlc_preparedstatement.cxx
+++ b/mysqlc/source/mysqlc_preparedstatement.cxx
@@ -228,7 +228,7 @@ void SAL_CALL OPreparedStatement::setString(sal_Int32 parameter, const OUString&
     checkParameterIndex(parameter);
 
     try {
-        std::string stringie(::rtl::OUStringToOString(x, m_pConnection->getConnectionEncoding()).getStr());
+        std::string stringie(OUStringToOString(x, m_pConnection->getConnectionEncoding()).getStr());
         ((sql::PreparedStatement *)cppStatement)->setString(parameter, stringie);
     } catch (const sql::MethodNotImplementedException &) {
         mysqlc_sdbc_driver::throwFeatureNotImplementedException("OPreparedStatement::clearParameters", *this);
diff --git a/mysqlc/source/mysqlc_propertyids.cxx b/mysqlc/source/mysqlc_propertyids.cxx
index 21d764908a7c..f22d7af4f2d0 100644
--- a/mysqlc/source/mysqlc_propertyids.cxx
+++ b/mysqlc/source/mysqlc_propertyids.cxx
@@ -20,7 +20,6 @@
 #include <osl/diagnose.h>
 #include "mysqlc_propertyids.hxx"
 
-using ::rtl::OUString;
 
 namespace connectivity
 {
diff --git a/mysqlc/source/mysqlc_propertyids.hxx b/mysqlc/source/mysqlc_propertyids.hxx
index 3118813ccddf..f77d9726b5ae 100644
--- a/mysqlc/source/mysqlc_propertyids.hxx
+++ b/mysqlc/source/mysqlc_propertyids.hxx
@@ -37,13 +37,13 @@ namespace mysqlc
     {
         ::std::map<sal_Int32 , rtl_uString*> m_aPropertyMap;
 
-        ::rtl::OUString fillValue(sal_Int32 _nIndex);
+        OUString fillValue(sal_Int32 _nIndex);
     public:
         OPropertyMap()
         {
         }
         ~OPropertyMap();
-        ::rtl::OUString getNameByIndex(sal_Int32 _nIndex) const;
+        OUString getNameByIndex(sal_Int32 _nIndex) const;
 
         static OPropertyMap& getPropMap()
         {
@@ -61,7 +61,7 @@ namespace mysqlc
         sal_Int32 nLength;
 
         UStringDescription(PVFN _fCharFkt);
-        operator ::rtl::OUString() const { return ::rtl::OUString(pZeroTerminatedName,nLength,RTL_TEXTENCODING_ASCII_US); }
+        operator OUString() const { return OUString(pZeroTerminatedName,nLength,RTL_TEXTENCODING_ASCII_US); }
         ~UStringDescription();
     private:
         UStringDescription();
diff --git a/mysqlc/source/mysqlc_resultset.cxx b/mysqlc/source/mysqlc_resultset.cxx
index 5e5161e1fb5e..b0bd52881bfe 100644
--- a/mysqlc/source/mysqlc_resultset.cxx
+++ b/mysqlc/source/mysqlc_resultset.cxx
@@ -42,7 +42,6 @@ using namespace com::sun::star::container;
 using namespace com::sun::star::io;
 using namespace com::sun::star::util;
 using ::osl::MutexGuard;
-using ::rtl::OUString;
 
 #include <cppconn/resultset.h>
 #include <cppconn/resultset_metadata.h>
@@ -56,7 +55,7 @@ OUString SAL_CALL OResultSet::getImplementationName()
     throw (RuntimeException)
 {
     OSL_TRACE("OResultSet::getImplementationName");
-    return ::rtl::OUString( "com.sun.star.sdbcx.mysqlc.ResultSet" );
+    return OUString( "com.sun.star.sdbcx.mysqlc.ResultSet" );
 }
 /* }}} */
 
diff --git a/mysqlc/source/mysqlc_resultset.hxx b/mysqlc/source/mysqlc_resultset.hxx
index ebe5b860e1a9..fd22c99441c2 100644
--- a/mysqlc/source/mysqlc_resultset.hxx
+++ b/mysqlc/source/mysqlc_resultset.hxx
@@ -43,7 +43,6 @@ namespace connectivity
 {
     namespace mysqlc
     {
-        using ::rtl::OUString;
         using ::com::sun::star::sdbc::SQLException;
         using ::com::sun::star::uno::RuntimeException;
         using ::com::sun::star::uno::Any;
diff --git a/mysqlc/source/mysqlc_resultsetmetadata.cxx b/mysqlc/source/mysqlc_resultsetmetadata.cxx
index 0693e472442b..0d0c2732d210 100644
--- a/mysqlc/source/mysqlc_resultsetmetadata.cxx
+++ b/mysqlc/source/mysqlc_resultsetmetadata.cxx
@@ -27,7 +27,6 @@ using namespace connectivity::mysqlc;
 using namespace com::sun::star::uno;
 using namespace com::sun::star::lang;
 using namespace com::sun::star::sdbc;
-using ::rtl::OUString;
 
 // -------------------------------------------------------------------------
 OResultSetMetaData::~OResultSetMetaData()
@@ -436,7 +435,7 @@ void OResultSetMetaData::checkColumnIndex(sal_Int32 columnIndex)
     OSL_TRACE("OResultSetMetaData::checkColumnIndex");
     if (columnIndex < 1 || columnIndex > (sal_Int32) meta->getColumnCount()) {
 
-        ::rtl::OUStringBuffer buf;
+        OUStringBuffer buf;
         buf.appendAscii( "Column index out of range (expected 1 to " );
         buf.append( sal_Int32( meta->getColumnCount() ) );
         buf.appendAscii( ", got " );
diff --git a/mysqlc/source/mysqlc_resultsetmetadata.hxx b/mysqlc/source/mysqlc_resultsetmetadata.hxx
index da93ef603372..4bbd7208a87c 100644
--- a/mysqlc/source/mysqlc_resultsetmetadata.hxx
+++ b/mysqlc/source/mysqlc_resultsetmetadata.hxx
@@ -33,7 +33,6 @@ namespace connectivity
     {
         using ::com::sun::star::sdbc::SQLException;
         using ::com::sun::star::uno::RuntimeException;
-        using ::rtl::OUString;
         //**************************************************************
         //************ Class: ResultSetMetaData
         //**************************************************************
@@ -52,9 +51,9 @@ namespace connectivity
             {
             }
 
-            inline ::rtl::OUString convert( const ::std::string& _string ) const
+            inline OUString convert( const ::std::string& _string ) const
             {
-                return ::rtl::OUString( _string.c_str(), _string.size(), m_encoding );
+                return OUString( _string.c_str(), _string.size(), m_encoding );
             }
 
             /// Avoid ambigous cast error from the compiler.
diff --git a/mysqlc/source/mysqlc_services.cxx b/mysqlc/source/mysqlc_services.cxx
index 8f3add7213de..672633c26e1c 100644
--- a/mysqlc/source/mysqlc_services.cxx
+++ b/mysqlc/source/mysqlc_services.cxx
@@ -24,7 +24,6 @@
 #include <rtl/ustrbuf.hxx>
 
 using namespace connectivity::mysqlc;
-using ::rtl::OUString;
 using ::com::sun::star::uno::Reference;
 using ::com::sun::star::uno::Sequence;
 using ::com::sun::star::registry::XRegistryKey;
diff --git a/mysqlc/source/mysqlc_statement.cxx b/mysqlc/source/mysqlc_statement.cxx
index 1fae7705bf6a..a275689a2a4a 100644
--- a/mysqlc/source/mysqlc_statement.cxx
+++ b/mysqlc/source/mysqlc_statement.cxx
@@ -48,7 +48,6 @@ using namespace com::sun::star::container;
 using namespace com::sun::star::io;
 using namespace com::sun::star::util;
 using ::osl::MutexGuard;
-using ::rtl::OUString;
 
 #include <stdio.h>
 
@@ -181,7 +180,7 @@ sal_Bool SAL_CALL OCommonStatement::execute(const OUString& sql)
     OSL_TRACE("OCommonStatement::execute");
     MutexGuard aGuard(m_aMutex);
     checkDisposed(rBHelper.bDisposed);
-    const ::rtl::OUString sSqlStatement = m_pConnection->transFormPreparedStatement( sql );
+    const OUString sSqlStatement = m_pConnection->transFormPreparedStatement( sql );
 
     sal_Bool success = false;
     try {
@@ -202,7 +201,7 @@ Reference< XResultSet > SAL_CALL OCommonStatement::executeQuery(const OUString&
 
     MutexGuard aGuard(m_aMutex);
     checkDisposed(rBHelper.bDisposed);
-    const ::rtl::OUString sSqlStatement = m_pConnection->transFormPreparedStatement(sql);
+    const OUString sSqlStatement = m_pConnection->transFormPreparedStatement(sql);
 
     Reference< XResultSet > xResultSet;
     try {
@@ -289,7 +288,7 @@ sal_Int32 SAL_CALL OCommonStatement::executeUpdate(const OUString& sql)
     OSL_TRACE("OCommonStatement::executeUpdate");
     MutexGuard aGuard(m_aMutex);
     checkDisposed(rBHelper.bDisposed);
-    const ::rtl::OUString sSqlStatement = m_pConnection->transFormPreparedStatement(sql);
+    const OUString sSqlStatement = m_pConnection->transFormPreparedStatement(sql);
 
     sal_Int32 affectedRows = 0;
     try {
diff --git a/mysqlc/source/mysqlc_statement.hxx b/mysqlc/source/mysqlc_statement.hxx
index a4e6335dde58..a58a9c598aa3 100644
--- a/mysqlc/source/mysqlc_statement.hxx
+++ b/mysqlc/source/mysqlc_statement.hxx
@@ -44,7 +44,6 @@ namespace connectivity
         using ::com::sun::star::sdbc::SQLException;
         using ::com::sun::star::uno::Any;
         using ::com::sun::star::uno::RuntimeException;
-        using ::rtl::OUString;
 
         typedef ::cppu::WeakComponentImplHelper5<   ::com::sun::star::sdbc::XStatement,
                                                     ::com::sun::star::sdbc::XWarningsSupplier,
diff --git a/mysqlc/source/mysqlc_subcomponent.hxx b/mysqlc/source/mysqlc_subcomponent.hxx
index 85a5dc7d7721..dfc1f198fdbc 100644
--- a/mysqlc/source/mysqlc_subcomponent.hxx
+++ b/mysqlc/source/mysqlc_subcomponent.hxx
@@ -201,26 +201,26 @@ namespace connectivity
 
 
 #define DECLARE_SERVICE_INFO()  \
-    virtual ::rtl::OUString SAL_CALL getImplementationName() throw (::com::sun::star::uno::RuntimeException);   \
-    virtual sal_Bool SAL_CALL supportsService(const ::rtl::OUString& ServiceName) throw(::com::sun::star::uno::RuntimeException);   \
-    virtual ::com::sun::star::uno::Sequence< ::rtl::OUString > SAL_CALL getSupportedServiceNames() throw(::com::sun::star::uno::RuntimeException)   \
+    virtual OUString SAL_CALL getImplementationName() throw (::com::sun::star::uno::RuntimeException);   \
+    virtual sal_Bool SAL_CALL supportsService(const OUString& ServiceName) throw(::com::sun::star::uno::RuntimeException);   \
+    virtual ::com::sun::star::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames() throw(::com::sun::star::uno::RuntimeException)   \
 
 #define IMPLEMENT_SERVICE_INFO(classname, implasciiname, serviceasciiname)  \
-    ::rtl::OUString SAL_CALL classname::getImplementationName() throw (::com::sun::star::uno::RuntimeException) \
+    OUString SAL_CALL classname::getImplementationName() throw (::com::sun::star::uno::RuntimeException) \
     {   \
-        return ::rtl::OUString::createFromAscii(implasciiname); \
+        return OUString::createFromAscii(implasciiname); \
     }   \
-    ::com::sun::star::uno::Sequence< ::rtl::OUString > SAL_CALL classname::getSupportedServiceNames() throw(::com::sun::star::uno::RuntimeException)    \
+    ::com::sun::star::uno::Sequence< OUString > SAL_CALL classname::getSupportedServiceNames() throw(::com::sun::star::uno::RuntimeException)    \
     {   \
-        ::com::sun::star::uno::Sequence< ::rtl::OUString > aSupported(1);   \
-        aSupported[0] = ::rtl::OUString::createFromAscii(serviceasciiname); \
+        ::com::sun::star::uno::Sequence< OUString > aSupported(1);   \
+        aSupported[0] = OUString::createFromAscii(serviceasciiname); \
         return aSupported;  \
     }   \
-    sal_Bool SAL_CALL classname::supportsService(const ::rtl::OUString& _rServiceName) throw(::com::sun::star::uno::RuntimeException)   \
+    sal_Bool SAL_CALL classname::supportsService(const OUString& _rServiceName) throw(::com::sun::star::uno::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)   \
             ;                                                                           \
         return pSupported != pEnd;                                                      \