diff options
author | Luboš Luňák <l.lunak@suse.cz> | 2013-04-07 12:06:47 +0200 |
---|---|---|
committer | Luboš Luňák <l.lunak@suse.cz> | 2013-04-07 14:23:11 +0200 |
commit | 1946794ae09ba732022fe6a74ea45e304ab70b84 (patch) | |
tree | e32bd7ba61fa021ecc7f8c85959df8ca837d6e81 /connectivity/workben | |
parent | Typo in comment in resmgr.hxx (diff) | |
download | core-1946794ae09ba732022fe6a74ea45e304ab70b84.tar.gz core-1946794ae09ba732022fe6a74ea45e304ab70b84.zip |
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
Diffstat (limited to 'connectivity/workben')
-rw-r--r-- | connectivity/workben/iniParser/main.cxx | 12 | ||||
-rw-r--r-- | connectivity/workben/little/main.cxx | 3 | ||||
-rw-r--r-- | connectivity/workben/skeleton/SResultSet.hxx | 8 | ||||
-rw-r--r-- | connectivity/workben/testmoz/main.cxx | 25 | ||||
-rw-r--r-- | connectivity/workben/testmoz/mozthread.cxx | 14 |
5 files changed, 26 insertions, 36 deletions
diff --git a/connectivity/workben/iniParser/main.cxx b/connectivity/workben/iniParser/main.cxx index acd7eaa52640..05dcfa1f1aa5 100644 --- a/connectivity/workben/iniParser/main.cxx +++ b/connectivity/workben/iniParser/main.cxx @@ -25,15 +25,11 @@ #include <map> #include <list> -using ::rtl::OUString; -using ::rtl::OString; -using ::rtl::OStringToOUString; -using ::rtl::OUStringToOString; struct ini_NameValue { - rtl::OUString sName; - rtl::OUString sValue; + OUString sName; + OUString sValue; inline ini_NameValue() SAL_THROW(()) {} @@ -50,10 +46,10 @@ typedef std::list< struct ini_Section { - rtl::OUString sName; + OUString sName; NameValueList lList; }; -typedef std::map<rtl::OUString, +typedef std::map<OUString, ini_Section >IniSectionMap; diff --git a/connectivity/workben/little/main.cxx b/connectivity/workben/little/main.cxx index e4318ac039a6..d8d00fc6d1d1 100644 --- a/connectivity/workben/little/main.cxx +++ b/connectivity/workben/little/main.cxx @@ -40,7 +40,6 @@ using namespace com::sun::star::uno; using namespace com::sun::star::beans; using namespace cppu; -using ::rtl::OUString; #if (defined UNX) @@ -76,7 +75,7 @@ void _cdecl main( int argc, char * argv[] ) Reference<XResultSet> xRes = xStmt->executeQuery(OUString("SELECT * FROM Tele")); if(xRes.is()) { - ::rtl::OUString aPat( "%s\t" ); + OUString aPat( "%s\t" ); Reference<XRow> xRow(xRes,UNO_QUERY); Reference<XResultSetMetaData> xMeta = Reference<XResultSetMetaDataSupplier>(xRes,UNO_QUERY)->getMetaData(); for(sal_Int32 i=1;i<xMeta->getColumnCount();++i) diff --git a/connectivity/workben/skeleton/SResultSet.hxx b/connectivity/workben/skeleton/SResultSet.hxx index b3c0267fe0f6..4b70366be345 100644 --- a/connectivity/workben/skeleton/SResultSet.hxx +++ b/connectivity/workben/skeleton/SResultSet.hxx @@ -91,7 +91,7 @@ namespace connectivity sal_Int32 getResultSetType() const throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException); sal_Int32 getFetchDirection() const throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException); sal_Int32 getFetchSize() const throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException); - ::rtl::OUString getCursorName() const throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException); + OUString getCursorName() const throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException); void setFetchDirection(sal_Int32 _par0) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException); void setFetchSize(sal_Int32 _par0) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException); @@ -168,7 +168,7 @@ namespace connectivity virtual ::com::sun::star::uno::Reference< ::com::sun::star::uno::XInterface > SAL_CALL getStatement( ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException); // XRow virtual sal_Bool SAL_CALL wasNull( ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException); - virtual ::rtl::OUString SAL_CALL getString( sal_Int32 columnIndex ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException); + virtual OUString SAL_CALL getString( sal_Int32 columnIndex ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException); virtual sal_Bool SAL_CALL getBoolean( sal_Int32 columnIndex ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException); virtual sal_Int8 SAL_CALL getByte( sal_Int32 columnIndex ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException); virtual sal_Int16 SAL_CALL getShort( sal_Int32 columnIndex ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException); @@ -212,7 +212,7 @@ namespace connectivity virtual void SAL_CALL updateLong( sal_Int32 columnIndex, sal_Int64 x ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException); virtual void SAL_CALL updateFloat( sal_Int32 columnIndex, float x ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException); virtual void SAL_CALL updateDouble( sal_Int32 columnIndex, double x ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException); - virtual void SAL_CALL updateString( sal_Int32 columnIndex, const ::rtl::OUString& x ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException); + virtual void SAL_CALL updateString( sal_Int32 columnIndex, const OUString& x ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException); virtual void SAL_CALL updateBytes( sal_Int32 columnIndex, const ::com::sun::star::uno::Sequence< sal_Int8 >& x ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException); virtual void SAL_CALL updateDate( sal_Int32 columnIndex, const ::com::sun::star::util::Date& x ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException); virtual void SAL_CALL updateTime( sal_Int32 columnIndex, const ::com::sun::star::util::Time& x ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException); @@ -222,7 +222,7 @@ namespace connectivity virtual void SAL_CALL updateObject( sal_Int32 columnIndex, const ::com::sun::star::uno::Any& x ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException); virtual void SAL_CALL updateNumericObject( sal_Int32 columnIndex, const ::com::sun::star::uno::Any& x, sal_Int32 scale ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException); // XColumnLocate - virtual sal_Int32 SAL_CALL findColumn( const ::rtl::OUString& columnName ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException); + virtual sal_Int32 SAL_CALL findColumn( const OUString& columnName ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException); // XRowLocate virtual ::com::sun::star::uno::Any SAL_CALL getBookmark( ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException); virtual sal_Bool SAL_CALL moveToBookmark( const ::com::sun::star::uno::Any& bookmark ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException); diff --git a/connectivity/workben/testmoz/main.cxx b/connectivity/workben/testmoz/main.cxx index e65d153abe2d..a5d251c1756e 100644 --- a/connectivity/workben/testmoz/main.cxx +++ b/connectivity/workben/testmoz/main.cxx @@ -68,9 +68,6 @@ using namespace com::sun::star::sdbc; using namespace com::sun::star::sdbcx; using namespace ::com::sun::star::container; -using ::rtl::OUString; -using ::rtl::OUStringBuffer; -using ::rtl::OUStringToOString; #define OUtoCStr( x ) (OUStringToOString ( (x), RTL_TEXTENCODING_ASCII_US ).getStr()) #define PRINTSTR(x) printf("%s",x); @@ -178,11 +175,11 @@ Reference< XMultiServiceFactory > InitializeFac( void ) OSL_ASSERT( path.lastIndexOf( '/' ) >= 0 ); - ::rtl::OUStringBuffer bufServices( path.copy( 0, path.lastIndexOf( '/' )+1 ) ); + OUStringBuffer bufServices( path.copy( 0, path.lastIndexOf( '/' )+1 ) ); bufServices.appendAscii("services.rdb"); OUString services = bufServices.makeStringAndClear(); - ::rtl::OUStringBuffer bufTypes( path.copy( 0, path.lastIndexOf( '/' )+1 ) ); + OUStringBuffer bufTypes( path.copy( 0, path.lastIndexOf( '/' )+1 ) ); bufTypes.appendAscii("types.rdb"); OUString types = bufTypes.makeStringAndClear(); @@ -302,7 +299,7 @@ int TestMetaData(Reference< ::com::sun::star::sdbc::XConnection> &pConnection) makeAny(OUString("")), // Catalog OUString("%"), // Schema OUString("%"), // TabName - Sequence<rtl::OUString>() + Sequence<OUString>() ); printXResultSets( xRes ); } @@ -390,10 +387,10 @@ Reference< ::com::sun::star::sdbc::XConnection> TestConnected char hostname[40],basedn[40]; scanf("%s %s",hostname,basedn); aValue.realloc(2); - aValue[0].Name = ::rtl::OUString("HostName"); - aValue[0].Value <<= rtl::OUString::createFromAscii(hostname); - aValue[1].Name = ::rtl::OUString("BaseDN"); - aValue[1].Value <<= rtl::OUString::createFromAscii(basedn); + aValue[0].Name = OUString("HostName"); + aValue[0].Value <<= OUString::createFromAscii(hostname); + aValue[1].Name = OUString("BaseDN"); + aValue[1].Value <<= OUString::createFromAscii(basedn); break; case 3: case 4: @@ -402,10 +399,10 @@ Reference< ::com::sun::star::sdbc::XConnection> TestConnected //Default LDAP AB url=OUString("sdbc:address:ldap://"); aValue.realloc(2); - aValue[0].Name = ::rtl::OUString("HostName"); - aValue[0].Value <<= rtl::OUString("sun-ds"); - aValue[1].Name = ::rtl::OUString("BaseDN"); - aValue[1].Value <<= rtl::OUString("dc=sun,dc=com"); + aValue[0].Name = OUString("HostName"); + aValue[0].Value <<= OUString("sun-ds"); + aValue[1].Name = OUString("BaseDN"); + aValue[1].Value <<= OUString("dc=sun,dc=com"); break; default: return pConnection; diff --git a/connectivity/workben/testmoz/mozthread.cxx b/connectivity/workben/testmoz/mozthread.cxx index a3b81b217a7d..dd649a8a1b98 100644 --- a/connectivity/workben/testmoz/mozthread.cxx +++ b/connectivity/workben/testmoz/mozthread.cxx @@ -74,8 +74,6 @@ using namespace com::sun::star::sdbc; using namespace com::sun::star::sdbcx; using namespace ::com::sun::star::container; -using ::rtl::OUString; -using ::rtl::OUStringToOString; extern Reference< XMultiServiceFactory > InitializeFac( void ); Reference< XMultiServiceFactory > mMgr; @@ -196,7 +194,7 @@ int TestMetaData(Reference< ::com::sun::star::sdbc::XConnection> &pConnection) makeAny(OUString("")), // Catalog OUString("%"), // Schema OUString("%"), // TabName - Sequence<rtl::OUString>() ); + Sequence<OUString>() ); printXResultSets( xRes ); } OSL_TRACE("Testing getTables() : END"); @@ -232,7 +230,7 @@ void TestQuery(Reference< ::com::sun::star::sdbc::XConnection> &pConnection) makeAny(OUString("")), // Catalog OUString("%"), // Schema OUString("%"), // TabName - Sequence<rtl::OUString>() ); + Sequence<OUString>() ); sal_Int32 nTables = 0; while( xRes.is() && xRes->next()) { @@ -286,10 +284,10 @@ Reference< ::com::sun::star::sdbc::XConnection> TestConnected case testLDAP: url=OUString("sdbc:address:ldap://"); aValue.realloc(2); - aValue[0].Name = ::rtl::OUString("HostName"); - aValue[0].Value <<= rtl::OUString("sun-ds"); - aValue[1].Name = ::rtl::OUString("BaseDN"); - aValue[1].Value <<= rtl::OUString("dc=sun,dc=com"); + aValue[0].Name = OUString("HostName"); + aValue[0].Value <<= OUString("sun-ds"); + aValue[1].Name = OUString("BaseDN"); + aValue[1].Value <<= OUString("dc=sun,dc=com"); break; case testMozilla: url=OUString("sdbc:address:mozilla://"); |