diff options
Diffstat (limited to 'connectivity/source/drivers/jdbc')
23 files changed, 228 insertions, 229 deletions
diff --git a/connectivity/source/drivers/jdbc/Array.cxx b/connectivity/source/drivers/jdbc/Array.cxx index d1e9cbd1a5a8..d5c71fa8d4fc 100644 --- a/connectivity/source/drivers/jdbc/Array.cxx +++ b/connectivity/source/drivers/jdbc/Array.cxx @@ -40,7 +40,7 @@ jclass java_sql_Array::getMyClass() const return theClass; } -::rtl::OUString SAL_CALL java_sql_Array::getBaseTypeName( ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException) +OUString SAL_CALL java_sql_Array::getBaseTypeName( ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException) { static jmethodID mID(NULL); return callStringMethod("getBaseTypeName",mID); diff --git a/connectivity/source/drivers/jdbc/CallableStatement.cxx b/connectivity/source/drivers/jdbc/CallableStatement.cxx index 73de2c931c32..7ab349f3e1fa 100644 --- a/connectivity/source/drivers/jdbc/CallableStatement.cxx +++ b/connectivity/source/drivers/jdbc/CallableStatement.cxx @@ -43,7 +43,7 @@ IMPLEMENT_SERVICE_INFO(java_sql_CallableStatement,"com.sun.star.sdbcx.ACallableS //************************************************************** //************ Class: java.sql.CallableStatement //************************************************************** -java_sql_CallableStatement::java_sql_CallableStatement( JNIEnv * pEnv, java_sql_Connection& _rCon,const ::rtl::OUString& sql ) +java_sql_CallableStatement::java_sql_CallableStatement( JNIEnv * pEnv, java_sql_Connection& _rCon,const OUString& sql ) : java_sql_PreparedStatement( pEnv, _rCon, sql ) { } @@ -167,7 +167,7 @@ sal_Int16 SAL_CALL java_sql_CallableStatement::getShort( sal_Int32 columnIndex ) return callMethodWithIntArg<jshort>(pCallMethod,"getShort","(I)S",mID,columnIndex); } -::rtl::OUString SAL_CALL java_sql_CallableStatement::getString( sal_Int32 columnIndex ) throw(starsdbc::SQLException, RuntimeException) +OUString SAL_CALL java_sql_CallableStatement::getString( sal_Int32 columnIndex ) throw(starsdbc::SQLException, RuntimeException) { ::osl::MutexGuard aGuard( m_aMutex ); checkDisposed(java_sql_Statement_BASE::rBHelper.bDisposed); @@ -197,7 +197,7 @@ sal_Int16 SAL_CALL java_sql_CallableStatement::getShort( sal_Int32 columnIndex ) return out ? static_cast <com::sun::star::util::DateTime> (java_sql_Timestamp( t.pEnv, out )) : ::com::sun::star::util::DateTime(); } -void SAL_CALL java_sql_CallableStatement::registerOutParameter( sal_Int32 parameterIndex, sal_Int32 sqlType, const ::rtl::OUString& typeName ) throw(starsdbc::SQLException, RuntimeException) +void SAL_CALL java_sql_CallableStatement::registerOutParameter( sal_Int32 parameterIndex, sal_Int32 sqlType, const OUString& typeName ) throw(starsdbc::SQLException, RuntimeException) { ::osl::MutexGuard aGuard( m_aMutex ); checkDisposed(java_sql_Statement_BASE::rBHelper.bDisposed); diff --git a/connectivity/source/drivers/jdbc/Class.cxx b/connectivity/source/drivers/jdbc/Class.cxx index ec19bb5cd61b..5d03bd3448da 100644 --- a/connectivity/source/drivers/jdbc/Class.cxx +++ b/connectivity/source/drivers/jdbc/Class.cxx @@ -39,13 +39,13 @@ jclass java_lang_Class::getMyClass() const return theClass; } -java_lang_Class * java_lang_Class::forName( const ::rtl::OUString& _par0 ) +java_lang_Class * java_lang_Class::forName( const OUString& _par0 ) { jobject out(NULL); SDBThreadAttach t; { - ::rtl::OString sClassName = ::rtl::OUStringToOString(_par0, RTL_TEXTENCODING_JAVA_UTF8); + OString sClassName = OUStringToOString(_par0, RTL_TEXTENCODING_JAVA_UTF8); sClassName = sClassName.replace('.','/'); out = t.pEnv->FindClass(sClassName.getStr()); ThrowSQLException(t.pEnv,0); diff --git a/connectivity/source/drivers/jdbc/Clob.cxx b/connectivity/source/drivers/jdbc/Clob.cxx index fd781de276e8..d707c572ca69 100644 --- a/connectivity/source/drivers/jdbc/Clob.cxx +++ b/connectivity/source/drivers/jdbc/Clob.cxx @@ -67,11 +67,11 @@ sal_Int64 SAL_CALL java_sql_Clob::length( ) throw(::com::sun::star::sdbc::SQLEx return (sal_Int64)out; } -::rtl::OUString SAL_CALL java_sql_Clob::getSubString( sal_Int64 pos, sal_Int32 subStringLength ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException) +OUString SAL_CALL java_sql_Clob::getSubString( sal_Int64 pos, sal_Int32 subStringLength ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException) { RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "jdbc", "Ocke.Janssen@sun.com", "java_sql_Clob::getSubString" ); SDBThreadAttach t; OSL_ENSURE(t.pEnv,"Java Enviroment geloescht worden!"); - ::rtl::OUString aStr; + OUString aStr; { // initialize temporary variable static const char * cSignature = "(JI)Ljava/lang/String;"; @@ -98,7 +98,7 @@ sal_Int64 SAL_CALL java_sql_Clob::length( ) throw(::com::sun::star::sdbc::SQLEx return out==0 ? 0 : new java_io_Reader( t.pEnv, out ); } -sal_Int64 SAL_CALL java_sql_Clob::position( const ::rtl::OUString& searchstr, sal_Int32 start ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException) +sal_Int64 SAL_CALL java_sql_Clob::position( const OUString& searchstr, sal_Int32 start ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException) { RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "jdbc", "Ocke.Janssen@sun.com", "java_sql_Clob::position" ); jlong out(0); diff --git a/connectivity/source/drivers/jdbc/ConnectionLog.cxx b/connectivity/source/drivers/jdbc/ConnectionLog.cxx index 4f0b748c8c49..550db58ec1ec 100644 --- a/connectivity/source/drivers/jdbc/ConnectionLog.cxx +++ b/connectivity/source/drivers/jdbc/ConnectionLog.cxx @@ -83,34 +83,34 @@ namespace comphelper { namespace log { namespace convert using ::com::sun::star::util::DateTime; //-------------------------------------------------------------------- - ::rtl::OUString convertLogArgToString( const Date& _rDate ) + OUString convertLogArgToString( const Date& _rDate ) { char buffer[ 30 ]; const size_t buffer_size = sizeof( buffer ); snprintf( buffer, buffer_size, "%04i-%02i-%02i", (int)_rDate.Year, (int)_rDate.Month, (int)_rDate.Day ); - return ::rtl::OUString::createFromAscii( buffer ); + return OUString::createFromAscii( buffer ); } //-------------------------------------------------------------------- - ::rtl::OUString convertLogArgToString( const Time& _rTime ) + OUString convertLogArgToString( const Time& _rTime ) { char buffer[ 30 ]; const size_t buffer_size = sizeof( buffer ); snprintf( buffer, buffer_size, "%02i:%02i:%02i.%02i", (int)_rTime.Hours, (int)_rTime.Minutes, (int)_rTime.Seconds, (int)_rTime.HundredthSeconds ); - return ::rtl::OUString::createFromAscii( buffer ); + return OUString::createFromAscii( buffer ); } //-------------------------------------------------------------------- - ::rtl::OUString convertLogArgToString( const DateTime& _rDateTime ) + OUString convertLogArgToString( const DateTime& _rDateTime ) { char buffer[ 30 ]; const size_t buffer_size = sizeof( buffer ); snprintf( buffer, buffer_size, "%04i-%02i-%02i %02i:%02i:%02i.%02i", (int)_rDateTime.Year, (int)_rDateTime.Month, (int)_rDateTime.Day, (int)_rDateTime.Hours, (int)_rDateTime.Minutes, (int)_rDateTime.Seconds, (int)_rDateTime.HundredthSeconds ); - return ::rtl::OUString::createFromAscii( buffer ); + return OUString::createFromAscii( buffer ); } //........................................................................ diff --git a/connectivity/source/drivers/jdbc/DatabaseMetaData.cxx b/connectivity/source/drivers/jdbc/DatabaseMetaData.cxx index 61722dd1df4d..ce6d2fd00c4e 100644 --- a/connectivity/source/drivers/jdbc/DatabaseMetaData.cxx +++ b/connectivity/source/drivers/jdbc/DatabaseMetaData.cxx @@ -80,7 +80,7 @@ Reference< XResultSet > SAL_CALL java_sql_DatabaseMetaData::getCatalogs( ) thro return impl_callResultSetMethod( "getCatalogs", mID ); } // ------------------------------------------------------------------------- -::rtl::OUString java_sql_DatabaseMetaData::impl_getCatalogSeparator_throw( ) +OUString java_sql_DatabaseMetaData::impl_getCatalogSeparator_throw( ) { static jmethodID mID(NULL); return impl_callStringMethod( "getCatalogSeparator", mID ); @@ -93,14 +93,14 @@ Reference< XResultSet > SAL_CALL java_sql_DatabaseMetaData::getSchemas( ) throw } // ------------------------------------------------------------------------- Reference< XResultSet > SAL_CALL java_sql_DatabaseMetaData::getColumnPrivileges( - const Any& catalog, const ::rtl::OUString& schema, const ::rtl::OUString& table, const ::rtl::OUString& columnNamePattern ) throw(SQLException, RuntimeException) + const Any& catalog, const OUString& schema, const OUString& table, const OUString& columnNamePattern ) throw(SQLException, RuntimeException) { static jmethodID mID(NULL); return impl_callResultSetMethodWithStrings( "getColumnPrivileges", mID, catalog, schema, table, &columnNamePattern ); } // ------------------------------------------------------------------------- Reference< XResultSet > SAL_CALL java_sql_DatabaseMetaData::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) { static jmethodID mID(NULL); return impl_callResultSetMethodWithStrings( "getColumns", mID, catalog, schemaPattern, tableNamePattern, &columnNamePattern ); @@ -108,7 +108,7 @@ Reference< XResultSet > SAL_CALL java_sql_DatabaseMetaData::getColumns( // ------------------------------------------------------------------------- Reference< XResultSet > SAL_CALL java_sql_DatabaseMetaData::getTables( - const Any& catalog, const ::rtl::OUString& schemaPattern, const ::rtl::OUString& tableNamePattern, const Sequence< ::rtl::OUString >& _types ) throw(SQLException, RuntimeException) + const Any& catalog, const OUString& schemaPattern, const OUString& tableNamePattern, const Sequence< OUString >& _types ) throw(SQLException, RuntimeException) { static const char * cSignature = "(Ljava/lang/String;Ljava/lang/String;Ljava/lang/String;[Ljava/lang/String;)Ljava/sql/ResultSet;"; static const char * cMethodName = "getTables"; @@ -131,7 +131,7 @@ Reference< XResultSet > SAL_CALL java_sql_DatabaseMetaData::getTables( { jobjectArray pObjArray = static_cast< jobjectArray >( t.pEnv->NewObjectArray( (jsize)typeFilterCount, java_lang_String::st_getMyClass(), 0 ) ); OSL_VERIFY_RES( !isExceptionOccurred( t.pEnv, sal_True ), "Exception occurred!" ); - const ::rtl::OUString* typeFilter = _types.getConstArray(); + const OUString* typeFilter = _types.getConstArray(); bool bIncludeAllTypes = false; for ( sal_Int32 i=0; i<typeFilterCount; ++i, ++typeFilter ) { @@ -222,21 +222,21 @@ Reference< XResultSet > SAL_CALL java_sql_DatabaseMetaData::getTables( } // ------------------------------------------------------------------------- Reference< XResultSet > SAL_CALL java_sql_DatabaseMetaData::getProcedureColumns( - const Any& catalog, const ::rtl::OUString& schemaPattern, const ::rtl::OUString& procedureNamePattern, const ::rtl::OUString& columnNamePattern ) throw(SQLException, RuntimeException) + const Any& catalog, const OUString& schemaPattern, const OUString& procedureNamePattern, const OUString& columnNamePattern ) throw(SQLException, RuntimeException) { static jmethodID mID(NULL); return impl_callResultSetMethodWithStrings( "getProcedureColumns", mID, catalog, schemaPattern, procedureNamePattern, &columnNamePattern ); } // ------------------------------------------------------------------------- Reference< XResultSet > SAL_CALL java_sql_DatabaseMetaData::getProcedures( const Any& - catalog, const ::rtl::OUString& schemaPattern, const ::rtl::OUString& procedureNamePattern ) throw(SQLException, RuntimeException) + catalog, const OUString& schemaPattern, const OUString& procedureNamePattern ) throw(SQLException, RuntimeException) { static jmethodID mID(NULL); return impl_callResultSetMethodWithStrings( "getProcedures", mID, catalog, schemaPattern, procedureNamePattern ); } // ------------------------------------------------------------------------- Reference< XResultSet > SAL_CALL java_sql_DatabaseMetaData::getVersionColumns( - const Any& catalog, const ::rtl::OUString& schema, const ::rtl::OUString& table ) throw(SQLException, RuntimeException) + const Any& catalog, const OUString& schema, const OUString& table ) throw(SQLException, RuntimeException) { static jmethodID mID(NULL); return impl_callResultSetMethodWithStrings( "getVersionColumns", mID, catalog, schema, table ); @@ -315,28 +315,28 @@ sal_Int32 java_sql_DatabaseMetaData::impl_getMaxTablesInSelect_throw( ) } // ------------------------------------------------------------------------- Reference< XResultSet > SAL_CALL java_sql_DatabaseMetaData::getExportedKeys( - const Any& catalog, const ::rtl::OUString& schema, const ::rtl::OUString& table ) throw(SQLException, RuntimeException) + const Any& catalog, const OUString& schema, const OUString& table ) throw(SQLException, RuntimeException) { static jmethodID mID(NULL); return impl_callResultSetMethodWithStrings( "getExportedKeys", mID, catalog, schema, table ); } // ------------------------------------------------------------------------- Reference< XResultSet > SAL_CALL java_sql_DatabaseMetaData::getImportedKeys( - const Any& catalog, const ::rtl::OUString& schema, const ::rtl::OUString& table ) throw(SQLException, RuntimeException) + const Any& catalog, const OUString& schema, const OUString& table ) throw(SQLException, RuntimeException) { static jmethodID mID(NULL); return impl_callResultSetMethodWithStrings( "getImportedKeys", mID, catalog, schema, table ); } // ------------------------------------------------------------------------- Reference< XResultSet > SAL_CALL java_sql_DatabaseMetaData::getPrimaryKeys( - const Any& catalog, const ::rtl::OUString& schema, const ::rtl::OUString& table ) throw(SQLException, RuntimeException) + const Any& catalog, const OUString& schema, const OUString& table ) throw(SQLException, RuntimeException) { static jmethodID mID(NULL); return impl_callResultSetMethodWithStrings( "getPrimaryKeys", mID, catalog, schema, table ); } // ------------------------------------------------------------------------- Reference< XResultSet > SAL_CALL java_sql_DatabaseMetaData::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) { static const char * cSignature = "(Ljava/lang/String;Ljava/lang/String;Ljava/lang/String;ZZ)Ljava/sql/ResultSet;"; @@ -377,7 +377,7 @@ Reference< XResultSet > SAL_CALL java_sql_DatabaseMetaData::getIndexInfo( } // ------------------------------------------------------------------------- Reference< XResultSet > SAL_CALL java_sql_DatabaseMetaData::getBestRowIdentifier( - const Any& catalog, const ::rtl::OUString& schema, const ::rtl::OUString& table, sal_Int32 scope, + const Any& catalog, const OUString& schema, const OUString& table, sal_Int32 scope, sal_Bool nullable ) throw(SQLException, RuntimeException) { static const char * cSignature = "(Ljava/lang/String;Ljava/lang/String;Ljava/lang/String;IZ)Ljava/sql/ResultSet;"; @@ -417,7 +417,7 @@ Reference< XResultSet > SAL_CALL java_sql_DatabaseMetaData::getBestRowIdentifier } // ------------------------------------------------------------------------- Reference< XResultSet > SAL_CALL java_sql_DatabaseMetaData::getTablePrivileges( - const Any& catalog, const ::rtl::OUString& schemaPattern, const ::rtl::OUString& tableNamePattern ) throw(SQLException, RuntimeException) + const Any& catalog, const OUString& schemaPattern, const OUString& tableNamePattern ) throw(SQLException, RuntimeException) { if ( m_pConnection->isIgnoreDriverPrivilegesEnabled() ) return new OResultSetPrivileges(this,catalog,schemaPattern,tableNamePattern); @@ -436,17 +436,17 @@ Reference< XResultSet > SAL_CALL java_sql_DatabaseMetaData::getTablePrivileges( { // here we know that the count of column doesn't match ::std::map<sal_Int32,sal_Int32> aColumnMatching; - static const ::rtl::OUString sPrivs[] = { - ::rtl::OUString("TABLE_CAT"), - ::rtl::OUString("TABLE_SCHEM"), - ::rtl::OUString("TABLE_NAME"), - ::rtl::OUString("GRANTOR"), - ::rtl::OUString("GRANTEE"), - ::rtl::OUString("PRIVILEGE"), - ::rtl::OUString("IS_GRANTABLE") + static const OUString sPrivs[] = { + OUString("TABLE_CAT"), + OUString("TABLE_SCHEM"), + OUString("TABLE_NAME"), + OUString("GRANTOR"), + OUString("GRANTEE"), + OUString("PRIVILEGE"), + OUString("IS_GRANTABLE") }; - ::rtl::OUString sColumnName; + OUString sColumnName; sal_Int32 nCount = xMeta->getColumnCount(); for (sal_Int32 i = 1 ; i <= nCount ; ++i) { @@ -467,7 +467,7 @@ Reference< XResultSet > SAL_CALL java_sql_DatabaseMetaData::getTablePrivileges( xReturn = pNewPrivRes; ODatabaseMetaDataResultSet::ORows aRows; Reference< XRow > xRow(xTemp,UNO_QUERY); - ::rtl::OUString sValue; + OUString sValue; ODatabaseMetaDataResultSet::ORow aRow(8); while ( xRow.is() && xTemp->next() ) @@ -493,9 +493,9 @@ Reference< XResultSet > SAL_CALL java_sql_DatabaseMetaData::getTablePrivileges( } // ------------------------------------------------------------------------- Reference< XResultSet > SAL_CALL java_sql_DatabaseMetaData::getCrossReference( - const Any& primaryCatalog, const ::rtl::OUString& primarySchema, - const ::rtl::OUString& primaryTable, const Any& foreignCatalog, - const ::rtl::OUString& foreignSchema, const ::rtl::OUString& foreignTable ) throw(SQLException, RuntimeException) + const Any& primaryCatalog, const OUString& primarySchema, + const OUString& primaryTable, const Any& foreignCatalog, + const OUString& foreignSchema, const OUString& foreignTable ) throw(SQLException, RuntimeException) { static const char * cSignature = "(Ljava/lang/String;Ljava/lang/String;Ljava/lang/String;Ljava/lang/String;Ljava/lang/String;Ljava/lang/String;)Ljava/sql/ResultSet;"; static const char * cMethodName = "getCrossReference"; @@ -551,16 +551,16 @@ sal_Bool java_sql_DatabaseMetaData::impl_callBooleanMethod( const char* _pMethod } // ------------------------------------------------------------------------- -::rtl::OUString java_sql_DatabaseMetaData::impl_callStringMethod( const char* _pMethodName, jmethodID& _inout_MethodID ) +OUString java_sql_DatabaseMetaData::impl_callStringMethod( const char* _pMethodName, jmethodID& _inout_MethodID ) { m_aLogger.log( LogLevel::FINEST, STR_LOG_META_DATA_METHOD, _pMethodName ); - const ::rtl::OUString sReturn( callStringMethod(_pMethodName,_inout_MethodID) ); + const OUString sReturn( callStringMethod(_pMethodName,_inout_MethodID) ); if ( m_aLogger.isLoggable( LogLevel::FINEST ) ) { - ::rtl::OUString sLoggedResult( sReturn ); + OUString sLoggedResult( sReturn ); if ( sLoggedResult.isEmpty() ) - sLoggedResult = ::rtl::OUString( "<empty string>" ); + sLoggedResult = OUString( "<empty string>" ); m_aLogger.log( LogLevel::FINEST, STR_LOG_META_DATA_RESULT, _pMethodName, sLoggedResult ); } @@ -599,11 +599,11 @@ Reference< XResultSet > java_sql_DatabaseMetaData::impl_callResultSetMethod( con // ------------------------------------------------------------------------- Reference< XResultSet > java_sql_DatabaseMetaData::impl_callResultSetMethodWithStrings( const char* _pMethodName, jmethodID& _inout_MethodID, - const Any& _rCatalog, const ::rtl::OUString& _rSchemaPattern, const ::rtl::OUString& _rLeastPattern, - const ::rtl::OUString* _pOptionalAdditionalString ) + const Any& _rCatalog, const OUString& _rSchemaPattern, const OUString& _rLeastPattern, + const OUString* _pOptionalAdditionalString ) { bool bCatalog = _rCatalog.hasValue(); - ::rtl::OUString sCatalog; + OUString sCatalog; _rCatalog >>= sCatalog; bool bSchema = _rSchemaPattern.toChar() != '%'; @@ -611,8 +611,8 @@ Reference< XResultSet > java_sql_DatabaseMetaData::impl_callResultSetMethodWithS // log the call if ( m_aLogger.isLoggable( LogLevel::FINEST ) ) { - ::rtl::OUString sCatalogLog = bCatalog ? sCatalog : ::rtl::OUString( "null" ); - ::rtl::OUString sSchemaLog = bSchema ? _rSchemaPattern : ::rtl::OUString( "null" ); + OUString sCatalogLog = bCatalog ? sCatalog : OUString( "null" ); + OUString sSchemaLog = bSchema ? _rSchemaPattern : OUString( "null" ); if ( _pOptionalAdditionalString ) m_aLogger.log( LogLevel::FINEST, STR_LOG_META_DATA_METHOD_ARG4, _pMethodName, sCatalogLog, sSchemaLog, _rLeastPattern, *_pOptionalAdditionalString ); else @@ -735,19 +735,19 @@ sal_Bool SAL_CALL java_sql_DatabaseMetaData::supportsNonNullableColumns( ) thro return impl_callBooleanMethod( "supportsNonNullableColumns", mID ); } // ------------------------------------------------------------------------- -::rtl::OUString SAL_CALL java_sql_DatabaseMetaData::getCatalogTerm( ) throw(SQLException, RuntimeException) +OUString SAL_CALL java_sql_DatabaseMetaData::getCatalogTerm( ) throw(SQLException, RuntimeException) { static jmethodID mID(NULL); return impl_callStringMethod( "getCatalogTerm", mID ); } // ------------------------------------------------------------------------- -::rtl::OUString java_sql_DatabaseMetaData::impl_getIdentifierQuoteString_throw( ) +OUString java_sql_DatabaseMetaData::impl_getIdentifierQuoteString_throw( ) { static jmethodID mID(NULL); return impl_callStringMethod( "getIdentifierQuoteString", mID ); } // ------------------------------------------------------------------------- -::rtl::OUString SAL_CALL java_sql_DatabaseMetaData::getExtraNameCharacters( ) throw(SQLException, RuntimeException) +OUString SAL_CALL java_sql_DatabaseMetaData::getExtraNameCharacters( ) throw(SQLException, RuntimeException) { static jmethodID mID(NULL); return impl_callStringMethod( "getExtraNameCharacters", mID ); @@ -1163,9 +1163,9 @@ sal_Bool SAL_CALL java_sql_DatabaseMetaData::supportsANSI92IntermediateSQL( ) t return impl_callBooleanMethod( "supportsANSI92IntermediateSQL", mID ); } // ------------------------------------------------------------------------- -::rtl::OUString SAL_CALL java_sql_DatabaseMetaData::getURL( ) throw(SQLException, RuntimeException) +OUString SAL_CALL java_sql_DatabaseMetaData::getURL( ) throw(SQLException, RuntimeException) { - ::rtl::OUString sURL = m_pConnection->getURL(); + OUString sURL = m_pConnection->getURL(); if ( sURL.isEmpty() ) { static jmethodID mID(NULL); @@ -1174,43 +1174,43 @@ sal_Bool SAL_CALL java_sql_DatabaseMetaData::supportsANSI92IntermediateSQL( ) t return sURL; } // ------------------------------------------------------------------------- -::rtl::OUString SAL_CALL java_sql_DatabaseMetaData::getUserName( ) throw(SQLException, RuntimeException) +OUString SAL_CALL java_sql_DatabaseMetaData::getUserName( ) throw(SQLException, RuntimeException) { static jmethodID mID(NULL); return impl_callStringMethod( "getUserName", mID ); } // ------------------------------------------------------------------------- -::rtl::OUString SAL_CALL java_sql_DatabaseMetaData::getDriverName( ) throw(SQLException, RuntimeException) +OUString SAL_CALL java_sql_DatabaseMetaData::getDriverName( ) throw(SQLException, RuntimeException) { static jmethodID mID(NULL); return impl_callStringMethod( "getDriverName", mID ); } // ------------------------------------------------------------------------- -::rtl::OUString SAL_CALL java_sql_DatabaseMetaData::getDriverVersion( ) throw(SQLException, RuntimeException) +OUString SAL_CALL java_sql_DatabaseMetaData::getDriverVersion( ) throw(SQLException, RuntimeException) { static jmethodID mID(NULL); return impl_callStringMethod( "getDriverVersion", mID ); } // ------------------------------------------------------------------------- -::rtl::OUString SAL_CALL java_sql_DatabaseMetaData::getDatabaseProductVersion( ) throw(SQLException, RuntimeException) +OUString SAL_CALL java_sql_DatabaseMetaData::getDatabaseProductVersion( ) throw(SQLException, RuntimeException) { static jmethodID mID(NULL); return impl_callStringMethod( "getDatabaseProductVersion", mID ); } // ------------------------------------------------------------------------- -::rtl::OUString SAL_CALL java_sql_DatabaseMetaData::getDatabaseProductName( ) throw(SQLException, RuntimeException) +OUString SAL_CALL java_sql_DatabaseMetaData::getDatabaseProductName( ) throw(SQLException, RuntimeException) { static jmethodID mID(NULL); return impl_callStringMethod( "getDatabaseProductName", mID ); } // ------------------------------------------------------------------------- -::rtl::OUString SAL_CALL java_sql_DatabaseMetaData::getProcedureTerm( ) throw(SQLException, RuntimeException) +OUString SAL_CALL java_sql_DatabaseMetaData::getProcedureTerm( ) throw(SQLException, RuntimeException) { static jmethodID mID(NULL); return impl_callStringMethod( "getProcedureTerm", mID ); } // ------------------------------------------------------------------------- -::rtl::OUString SAL_CALL java_sql_DatabaseMetaData::getSchemaTerm( ) throw(SQLException, RuntimeException) +OUString SAL_CALL java_sql_DatabaseMetaData::getSchemaTerm( ) throw(SQLException, RuntimeException) { static jmethodID mID(NULL); return impl_callStringMethod( "getSchemaTerm", mID ); @@ -1234,37 +1234,37 @@ sal_Int32 SAL_CALL java_sql_DatabaseMetaData::getDriverMinorVersion( ) throw(Ru return impl_callIntMethod( "getDriverMinorVersion", mID ); } // ------------------------------------------------------------------------- -::rtl::OUString SAL_CALL java_sql_DatabaseMetaData::getSQLKeywords( ) throw(SQLException, RuntimeException) +OUString SAL_CALL java_sql_DatabaseMetaData::getSQLKeywords( ) throw(SQLException, RuntimeException) { static jmethodID mID(NULL); return impl_callStringMethod( "getSQLKeywords", mID ); } // ------------------------------------------------------------------------- -::rtl::OUString SAL_CALL java_sql_DatabaseMetaData::getSearchStringEscape( ) throw(SQLException, RuntimeException) +OUString SAL_CALL java_sql_DatabaseMetaData::getSearchStringEscape( ) throw(SQLException, RuntimeException) { static jmethodID mID(NULL); return impl_callStringMethod( "getSearchStringEscape", mID ); } // ------------------------------------------------------------------------- -::rtl::OUString SAL_CALL java_sql_DatabaseMetaData::getStringFunctions( ) throw(SQLException, RuntimeException) +OUString SAL_CALL java_sql_DatabaseMetaData::getStringFunctions( ) throw(SQLException, RuntimeException) { static jmethodID mID(NULL); return impl_callStringMethod( "getStringFunctions", mID ); } // ------------------------------------------------------------------------- -::rtl::OUString SAL_CALL java_sql_DatabaseMetaData::getTimeDateFunctions( ) throw(SQLException, RuntimeException) +OUString SAL_CALL java_sql_DatabaseMetaData::getTimeDateFunctions( ) throw(SQLException, RuntimeException) { static jmethodID mID(NULL); return impl_callStringMethod( "getTimeDateFunctions", mID ); } // ------------------------------------------------------------------------- -::rtl::OUString SAL_CALL java_sql_DatabaseMetaData::getSystemFunctions( ) throw(SQLException, RuntimeException) +OUString SAL_CALL java_sql_DatabaseMetaData::getSystemFunctions( ) throw(SQLException, RuntimeException) { static jmethodID mID(NULL); return impl_callStringMethod( "getSystemFunctions", mID ); } // ------------------------------------------------------------------------- -::rtl::OUString SAL_CALL java_sql_DatabaseMetaData::getNumericFunctions( ) throw(SQLException, RuntimeException) +OUString SAL_CALL java_sql_DatabaseMetaData::getNumericFunctions( ) throw(SQLException, RuntimeException) { static jmethodID mID(NULL); return impl_callStringMethod( "getNumericFunctions", mID ); @@ -1410,7 +1410,7 @@ sal_Bool SAL_CALL java_sql_DatabaseMetaData::supportsBatchUpdates( ) throw(SQLE } // ------------------------------------------------------------------------- Reference< XResultSet > SAL_CALL java_sql_DatabaseMetaData::getUDTs( - const Any& catalog, const ::rtl::OUString& schemaPattern, const ::rtl::OUString& typeNamePattern, + const Any& catalog, const OUString& schemaPattern, const OUString& typeNamePattern, const Sequence< sal_Int32 >& types ) throw(SQLException, RuntimeException) { jobject out(0); diff --git a/connectivity/source/drivers/jdbc/DriverPropertyInfo.cxx b/connectivity/source/drivers/jdbc/DriverPropertyInfo.cxx index c60f92a270cc..f510d8cc93d9 100644 --- a/connectivity/source/drivers/jdbc/DriverPropertyInfo.cxx +++ b/connectivity/source/drivers/jdbc/DriverPropertyInfo.cxx @@ -60,9 +60,9 @@ java_sql_DriverPropertyInfo::operator starsdbc::DriverPropertyInfo() return aInfo; } // -------------------------------------------------------------------------------- -::rtl::OUString java_sql_DriverPropertyInfo::name() +OUString java_sql_DriverPropertyInfo::name() { - ::rtl::OUString aStr; + OUString aStr; SDBThreadAttach t; OSL_ENSURE(t.pEnv,"Java Enviroment geloescht worden!"); { @@ -73,9 +73,9 @@ java_sql_DriverPropertyInfo::operator starsdbc::DriverPropertyInfo() return aStr; } // -------------------------------------------------------------------------------- -::rtl::OUString java_sql_DriverPropertyInfo::description() +OUString java_sql_DriverPropertyInfo::description() { - ::rtl::OUString aStr; + OUString aStr; SDBThreadAttach t; OSL_ENSURE(t.pEnv,"Java Enviroment geloescht worden!"); { @@ -86,9 +86,9 @@ java_sql_DriverPropertyInfo::operator starsdbc::DriverPropertyInfo() return aStr; } // -------------------------------------------------------------------------------- -::rtl::OUString java_sql_DriverPropertyInfo::value() +OUString java_sql_DriverPropertyInfo::value() { - ::rtl::OUString aStr; + OUString aStr; SDBThreadAttach t; OSL_ENSURE(t.pEnv,"Java Enviroment geloescht worden!"); { @@ -112,7 +112,7 @@ sal_Bool java_sql_DriverPropertyInfo::required() return out; } // -------------------------------------------------------------------------------- -Sequence< ::rtl::OUString> java_sql_DriverPropertyInfo::choices() +Sequence< OUString> java_sql_DriverPropertyInfo::choices() { SDBThreadAttach t; OSL_ENSURE(t.pEnv,"Java Enviroment geloescht worden!"); @@ -121,11 +121,11 @@ Sequence< ::rtl::OUString> java_sql_DriverPropertyInfo::choices() if(id) { const java_lang_String * pEmpty = NULL; - const ::rtl::OUString * pEmpty2 = NULL; + const OUString * pEmpty2 = NULL; return copyArrayAndDelete(t.pEnv,(jobjectArray)t.pEnv->GetObjectField( object, id), pEmpty2, pEmpty); } } //t.pEnv - return Sequence< ::rtl::OUString>(); + return Sequence< OUString>(); } // -------------------------------------------------------------------------------- diff --git a/connectivity/source/drivers/jdbc/InputStream.cxx b/connectivity/source/drivers/jdbc/InputStream.cxx index 5332c063a66c..c274d51f5835 100644 --- a/connectivity/source/drivers/jdbc/InputStream.cxx +++ b/connectivity/source/drivers/jdbc/InputStream.cxx @@ -72,7 +72,7 @@ void SAL_CALL java_io_InputStream::closeInput( ) throw(::com::sun::star::io::No sal_Int32 SAL_CALL java_io_InputStream::readBytes( ::com::sun::star::uno::Sequence< sal_Int8 >& aData, sal_Int32 nBytesToRead ) throw(::com::sun::star::io::NotConnectedException, ::com::sun::star::io::BufferSizeExceededException, ::com::sun::star::io::IOException, ::com::sun::star::uno::RuntimeException) { if (nBytesToRead < 0) - throw ::com::sun::star::io::BufferSizeExceededException( ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( OSL_LOG_PREFIX ) ), *this ); + throw ::com::sun::star::io::BufferSizeExceededException( OUString( RTL_CONSTASCII_USTRINGPARAM( OSL_LOG_PREFIX ) ), *this ); jint out(0); SDBThreadAttach t; OSL_ENSURE(t.pEnv,"Java Enviroment geloescht worden!"); diff --git a/connectivity/source/drivers/jdbc/JBigDecimal.cxx b/connectivity/source/drivers/jdbc/JBigDecimal.cxx index 9dd05410ddc1..67ab1772ae6f 100644 --- a/connectivity/source/drivers/jdbc/JBigDecimal.cxx +++ b/connectivity/source/drivers/jdbc/JBigDecimal.cxx @@ -38,7 +38,7 @@ jclass java_math_BigDecimal::getMyClass() const return theClass; } -java_math_BigDecimal::java_math_BigDecimal( const ::rtl::OUString& _par0 ): java_lang_Object( NULL, (jobject)NULL ) +java_math_BigDecimal::java_math_BigDecimal( const OUString& _par0 ): java_lang_Object( NULL, (jobject)NULL ) { SDBThreadAttach t; if( !t.pEnv ) diff --git a/connectivity/source/drivers/jdbc/JConnection.cxx b/connectivity/source/drivers/jdbc/JConnection.cxx index ec2e62bbce4d..db94bbe18ba9 100644 --- a/connectivity/source/drivers/jdbc/JConnection.cxx +++ b/connectivity/source/drivers/jdbc/JConnection.cxx @@ -59,12 +59,12 @@ namespace { struct ClassMapEntry { ClassMapEntry( - rtl::OUString const & theClassPath, rtl::OUString const & theClassName): + OUString const & theClassPath, OUString const & theClassName): classPath(theClassPath), className(theClassName), classLoader(NULL), classObject(NULL) {} - rtl::OUString classPath; - rtl::OUString className; + OUString classPath; + OUString className; jweak classLoader; jweak classObject; }; @@ -125,7 +125,7 @@ bool getLocalFromWeakRef( jweak& _weak, LocalRef< T >& _inout_local ) // If false is returned, a (still pending) JNI exception occurred. bool loadClass( Reference< XComponentContext > const & context, JNIEnv& environment, - rtl::OUString const & classPath, rtl::OUString const & name, + OUString const & classPath, OUString const & name, LocalRef< jobject > * classLoaderPtr, LocalRef< jclass > * classPtr) { OSL_ASSERT(classLoaderPtr != NULL); @@ -321,7 +321,7 @@ jclass java_sql_Connection::getMyClass() const } // ------------------------------------------------------------------------- -::rtl::OUString SAL_CALL java_sql_Connection::getCatalog( ) throw(SQLException, RuntimeException) +OUString SAL_CALL java_sql_Connection::getCatalog( ) throw(SQLException, RuntimeException) { ::osl::MutexGuard aGuard( m_aMutex ); checkDisposed(java_sql_Connection_BASE::rBHelper.bDisposed); @@ -379,7 +379,7 @@ sal_Bool SAL_CALL java_sql_Connection::isReadOnly( ) throw(SQLException, Runtim return callBooleanMethod( "isReadOnly", mID ); } // ------------------------------------------------------------------------- -void SAL_CALL java_sql_Connection::setCatalog( const ::rtl::OUString& catalog ) throw(SQLException, RuntimeException) +void SAL_CALL java_sql_Connection::setCatalog( const OUString& catalog ) throw(SQLException, RuntimeException) { static jmethodID mID(NULL); callVoidMethodWithStringArg("setCatalog",mID,catalog); @@ -463,16 +463,16 @@ Reference< XStatement > SAL_CALL java_sql_Connection::createStatement( ) throw( return xStmt; } // ----------------------------------------------------------------------------- -::rtl::OUString java_sql_Connection::transFormPreparedStatement(const ::rtl::OUString& _sSQL) +OUString java_sql_Connection::transFormPreparedStatement(const OUString& _sSQL) { - ::rtl::OUString sSqlStatement = _sSQL; + OUString sSqlStatement = _sSQL; if ( m_bParameterSubstitution ) { try { OSQLParser aParser( m_pDriver->getContext() ); - ::rtl::OUString sErrorMessage; - ::rtl::OUString sNewSql; + OUString sErrorMessage; + OUString sNewSql; OSQLParseNode* pNode = aParser.parseTree(sErrorMessage,_sSQL); if(pNode) { // special handling for parameters @@ -489,14 +489,14 @@ Reference< XStatement > SAL_CALL java_sql_Connection::createStatement( ) throw( return sSqlStatement; } // ------------------------------------------------------------------------- -Reference< XPreparedStatement > SAL_CALL java_sql_Connection::prepareStatement( const ::rtl::OUString& sql ) throw(SQLException, RuntimeException) +Reference< XPreparedStatement > SAL_CALL java_sql_Connection::prepareStatement( const OUString& sql ) throw(SQLException, RuntimeException) { ::osl::MutexGuard aGuard( m_aMutex ); checkDisposed(java_sql_Connection_BASE::rBHelper.bDisposed); m_aLogger.log( LogLevel::FINE, STR_LOG_PREPARE_STATEMENT, sql ); SDBThreadAttach t; - ::rtl::OUString sSqlStatement = sql; + OUString sSqlStatement = sql; sSqlStatement = transFormPreparedStatement( sSqlStatement ); java_sql_PreparedStatement* pStatement = new java_sql_PreparedStatement( t.pEnv, *this, sSqlStatement ); @@ -507,14 +507,14 @@ Reference< XPreparedStatement > SAL_CALL java_sql_Connection::prepareStatement( return xReturn; } // ------------------------------------------------------------------------- -Reference< XPreparedStatement > SAL_CALL java_sql_Connection::prepareCall( const ::rtl::OUString& sql ) throw(SQLException, RuntimeException) +Reference< XPreparedStatement > SAL_CALL java_sql_Connection::prepareCall( const OUString& sql ) throw(SQLException, RuntimeException) { ::osl::MutexGuard aGuard( m_aMutex ); checkDisposed(java_sql_Connection_BASE::rBHelper.bDisposed); m_aLogger.log( LogLevel::FINE, STR_LOG_PREPARE_CALL, sql ); SDBThreadAttach t; - ::rtl::OUString sSqlStatement = sql; + OUString sSqlStatement = sql; sSqlStatement = transFormPreparedStatement( sSqlStatement ); java_sql_CallableStatement* pStatement = new java_sql_CallableStatement( t.pEnv, *this, sSqlStatement ); @@ -525,12 +525,12 @@ Reference< XPreparedStatement > SAL_CALL java_sql_Connection::prepareCall( const return xStmt; } // ------------------------------------------------------------------------- -::rtl::OUString SAL_CALL java_sql_Connection::nativeSQL( const ::rtl::OUString& sql ) throw(SQLException, RuntimeException) +OUString SAL_CALL java_sql_Connection::nativeSQL( const OUString& sql ) throw(SQLException, RuntimeException) { ::osl::MutexGuard aGuard( m_aMutex ); checkDisposed(java_sql_Connection_BASE::rBHelper.bDisposed); - ::rtl::OUString aStr; + OUString aStr; SDBThreadAttach t; OSL_ENSURE(t.pEnv,"Java Enviroment geloescht worden!"); { @@ -590,15 +590,15 @@ Any SAL_CALL java_sql_Connection::getWarnings( ) throw(SQLException, RuntimeExc // ----------------------------------------------------------------------------- namespace { - ::rtl::OUString lcl_getDriverLoadErrorMessage( const ::connectivity::SharedResources& _aResource,const ::rtl::OUString& _rDriverClass, const ::rtl::OUString& _rDriverClassPath ) + OUString lcl_getDriverLoadErrorMessage( const ::connectivity::SharedResources& _aResource,const OUString& _rDriverClass, const OUString& _rDriverClassPath ) { - ::rtl::OUString sError1( _aResource.getResourceStringWithSubstitution( + OUString sError1( _aResource.getResourceStringWithSubstitution( STR_NO_CLASSNAME, "$classname$", _rDriverClass ) ); if ( !_rDriverClassPath.isEmpty() ) { - const ::rtl::OUString sError2( _aResource.getResourceStringWithSubstitution( + const OUString sError2( _aResource.getResourceStringWithSubstitution( STR_NO_CLASSNAME_PATH, "$classpath$", _rDriverClassPath ) ); @@ -636,7 +636,7 @@ namespace ++pSystemProp ) { - ::rtl::OUString sValue; + OUString sValue; OSL_VERIFY( pSystemProp->Value >>= sValue ); _rLogger.log( LogLevel::FINER, STR_LOG_SETTING_SYSTEM_PROPERTY, pSystemProp->Name, sValue ); @@ -655,11 +655,11 @@ namespace } // ----------------------------------------------------------------------------- -void java_sql_Connection::loadDriverFromProperties( const ::rtl::OUString& _sDriverClass, const ::rtl::OUString& _sDriverClassPath, +void java_sql_Connection::loadDriverFromProperties( const OUString& _sDriverClass, const OUString& _sDriverClassPath, const Sequence< NamedValue >& _rSystemProperties ) { // contains the statement which should be used when query for automatically generated values - ::rtl::OUString sGeneratedValueStatement; + OUString sGeneratedValueStatement; // set to <TRUE/> when we should allow to query for generated values sal_Bool bAutoRetrievingEnabled = sal_False; @@ -738,7 +738,7 @@ void java_sql_Connection::loadDriverFromProperties( const ::rtl::OUString& _sDri throw SQLException( lcl_getDriverLoadErrorMessage( getResources(),_sDriverClass, _sDriverClassPath ), *this, - ::rtl::OUString(), + OUString(), 1000, makeAny(e) ); @@ -755,12 +755,12 @@ void java_sql_Connection::loadDriverFromProperties( const ::rtl::OUString& _sDri setAutoRetrievingStatement( sGeneratedValueStatement ); } // ----------------------------------------------------------------------------- -::rtl::OUString java_sql_Connection::impl_getJavaDriverClassPath_nothrow(const ::rtl::OUString& _sDriverClass) +OUString java_sql_Connection::impl_getJavaDriverClassPath_nothrow(const OUString& _sDriverClass) { - static const ::rtl::OUString s_sNodeName("org.openoffice.Office.DataAccess/JDBC/DriverClassPaths"); + static const OUString s_sNodeName("org.openoffice.Office.DataAccess/JDBC/DriverClassPaths"); ::utl::OConfigurationTreeRoot aNamesRoot = ::utl::OConfigurationTreeRoot::createWithComponentContext( m_pDriver->getContext(), s_sNodeName, -1, ::utl::OConfigurationTreeRoot::CM_READONLY); - ::rtl::OUString sURL; + OUString sURL; if ( aNamesRoot.isValid() && aNamesRoot.hasByName( _sDriverClass ) ) { ::utl::OConfigurationNode aRegisterObj = aNamesRoot.openNode( _sDriverClass ); @@ -769,7 +769,7 @@ void java_sql_Connection::loadDriverFromProperties( const ::rtl::OUString& _sDri return sURL; } // ----------------------------------------------------------------------------- -sal_Bool java_sql_Connection::construct(const ::rtl::OUString& url, +sal_Bool java_sql_Connection::construct(const OUString& url, const Sequence< PropertyValue >& info) { { // initialize the java vm @@ -782,9 +782,9 @@ sal_Bool java_sql_Connection::construct(const ::rtl::OUString& url, if ( !t.pEnv ) throwGenericSQLException(STR_NO_JAVA,*this); - ::rtl::OUString sGeneratedValueStatement; // contains the statement which should be used when query for automatically generated values + OUString sGeneratedValueStatement; // contains the statement which should be used when query for automatically generated values sal_Bool bAutoRetrievingEnabled = sal_False; // set to <TRUE/> when we should allow to query for generated values - ::rtl::OUString sDriverClassPath,sDriverClass; + OUString sDriverClassPath,sDriverClass; Sequence< NamedValue > aSystemProperties; ::comphelper::NamedValueCollection aSettings( info ); diff --git a/connectivity/source/drivers/jdbc/JDriver.cxx b/connectivity/source/drivers/jdbc/JDriver.cxx index d99dfee7d22c..d0759c10ef68 100644 --- a/connectivity/source/drivers/jdbc/JDriver.cxx +++ b/connectivity/source/drivers/jdbc/JDriver.cxx @@ -52,17 +52,17 @@ java_sql_Driver::~java_sql_Driver() // static ServiceInfo //------------------------------------------------------------------------------ -rtl::OUString java_sql_Driver::getImplementationName_Static( ) throw(RuntimeException) +OUString java_sql_Driver::getImplementationName_Static( ) throw(RuntimeException) { - return ::rtl::OUString("com.sun.star.comp.sdbc.JDBCDriver"); + return OUString("com.sun.star.comp.sdbc.JDBCDriver"); // this name is referenced in the configuration and in the jdbc.xml // Please take care when changing it. } //------------------------------------------------------------------------------ -Sequence< ::rtl::OUString > java_sql_Driver::getSupportedServiceNames_Static( ) throw (RuntimeException) +Sequence< OUString > java_sql_Driver::getSupportedServiceNames_Static( ) throw (RuntimeException) { - Sequence< ::rtl::OUString > aSNS( 1 ); - aSNS[0] = ::rtl::OUString("com.sun.star.sdbc.Driver"); + Sequence< OUString > aSNS( 1 ); + aSNS[0] = OUString("com.sun.star.sdbc.Driver"); return aSNS; } //------------------------------------------------------------------ @@ -71,17 +71,17 @@ Sequence< ::rtl::OUString > java_sql_Driver::getSupportedServiceNames_Static( ) return *(new java_sql_Driver( comphelper::getComponentContext(_rxFactory))); } // -------------------------------------------------------------------------------- -::rtl::OUString SAL_CALL java_sql_Driver::getImplementationName( ) throw(RuntimeException) +OUString SAL_CALL java_sql_Driver::getImplementationName( ) throw(RuntimeException) { return getImplementationName_Static(); } // -------------------------------------------------------------------------------- -sal_Bool SAL_CALL java_sql_Driver::supportsService( const ::rtl::OUString& _rServiceName ) throw(RuntimeException) +sal_Bool SAL_CALL java_sql_Driver::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) ; @@ -89,12 +89,12 @@ sal_Bool SAL_CALL java_sql_Driver::supportsService( const ::rtl::OUString& _rSer } // -------------------------------------------------------------------------------- -Sequence< ::rtl::OUString > SAL_CALL java_sql_Driver::getSupportedServiceNames( ) throw(RuntimeException) +Sequence< OUString > SAL_CALL java_sql_Driver::getSupportedServiceNames( ) throw(RuntimeException) { return getSupportedServiceNames_Static(); } // ------------------------------------------------------------------------- -Reference< XConnection > SAL_CALL java_sql_Driver::connect( const ::rtl::OUString& url, const +Reference< XConnection > SAL_CALL java_sql_Driver::connect( const OUString& url, const Sequence< PropertyValue >& info ) throw(SQLException, RuntimeException) { m_aLogger.log( LogLevel::INFO, STR_LOG_DRIVER_CONNECTING_URL, url ); @@ -112,7 +112,7 @@ Reference< XConnection > SAL_CALL java_sql_Driver::connect( const ::rtl::OUStrin return xOut; } // ------------------------------------------------------------------------- -sal_Bool SAL_CALL java_sql_Driver::acceptsURL( const ::rtl::OUString& url ) throw(SQLException, RuntimeException) +sal_Bool SAL_CALL java_sql_Driver::acceptsURL( const OUString& url ) throw(SQLException, RuntimeException) { // don't ask the real driver for the url // I feel responsible for all jdbc url's @@ -121,112 +121,112 @@ sal_Bool SAL_CALL java_sql_Driver::acceptsURL( const ::rtl::OUString& url ) thro return bEnabled && url.startsWith("jdbc:"); } // ------------------------------------------------------------------------- -Sequence< DriverPropertyInfo > SAL_CALL java_sql_Driver::getPropertyInfo( const ::rtl::OUString& url, +Sequence< DriverPropertyInfo > SAL_CALL java_sql_Driver::getPropertyInfo( const OUString& url, const Sequence< PropertyValue >& /*info*/ ) throw(SQLException, RuntimeException) { if ( acceptsURL(url) ) { ::std::vector< DriverPropertyInfo > aDriverInfo; - Sequence< ::rtl::OUString > aBooleanValues(2); - aBooleanValues[0] = ::rtl::OUString( "false" ); - aBooleanValues[1] = ::rtl::OUString( "true" ); + Sequence< OUString > aBooleanValues(2); + aBooleanValues[0] = OUString( "false" ); + aBooleanValues[1] = OUString( "true" ); aDriverInfo.push_back(DriverPropertyInfo( - ::rtl::OUString("JavaDriverClass") - ,::rtl::OUString("The JDBC driver class name.") + OUString("JavaDriverClass") + ,OUString("The JDBC driver class name.") ,sal_True - ,::rtl::OUString() - ,Sequence< ::rtl::OUString >()) + ,OUString() + ,Sequence< OUString >()) ); aDriverInfo.push_back(DriverPropertyInfo( - ::rtl::OUString("JavaDriverClassPath") - ,::rtl::OUString("The class path where to look for the JDBC driver.") + OUString("JavaDriverClassPath") + ,OUString("The class path where to look for the JDBC driver.") ,sal_True - ,::rtl::OUString( "" ) - ,Sequence< ::rtl::OUString >()) + ,OUString( "" ) + ,Sequence< OUString >()) ); aDriverInfo.push_back(DriverPropertyInfo( - ::rtl::OUString("SystemProperties") - ,::rtl::OUString("Additional properties to set at java.lang.System before loading the driver.") + OUString("SystemProperties") + ,OUString("Additional properties to set at java.lang.System before loading the driver.") ,sal_True - ,::rtl::OUString( "" ) - ,Sequence< ::rtl::OUString >()) + ,OUString( "" ) + ,Sequence< OUString >()) ); aDriverInfo.push_back(DriverPropertyInfo( - ::rtl::OUString("ParameterNameSubstitution") - ,::rtl::OUString("Change named parameters with '?'.") + OUString("ParameterNameSubstitution") + ,OUString("Change named parameters with '?'.") ,sal_False - ,::rtl::OUString( "false" ) + ,OUString( "false" ) ,aBooleanValues) ); aDriverInfo.push_back(DriverPropertyInfo( - ::rtl::OUString("IgnoreDriverPrivileges") - ,::rtl::OUString("Ignore the privileges from the database driver.") + OUString("IgnoreDriverPrivileges") + ,OUString("Ignore the privileges from the database driver.") ,sal_False - ,::rtl::OUString( "false" ) + ,OUString( "false" ) ,aBooleanValues) ); aDriverInfo.push_back(DriverPropertyInfo( - ::rtl::OUString("IsAutoRetrievingEnabled") - ,::rtl::OUString("Retrieve generated values.") + OUString("IsAutoRetrievingEnabled") + ,OUString("Retrieve generated values.") ,sal_False - ,::rtl::OUString( "false" ) + ,OUString( "false" ) ,aBooleanValues) ); aDriverInfo.push_back(DriverPropertyInfo( - ::rtl::OUString("AutoRetrievingStatement") - ,::rtl::OUString("Auto-increment statement.") + OUString("AutoRetrievingStatement") + ,OUString("Auto-increment statement.") ,sal_False - ,::rtl::OUString() - ,Sequence< ::rtl::OUString >()) + ,OUString() + ,Sequence< OUString >()) ); aDriverInfo.push_back(DriverPropertyInfo( - ::rtl::OUString("GenerateASBeforeCorrelationName") - ,::rtl::OUString("Generate AS before table correlation names.") + OUString("GenerateASBeforeCorrelationName") + ,OUString("Generate AS before table correlation names.") ,sal_False - ,::rtl::OUString( "true" ) + ,OUString( "true" ) ,aBooleanValues) ); aDriverInfo.push_back(DriverPropertyInfo( - ::rtl::OUString("IgnoreCurrency") - ,::rtl::OUString("Ignore the currency field from the ResultsetMetaData.") + OUString("IgnoreCurrency") + ,OUString("Ignore the currency field from the ResultsetMetaData.") ,sal_False - ,::rtl::OUString( "false" ) + ,OUString( "false" ) ,aBooleanValues) ); aDriverInfo.push_back(DriverPropertyInfo( - ::rtl::OUString("EscapeDateTime") - ,::rtl::OUString("Escape date time format.") + OUString("EscapeDateTime") + ,OUString("Escape date time format.") ,sal_False - ,::rtl::OUString( "true" ) + ,OUString( "true" ) ,aBooleanValues) ); aDriverInfo.push_back(DriverPropertyInfo( - ::rtl::OUString("TypeInfoSettings") - ,::rtl::OUString("Defines how the type info of the database metadata should be manipulated.") + OUString("TypeInfoSettings") + ,OUString("Defines how the type info of the database metadata should be manipulated.") ,sal_False - ,::rtl::OUString( ) - ,Sequence< ::rtl::OUString > ()) + ,OUString( ) + ,Sequence< OUString > ()) ); aDriverInfo.push_back(DriverPropertyInfo( - ::rtl::OUString("ImplicitCatalogRestriction") - ,::rtl::OUString("The catalog which should be used in getTables calls, when the caller passed NULL.") + OUString("ImplicitCatalogRestriction") + ,OUString("The catalog which should be used in getTables calls, when the caller passed NULL.") ,sal_False - ,::rtl::OUString( ) - ,Sequence< ::rtl::OUString > ()) + ,OUString( ) + ,Sequence< OUString > ()) ); aDriverInfo.push_back(DriverPropertyInfo( - ::rtl::OUString("ImplicitSchemaRestriction") - ,::rtl::OUString("The schema which should be used in getTables calls, when the caller passed NULL.") + OUString("ImplicitSchemaRestriction") + ,OUString("The schema which should be used in getTables calls, when the caller passed NULL.") ,sal_False - ,::rtl::OUString( ) - ,Sequence< ::rtl::OUString > ()) + ,OUString( ) + ,Sequence< OUString > ()) ); return Sequence< DriverPropertyInfo >(&aDriverInfo[0],aDriverInfo.size()); } ::connectivity::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/jdbc/JStatement.cxx b/connectivity/source/drivers/jdbc/JStatement.cxx index e0d4c45b727a..d4ec58907326 100644 --- a/connectivity/source/drivers/jdbc/JStatement.cxx +++ b/connectivity/source/drivers/jdbc/JStatement.cxx @@ -170,7 +170,7 @@ Reference< XResultSet > SAL_CALL java_sql_Statement_Base::getGeneratedValues( ) OSL_ENSURE( m_pConnection && m_pConnection->isAutoRetrievingEnabled(),"Illegal call here. isAutoRetrievingEnabled is false!"); if ( m_pConnection ) { - ::rtl::OUString sStmt = m_pConnection->getTransformedGeneratedStatement(m_sSqlStatement); + OUString sStmt = m_pConnection->getTransformedGeneratedStatement(m_sSqlStatement); if ( !sStmt.isEmpty() ) { m_aLogger.log( LogLevel::FINER, STR_LOG_GENERATED_VALUES_FALLBACK, sStmt ); @@ -219,7 +219,7 @@ void SAL_CALL java_sql_Statement::clearBatch( ) throw(::com::sun::star::sdbc::S } // ------------------------------------------------------------------------- -sal_Bool SAL_CALL java_sql_Statement_Base::execute( const ::rtl::OUString& sql ) throw(SQLException, RuntimeException) +sal_Bool SAL_CALL java_sql_Statement_Base::execute( const OUString& sql ) throw(SQLException, RuntimeException) { m_aLogger.log( LogLevel::FINE, STR_LOG_EXECUTE_STATEMENT, sql ); ::osl::MutexGuard aGuard( m_aMutex ); @@ -253,7 +253,7 @@ sal_Bool SAL_CALL java_sql_Statement_Base::execute( const ::rtl::OUString& sql ) } // ------------------------------------------------------------------------- -Reference< XResultSet > SAL_CALL java_sql_Statement_Base::executeQuery( const ::rtl::OUString& sql ) throw(SQLException, RuntimeException) +Reference< XResultSet > SAL_CALL java_sql_Statement_Base::executeQuery( const OUString& sql ) throw(SQLException, RuntimeException) { ::osl::MutexGuard aGuard( m_aMutex ); checkDisposed(java_sql_Statement_BASE::rBHelper.bDisposed); @@ -303,7 +303,7 @@ Any SAL_CALL java_sql_Statement::queryInterface( const Type & rType ) throw(Runt } // ------------------------------------------------------------------------- -void SAL_CALL java_sql_Statement::addBatch( const ::rtl::OUString& sql ) throw(::com::sun::star::sdbc::SQLException, RuntimeException) +void SAL_CALL java_sql_Statement::addBatch( const OUString& sql ) throw(::com::sun::star::sdbc::SQLException, RuntimeException) { ::osl::MutexGuard aGuard( m_aMutex ); checkDisposed(java_sql_Statement_BASE::rBHelper.bDisposed); @@ -337,7 +337,7 @@ Sequence< sal_Int32 > SAL_CALL java_sql_Statement::executeBatch( ) throw(::com: // ------------------------------------------------------------------------- -sal_Int32 SAL_CALL java_sql_Statement_Base::executeUpdate( const ::rtl::OUString& sql ) throw(SQLException, RuntimeException) +sal_Int32 SAL_CALL java_sql_Statement_Base::executeUpdate( const OUString& sql ) throw(SQLException, RuntimeException) { ::osl::MutexGuard aGuard( m_aMutex ); checkDisposed(java_sql_Statement_BASE::rBHelper.bDisposed); @@ -473,7 +473,7 @@ sal_Int32 java_sql_Statement_Base::getMaxFieldSize() throw(SQLException, Runtime return impl_getProperty("getMaxFieldSize",mID); } //------------------------------------------------------------------------------ -::rtl::OUString java_sql_Statement_Base::getCursorName() throw(SQLException, RuntimeException) +OUString java_sql_Statement_Base::getCursorName() throw(SQLException, RuntimeException) { ::osl::MutexGuard aGuard( m_aMutex ); checkDisposed(java_sql_Statement_BASE::rBHelper.bDisposed); @@ -487,7 +487,7 @@ sal_Int32 java_sql_Statement_Base::getMaxFieldSize() throw(SQLException, Runtime catch(const SQLException&) { } - return ::rtl::OUString(); + return OUString(); } //------------------------------------------------------------------------------ void java_sql_Statement_Base::setQueryTimeOut(sal_Int32 _par0) throw(SQLException, RuntimeException) @@ -578,7 +578,7 @@ void java_sql_Statement_Base::setMaxFieldSize(sal_Int32 _par0) throw(SQLExceptio callVoidMethodWithIntArg("setMaxFieldSize",mID,_par0,true); } //------------------------------------------------------------------------------ -void java_sql_Statement_Base::setCursorName(const ::rtl::OUString &_par0) throw(SQLException, RuntimeException) +void java_sql_Statement_Base::setCursorName(const OUString &_par0) throw(SQLException, RuntimeException) { ::osl::MutexGuard aGuard( m_aMutex ); checkDisposed(java_sql_Statement_BASE::rBHelper.bDisposed); @@ -596,7 +596,7 @@ void java_sql_Statement_Base::setCursorName(const ::rtl::OUString &_par0) throw( Sequence< Property > aProps(10); Property* pProperties = aProps.getArray(); sal_Int32 nPos = 0; - DECL_PROP0(CURSORNAME, ::rtl::OUString); + DECL_PROP0(CURSORNAME, OUString); DECL_BOOL_PROP0(ESCAPEPROCESSING); DECL_PROP0(FETCHDIRECTION,sal_Int32); DECL_PROP0(FETCHSIZE, sal_Int32); diff --git a/connectivity/source/drivers/jdbc/Object.cxx b/connectivity/source/drivers/jdbc/Object.cxx index 9395a11771ac..ed6d2ea03de2 100644 --- a/connectivity/source/drivers/jdbc/Object.cxx +++ b/connectivity/source/drivers/jdbc/Object.cxx @@ -151,7 +151,7 @@ void java_lang_Object::saveRef( JNIEnv * pXEnv, jobject myObj ) } -::rtl::OUString java_lang_Object::toString() const +OUString java_lang_Object::toString() const { static jmethodID mID(NULL); return callStringMethod("toString",mID); @@ -183,12 +183,12 @@ namespace #if OSL_DEBUG_LEVEL > 0 pThrow->printStackTrace(); #endif - ::rtl::OUString sMessage = pThrow->getMessage(); + OUString sMessage = pThrow->getMessage(); if ( sMessage.isEmpty() ) sMessage = pThrow->getLocalizedMessage(); if( sMessage.isEmpty() ) sMessage = pThrow->toString(); - _out_rException = SQLException( sMessage, _rxContext, ::rtl::OUString(), -1, Any() ); + _out_rException = SQLException( sMessage, _rxContext, OUString(), -1, Any() ); return true; } else @@ -328,7 +328,7 @@ void java_lang_Object::callVoidMethodWithBoolArg( const char* _pMethodName, jmet ThrowSQLException( t.pEnv, NULL ); } // ----------------------------------------------------------------------------- -::rtl::OUString java_lang_Object::callStringMethod( const char* _pMethodName, jmethodID& _inout_MethodID ) const +OUString java_lang_Object::callStringMethod( const char* _pMethodName, jmethodID& _inout_MethodID ) const { SDBThreadAttach t; OSL_ENSURE( t.pEnv, "java_lang_Object::callStringMethod: no Java enviroment anymore!" ); @@ -358,7 +358,7 @@ jobject java_lang_Object::callObjectMethodWithIntArg( JNIEnv * _pEnv,const char* return out; } // ----------------------------------------------------------------------------- -::rtl::OUString java_lang_Object::callStringMethodWithIntArg( const char* _pMethodName, jmethodID& _inout_MethodID , sal_Int32 _nArgument) const +OUString java_lang_Object::callStringMethodWithIntArg( const char* _pMethodName, jmethodID& _inout_MethodID , sal_Int32 _nArgument) const { SDBThreadAttach t; OSL_ENSURE( t.pEnv, "java_lang_Object::callStringMethod: no Java enviroment anymore!" ); @@ -366,7 +366,7 @@ jobject java_lang_Object::callObjectMethodWithIntArg( JNIEnv * _pEnv,const char* return JavaString2String( t.pEnv, out ); } // ------------------------------------------------------------------------- -void java_lang_Object::callVoidMethodWithStringArg( const char* _pMethodName, jmethodID& _inout_MethodID,const ::rtl::OUString& _nArgument ) const +void java_lang_Object::callVoidMethodWithStringArg( const char* _pMethodName, jmethodID& _inout_MethodID,const OUString& _nArgument ) const { SDBThreadAttach t; OSL_ENSURE( t.pEnv, "java_lang_Object::callIntMethod: no Java enviroment anymore!" ); @@ -378,7 +378,7 @@ void java_lang_Object::callVoidMethodWithStringArg( const char* _pMethodName, jm ThrowSQLException( t.pEnv, NULL ); } // ------------------------------------------------------------------------- -sal_Int32 java_lang_Object::callIntMethodWithStringArg( const char* _pMethodName, jmethodID& _inout_MethodID,const ::rtl::OUString& _nArgument ) const +sal_Int32 java_lang_Object::callIntMethodWithStringArg( const char* _pMethodName, jmethodID& _inout_MethodID,const OUString& _nArgument ) const { SDBThreadAttach t; OSL_ENSURE( t.pEnv, "java_lang_Object::callIntMethodWithStringArg: no Java enviroment anymore!" ); diff --git a/connectivity/source/drivers/jdbc/PreparedStatement.cxx b/connectivity/source/drivers/jdbc/PreparedStatement.cxx index 22966688ee23..0458ad7d5af4 100644 --- a/connectivity/source/drivers/jdbc/PreparedStatement.cxx +++ b/connectivity/source/drivers/jdbc/PreparedStatement.cxx @@ -47,7 +47,7 @@ using namespace ::com::sun::star::lang; //************************************************************** IMPLEMENT_SERVICE_INFO(java_sql_PreparedStatement,"com.sun.star.sdbcx.JPreparedStatement","com.sun.star.sdbc.PreparedStatement"); -java_sql_PreparedStatement::java_sql_PreparedStatement( JNIEnv * pEnv, java_sql_Connection& _rCon, const ::rtl::OUString& sql ) +java_sql_PreparedStatement::java_sql_PreparedStatement( JNIEnv * pEnv, java_sql_Connection& _rCon, const OUString& sql ) : OStatement_BASE2( pEnv, _rCon ) { m_sSqlStatement = sql; @@ -111,7 +111,7 @@ sal_Int32 SAL_CALL java_sql_PreparedStatement::executeUpdate( ) throw(::com::su } // ------------------------------------------------------------------------- -void SAL_CALL java_sql_PreparedStatement::setString( sal_Int32 parameterIndex, const ::rtl::OUString& x ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException) +void SAL_CALL java_sql_PreparedStatement::setString( sal_Int32 parameterIndex, const OUString& x ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException) { ::osl::MutexGuard aGuard( m_aMutex ); checkDisposed(java_sql_Statement_BASE::rBHelper.bDisposed); @@ -346,7 +346,7 @@ void SAL_CALL java_sql_PreparedStatement::setObjectWithInfo( sal_Int32 parameter { ORowSetValue aValue; aValue.fill(x); - const ::rtl::OUString sValue = aValue; + const OUString sValue = aValue; if ( !sValue.isEmpty() ) pBigDecimal.reset(new java_math_BigDecimal(sValue)); else @@ -370,7 +370,7 @@ void SAL_CALL java_sql_PreparedStatement::setObjectWithInfo( sal_Int32 parameter } // ------------------------------------------------------------------------- -void SAL_CALL java_sql_PreparedStatement::setObjectNull( sal_Int32 parameterIndex, sal_Int32 /*sqlType*/, const ::rtl::OUString& /*typeName*/ ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException) +void SAL_CALL java_sql_PreparedStatement::setObjectNull( sal_Int32 parameterIndex, sal_Int32 /*sqlType*/, const OUString& /*typeName*/ ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException) { m_aLogger.log( LogLevel::FINER, STR_LOG_OBJECT_NULL_PARAMETER, parameterIndex ); ::osl::MutexGuard aGuard( m_aMutex ); @@ -387,9 +387,9 @@ void SAL_CALL java_sql_PreparedStatement::setObject( sal_Int32 parameterIndex, c { if(!::dbtools::implSetObject(this,parameterIndex,x)) { - const ::rtl::OUString sError( m_pConnection->getResources().getResourceStringWithSubstitution( + const OUString sError( m_pConnection->getResources().getResourceStringWithSubstitution( STR_UNKNOWN_PARA_TYPE, - "$position$", ::rtl::OUString::valueOf(parameterIndex) + "$position$", OUString::valueOf(parameterIndex) ) ); ::dbtools::throwGenericSQLException(sError,*this); } diff --git a/connectivity/source/drivers/jdbc/Ref.cxx b/connectivity/source/drivers/jdbc/Ref.cxx index 46c95a58353f..cc7bbcd0a7a3 100644 --- a/connectivity/source/drivers/jdbc/Ref.cxx +++ b/connectivity/source/drivers/jdbc/Ref.cxx @@ -43,7 +43,7 @@ jclass java_sql_Ref::getMyClass() const return theClass; } -::rtl::OUString SAL_CALL java_sql_Ref::getBaseTypeName( ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException) +OUString SAL_CALL java_sql_Ref::getBaseTypeName( ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException) { static jmethodID mID(NULL); return callStringMethod("getBaseTypeName",mID); diff --git a/connectivity/source/drivers/jdbc/ResultSet.cxx b/connectivity/source/drivers/jdbc/ResultSet.cxx index 035b3306e219..13b9de190fe2 100644 --- a/connectivity/source/drivers/jdbc/ResultSet.cxx +++ b/connectivity/source/drivers/jdbc/ResultSet.cxx @@ -135,7 +135,7 @@ m_xMetaData.clear(); } // ------------------------------------------------------------------------- -sal_Int32 SAL_CALL java_sql_ResultSet::findColumn( const ::rtl::OUString& columnName ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException) +sal_Int32 SAL_CALL java_sql_ResultSet::findColumn( const OUString& columnName ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException) { RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "jdbc", "Ocke.Janssen@sun.com", "java_sql_ResultSet::findColumn" ); static jmethodID mID(NULL); @@ -340,7 +340,7 @@ Any SAL_CALL java_sql_ResultSet::getObject( sal_Int32 columnIndex, const Referen if ( t.pEnv->IsInstanceOf(out,java_lang_String::st_getMyClass()) ) { java_lang_String aVal(t.pEnv,out); - aRet <<= (::rtl::OUString)aVal; + aRet <<= (OUString)aVal; } else if ( t.pEnv->IsInstanceOf(out,java_lang_Boolean::st_getMyClass()) ) { @@ -381,7 +381,7 @@ sal_Int16 SAL_CALL java_sql_ResultSet::getShort( sal_Int32 columnIndex ) throw(S // ------------------------------------------------------------------------- -::rtl::OUString SAL_CALL java_sql_ResultSet::getString( sal_Int32 columnIndex ) throw(SQLException, RuntimeException) +OUString SAL_CALL java_sql_ResultSet::getString( sal_Int32 columnIndex ) throw(SQLException, RuntimeException) { RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "jdbc", "Ocke.Janssen@sun.com", "java_sql_ResultSet::getString" ); static jmethodID mID(NULL); @@ -687,7 +687,7 @@ void SAL_CALL java_sql_ResultSet::updateDouble( sal_Int32 columnIndex, double x } // ------------------------------------------------------------------------- -void SAL_CALL java_sql_ResultSet::updateString( sal_Int32 columnIndex, const ::rtl::OUString& x ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException) +void SAL_CALL java_sql_ResultSet::updateString( sal_Int32 columnIndex, const OUString& x ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException) { RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "jdbc", "Ocke.Janssen@sun.com", "java_sql_ResultSet::updateString" ); SDBThreadAttach t; @@ -841,9 +841,9 @@ void SAL_CALL java_sql_ResultSet::updateObject( sal_Int32 columnIndex, const ::c if(!::dbtools::implUpdateObject(this,columnIndex,x)) { ::connectivity::SharedResources aResources; - const ::rtl::OUString sError( aResources.getResourceStringWithSubstitution( + const OUString sError( aResources.getResourceStringWithSubstitution( STR_UNKNOWN_COLUMN_TYPE, - "$position$", ::rtl::OUString::valueOf(columnIndex) + "$position$", OUString::valueOf(columnIndex) ) ); ::dbtools::throwGenericSQLException(sError,*this); } @@ -921,7 +921,7 @@ sal_Int32 java_sql_ResultSet::getFetchSize() const throw(::com::sun::star::sdbc: return callIntMethod("getFetchSize",mID,true); } //------------------------------------------------------------------------------ -::rtl::OUString java_sql_ResultSet::getCursorName() const throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException) +OUString java_sql_ResultSet::getCursorName() const throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException) { RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "jdbc", "Ocke.Janssen@sun.com", "java_sql_ResultSet::getCursorName" ); static jmethodID mID(NULL); @@ -956,7 +956,7 @@ void java_sql_ResultSet::setFetchSize(sal_Int32 _par0) throw(::com::sun::star::s Sequence< Property > aProps(5); Property* pProperties = aProps.getArray(); sal_Int32 nPos = 0; - DECL_PROP1IMPL(CURSORNAME, ::rtl::OUString) PropertyAttribute::READONLY); + DECL_PROP1IMPL(CURSORNAME, OUString) PropertyAttribute::READONLY); DECL_PROP0(FETCHDIRECTION, sal_Int32); DECL_PROP0(FETCHSIZE, sal_Int32); DECL_PROP1IMPL(RESULTSETCONCURRENCY,sal_Int32) PropertyAttribute::READONLY); diff --git a/connectivity/source/drivers/jdbc/ResultSetMetaData.cxx b/connectivity/source/drivers/jdbc/ResultSetMetaData.cxx index 351099937dfd..62ee5728dd19 100644 --- a/connectivity/source/drivers/jdbc/ResultSetMetaData.cxx +++ b/connectivity/source/drivers/jdbc/ResultSetMetaData.cxx @@ -94,7 +94,7 @@ sal_Bool SAL_CALL java_sql_ResultSetMetaData::isCaseSensitive( sal_Int32 column return callBooleanMethodWithIntArg( "isCaseSensitive", mID,column ); } // ------------------------------------------------------------------------- -::rtl::OUString SAL_CALL java_sql_ResultSetMetaData::getSchemaName( sal_Int32 column ) throw(SQLException, RuntimeException) +OUString SAL_CALL java_sql_ResultSetMetaData::getSchemaName( sal_Int32 column ) throw(SQLException, RuntimeException) { RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "jdbc", "Ocke.Janssen@sun.com", "java_sql_ResultSetMetaData::getSchemaName" ); static jmethodID mID(NULL); @@ -102,42 +102,42 @@ sal_Bool SAL_CALL java_sql_ResultSetMetaData::isCaseSensitive( sal_Int32 column } // ------------------------------------------------------------------------- -::rtl::OUString SAL_CALL java_sql_ResultSetMetaData::getColumnName( sal_Int32 column ) throw(SQLException, RuntimeException) +OUString SAL_CALL java_sql_ResultSetMetaData::getColumnName( sal_Int32 column ) throw(SQLException, RuntimeException) { RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "jdbc", "Ocke.Janssen@sun.com", "java_sql_ResultSetMetaData::getColumnName" ); static jmethodID mID(NULL); return callStringMethodWithIntArg("getColumnName",mID,column); } // ------------------------------------------------------------------------- -::rtl::OUString SAL_CALL java_sql_ResultSetMetaData::getTableName( sal_Int32 column ) throw(SQLException, RuntimeException) +OUString SAL_CALL java_sql_ResultSetMetaData::getTableName( sal_Int32 column ) throw(SQLException, RuntimeException) { RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "jdbc", "Ocke.Janssen@sun.com", "java_sql_ResultSetMetaData::getTableName" ); static jmethodID mID(NULL); return callStringMethodWithIntArg("getTableName",mID,column); } // ------------------------------------------------------------------------- -::rtl::OUString SAL_CALL java_sql_ResultSetMetaData::getCatalogName( sal_Int32 column ) throw(SQLException, RuntimeException) +OUString SAL_CALL java_sql_ResultSetMetaData::getCatalogName( sal_Int32 column ) throw(SQLException, RuntimeException) { RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "jdbc", "Ocke.Janssen@sun.com", "java_sql_ResultSetMetaData::getCatalogName" ); static jmethodID mID(NULL); return callStringMethodWithIntArg("getCatalogName",mID,column); } // ------------------------------------------------------------------------- -::rtl::OUString SAL_CALL java_sql_ResultSetMetaData::getColumnTypeName( sal_Int32 column ) throw(SQLException, RuntimeException) +OUString SAL_CALL java_sql_ResultSetMetaData::getColumnTypeName( sal_Int32 column ) throw(SQLException, RuntimeException) { RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "jdbc", "Ocke.Janssen@sun.com", "java_sql_ResultSetMetaData::getColumnTypeName" ); static jmethodID mID(NULL); return callStringMethodWithIntArg("getColumnTypeName",mID,column); } // ------------------------------------------------------------------------- -::rtl::OUString SAL_CALL java_sql_ResultSetMetaData::getColumnLabel( sal_Int32 column ) throw(SQLException, RuntimeException) +OUString SAL_CALL java_sql_ResultSetMetaData::getColumnLabel( sal_Int32 column ) throw(SQLException, RuntimeException) { RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "jdbc", "Ocke.Janssen@sun.com", "java_sql_ResultSetMetaData::getColumnLabel" ); static jmethodID mID(NULL); return callStringMethodWithIntArg("getColumnLabel",mID,column); } // ------------------------------------------------------------------------- -::rtl::OUString SAL_CALL java_sql_ResultSetMetaData::getColumnServiceName( sal_Int32 column ) throw(SQLException, RuntimeException) +OUString SAL_CALL java_sql_ResultSetMetaData::getColumnServiceName( sal_Int32 column ) throw(SQLException, RuntimeException) { RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "jdbc", "Ocke.Janssen@sun.com", "java_sql_ResultSetMetaData::getColumnServiceName" ); static jmethodID mID(NULL); diff --git a/connectivity/source/drivers/jdbc/SQLException.cxx b/connectivity/source/drivers/jdbc/SQLException.cxx index 59e57f333278..c8857ab2beef 100644 --- a/connectivity/source/drivers/jdbc/SQLException.cxx +++ b/connectivity/source/drivers/jdbc/SQLException.cxx @@ -76,7 +76,7 @@ starsdbc::SQLException java_sql_SQLException_BASE::getNextException() const return starsdbc::SQLException(); } -::rtl::OUString java_sql_SQLException_BASE::getSQLState() const +OUString java_sql_SQLException_BASE::getSQLState() const { static jmethodID mID(NULL); return callStringMethod("getSQLState",mID); diff --git a/connectivity/source/drivers/jdbc/String.cxx b/connectivity/source/drivers/jdbc/String.cxx index fbc33d360a03..ce9d464ecf3e 100644 --- a/connectivity/source/drivers/jdbc/String.cxx +++ b/connectivity/source/drivers/jdbc/String.cxx @@ -42,11 +42,11 @@ jclass java_lang_String::st_getMyClass() } //-------------------------------------------------------------------------- -java_lang_String::operator ::rtl::OUString() +java_lang_String::operator OUString() { SDBThreadAttach t; if(!t.pEnv) - return ::rtl::OUString(); + return OUString(); return JavaString2String(t.pEnv,(jstring)object); } diff --git a/connectivity/source/drivers/jdbc/Throwable.cxx b/connectivity/source/drivers/jdbc/Throwable.cxx index e943aec88067..90b4a015e673 100644 --- a/connectivity/source/drivers/jdbc/Throwable.cxx +++ b/connectivity/source/drivers/jdbc/Throwable.cxx @@ -42,14 +42,14 @@ jclass java_lang_Throwable::st_getMyClass() } // ----------------------------------------------------------------------------- -::rtl::OUString java_lang_Throwable::getMessage() const +OUString java_lang_Throwable::getMessage() const { static jmethodID mID(NULL); return callStringMethod("getMessage",mID); } // ----------------------------------------------------------------------------- -::rtl::OUString java_lang_Throwable::getLocalizedMessage() const +OUString java_lang_Throwable::getLocalizedMessage() const { static jmethodID mID(NULL); return callStringMethod("getLocalizedMessage",mID); diff --git a/connectivity/source/drivers/jdbc/Timestamp.cxx b/connectivity/source/drivers/jdbc/Timestamp.cxx index 1d541d8f4f2a..a1d1bcd5e92e 100644 --- a/connectivity/source/drivers/jdbc/Timestamp.cxx +++ b/connectivity/source/drivers/jdbc/Timestamp.cxx @@ -36,7 +36,7 @@ java_sql_Date::java_sql_Date( const ::com::sun::star::util::Date& _rOut ) : java return; jvalue args[1]; // Convert parameters - ::rtl::OUString sDateStr; + OUString sDateStr; sDateStr = ::dbtools::DBTypeConversion::toDateString(_rOut); args[0].l = convertwchar_tToJavaString(t.pEnv,sDateStr); @@ -102,7 +102,7 @@ java_sql_Time::java_sql_Time( const ::com::sun::star::util::Time& _rOut ): java_ return; jvalue args[1]; // Convert parameters - ::rtl::OUString sDateStr; + OUString sDateStr; sDateStr = ::dbtools::DBTypeConversion::toTimeString(_rOut); args[0].l = convertwchar_tToJavaString(t.pEnv,sDateStr); @@ -155,7 +155,7 @@ java_sql_Timestamp::java_sql_Timestamp(const ::com::sun::star::util::DateTime& _ return; jvalue args[1]; // Convert parameters - ::rtl::OUString sDateStr; + OUString sDateStr; sDateStr = ::dbtools::DBTypeConversion::toDateTimeString(_rOut); args[0].l = convertwchar_tToJavaString(t.pEnv,sDateStr); diff --git a/connectivity/source/drivers/jdbc/jservices.cxx b/connectivity/source/drivers/jdbc/jservices.cxx index 90302e3a0004..53358a6cf7b6 100644 --- a/connectivity/source/drivers/jdbc/jservices.cxx +++ b/connectivity/source/drivers/jdbc/jservices.cxx @@ -21,7 +21,6 @@ #include <cppuhelper/factory.hxx> using namespace connectivity; -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/jdbc/tools.cxx b/connectivity/source/drivers/jdbc/tools.cxx index ee4cac4a7585..02a8094ae36d 100644 --- a/connectivity/source/drivers/jdbc/tools.cxx +++ b/connectivity/source/drivers/jdbc/tools.cxx @@ -35,7 +35,7 @@ using namespace ::com::sun::star::sdbc; using namespace ::com::sun::star::container; using namespace ::com::sun::star::lang; -void java_util_Properties::setProperty(const ::rtl::OUString key, const ::rtl::OUString& value) +void java_util_Properties::setProperty(const OUString key, const OUString& value) { SDBThreadAttach t; OSL_ENSURE(t.pEnv,"Java Enviroment geloescht worden!"); jobject out(0); @@ -92,7 +92,7 @@ java_util_Properties::java_util_Properties( ): java_lang_Object( NULL, (jobject) } // -------------------------------------------------------------------------------- -jstring connectivity::convertwchar_tToJavaString(JNIEnv *pEnv,const ::rtl::OUString& _rTemp) +jstring connectivity::convertwchar_tToJavaString(JNIEnv *pEnv,const OUString& _rTemp) { OSL_ENSURE(pEnv,"Environment is NULL!"); jstring pStr = pEnv->NewString(_rTemp.getStr(), _rTemp.getLength()); @@ -145,7 +145,7 @@ java_util_Properties* connectivity::createStringPropertyArray(const Sequence< Pr && pBegin->Name.compareToAscii( "RespectDriverResultSetType" ) ) { - ::rtl::OUString aStr; + OUString aStr; OSL_VERIFY( pBegin->Value >>= aStr ); pProps->setProperty(pBegin->Name,aStr); } @@ -153,15 +153,15 @@ java_util_Properties* connectivity::createStringPropertyArray(const Sequence< Pr return pProps; } // -------------------------------------------------------------------------------- -::rtl::OUString connectivity::JavaString2String(JNIEnv *pEnv,jstring _Str) +OUString connectivity::JavaString2String(JNIEnv *pEnv,jstring _Str) { - ::rtl::OUString aStr; + OUString aStr; if(_Str) { jboolean bCopy(sal_True); const jchar* pChar = pEnv->GetStringChars(_Str,&bCopy); jsize len = pEnv->GetStringLength(_Str); - aStr = ::rtl::OUString(pChar,len); + aStr = OUString(pChar,len); if(bCopy) pEnv->ReleaseStringChars(_Str,pChar); @@ -174,7 +174,7 @@ jobject connectivity::convertTypeMapToJavaMap(JNIEnv* /*pEnv*/,const Reference< { if ( _rMap.is() ) { - ::com::sun::star::uno::Sequence< ::rtl::OUString > aNames = _rMap->getElementNames(); + ::com::sun::star::uno::Sequence< OUString > aNames = _rMap->getElementNames(); if ( aNames.getLength() > 0 ) ::dbtools::throwFeatureNotImplementedException( "Type maps", NULL ); } @@ -197,7 +197,7 @@ sal_Bool connectivity::isExceptionOccurred(JNIEnv *pEnv,sal_Bool _bClear) { java_sql_SQLException_BASE* pException = new java_sql_SQLException_BASE(pEnv,pThrowable); - ::rtl::OUString sError = pException->getMessage(); + OUString sError = pException->getMessage(); delete pException; } #else |