From b2f8318dbda8a09fa312663d14fcaf057ee5069d Mon Sep 17 00:00:00 2001
From: "Chr. Rossmanith" <ChrRossmanith@gmx.de>
Date: Tue, 19 Mar 2013 21:15:00 +0100
Subject: simplify OUString assignments

Change-Id: Ieffd80aa84c9a041785bb81b3a904a32d00cb2bb
Reviewed-on: https://gerrit.libreoffice.org/2863
Reviewed-by: Noel Power <noel.power@suse.com>
Tested-by: Noel Power <noel.power@suse.com>
---
 connectivity/source/commontools/FDatabaseMetaDataResultSet.cxx | 6 +++---
 connectivity/source/commontools/ParamterSubstitution.cxx       | 6 +++---
 connectivity/source/commontools/TPrivilegesResultSet.cxx       | 8 ++++----
 connectivity/source/commontools/dbtools.cxx                    | 4 ++--
 4 files changed, 12 insertions(+), 12 deletions(-)

(limited to 'connectivity')

diff --git a/connectivity/source/commontools/FDatabaseMetaDataResultSet.cxx b/connectivity/source/commontools/FDatabaseMetaDataResultSet.cxx
index 6b8f9c0e7a93..284d2cff0505 100644
--- a/connectivity/source/commontools/FDatabaseMetaDataResultSet.cxx
+++ b/connectivity/source/commontools/FDatabaseMetaDataResultSet.cxx
@@ -821,10 +821,10 @@ void SAL_CALL ODatabaseMetaDataResultSet::initialize( const Sequence< Any >& _aA
         return ::rtl::OUString("org.openoffice.comp.helper.DatabaseMetaDataResultSet");
     }
     //------------------------------------------------------------------------------
-    Sequence< ::rtl::OUString > ODatabaseMetaDataResultSet::getSupportedServiceNames_Static(  ) throw (RuntimeException)
+    Sequence< OUString > ODatabaseMetaDataResultSet::getSupportedServiceNames_Static(  ) throw (RuntimeException)
     {
-        Sequence< ::rtl::OUString > aSNS( 1 );
-        aSNS[0] = ::rtl::OUString("com.sun.star.sdbc.ResultSet");
+        Sequence< OUString > aSNS( 1 );
+        aSNS[0] = "com.sun.star.sdbc.ResultSet";
         return aSNS;
     }
     //------------------------------------------------------------------
diff --git a/connectivity/source/commontools/ParamterSubstitution.cxx b/connectivity/source/commontools/ParamterSubstitution.cxx
index 91fa458de183..aa487606b5d0 100644
--- a/connectivity/source/commontools/ParamterSubstitution.cxx
+++ b/connectivity/source/commontools/ParamterSubstitution.cxx
@@ -65,10 +65,10 @@ namespace connectivity
         return getSupportedServiceNames_Static();
     }
     //------------------------------------------------------------------
-    Sequence< ::rtl::OUString > ParameterSubstitution::getSupportedServiceNames_Static(  ) throw (RuntimeException)
+    Sequence< OUString > ParameterSubstitution::getSupportedServiceNames_Static(  ) throw (RuntimeException)
     {
-        Sequence< ::rtl::OUString > aSNS( 1 );
-        aSNS[0] = ::rtl::OUString("com.sun.star.sdb.ParameterSubstitution");
+        Sequence< OUString > aSNS( 1 );
+        aSNS[0] = "com.sun.star.sdb.ParameterSubstitution";
         return aSNS;
     }
 
diff --git a/connectivity/source/commontools/TPrivilegesResultSet.cxx b/connectivity/source/commontools/TPrivilegesResultSet.cxx
index 8a4baa2fa147..3aec1f8aa7c6 100644
--- a/connectivity/source/commontools/TPrivilegesResultSet.cxx
+++ b/connectivity/source/commontools/TPrivilegesResultSet.cxx
@@ -38,11 +38,11 @@ OResultSetPrivileges::OResultSetPrivileges( const Reference< XDatabaseMetaData>&
     osl_atomic_increment( &m_refCount );
     {
         ::rtl::OUString sUserWorkingFor;
-        Sequence< ::rtl::OUString > sTableTypes(3);
+        Sequence< OUString > sTableTypes(3);
         // we want all catalogues, all schemas, all tables
-        sTableTypes[0] = ::rtl::OUString("VIEW");
-        sTableTypes[1] = ::rtl::OUString("TABLE");
-        sTableTypes[2] = ::rtl::OUString("%"); // just to be sure to include anything else ....
+        sTableTypes[0] = "VIEW";
+        sTableTypes[1] = "TABLE";
+        sTableTypes[2] = "%"; // just to be sure to include anything else ....
         try
         {
             m_xTables = _rxMeta->getTables(catalog,schemaPattern,tableNamePattern,sTableTypes);
diff --git a/connectivity/source/commontools/dbtools.cxx b/connectivity/source/commontools/dbtools.cxx
index 499e6b23ca83..8e6513dc7abd 100644
--- a/connectivity/source/commontools/dbtools.cxx
+++ b/connectivity/source/commontools/dbtools.cxx
@@ -429,9 +429,9 @@ SharedConnection lcl_connectRowSet(const Reference< XRowSet>& _rxRowSet, const R
                 if (!sUser.isEmpty())
                 {   // use user and pwd together with the url
                     Sequence< PropertyValue> aInfo(2);
-                    aInfo.getArray()[0].Name = ::rtl::OUString("user");
+                    aInfo.getArray()[0].Name = "user";
                     aInfo.getArray()[0].Value <<= sUser;
-                    aInfo.getArray()[1].Name = ::rtl::OUString("password");
+                    aInfo.getArray()[1].Name = "password";
                     aInfo.getArray()[1].Value <<= sPwd;
                     xPureConnection = xDriverManager->getConnectionWithInfo( sURL, aInfo );
                 }
-- 
cgit