diff options
Diffstat (limited to 'connectivity/source/drivers/macab')
36 files changed, 367 insertions, 368 deletions
diff --git a/connectivity/source/drivers/macab/MacabAddressBook.cxx b/connectivity/source/drivers/macab/MacabAddressBook.cxx index 5f9d393d29cf..b337f4ccc79d 100644 --- a/connectivity/source/drivers/macab/MacabAddressBook.cxx +++ b/connectivity/source/drivers/macab/MacabAddressBook.cxx @@ -66,11 +66,11 @@ MacabAddressBook::~MacabAddressBook() /* Get the address book's default table name. This is the table name that * refers to the table containing _all_ records in the address book. */ -const ::rtl::OUString & MacabAddressBook::getDefaultTableName() +const OUString & MacabAddressBook::getDefaultTableName() { /* This string probably needs to be localized. */ - static const ::rtl::OUString aDefaultTableName - (::rtl::OUString("Address Book")); + static const OUString aDefaultTableName + (OUString("Address Book")); return aDefaultTableName; } @@ -93,7 +93,7 @@ MacabRecords *MacabAddressBook::getMacabRecords() /* Get the MacabRecords for a given name: either a group name or the * default table name. */ -MacabRecords *MacabAddressBook::getMacabRecords(const ::rtl::OUString _tableName) +MacabRecords *MacabAddressBook::getMacabRecords(const OUString _tableName) { if(_tableName == getDefaultTableName()) { @@ -106,7 +106,7 @@ MacabRecords *MacabAddressBook::getMacabRecords(const ::rtl::OUString _tableName } // ----------------------------------------------------------------------------- -MacabRecords *MacabAddressBook::getMacabRecordsMatch(const ::rtl::OUString _tableName) +MacabRecords *MacabAddressBook::getMacabRecordsMatch(const OUString _tableName) { if(match(_tableName, getDefaultTableName(), '\0')) { @@ -155,7 +155,7 @@ MacabRecords *MacabAddressBook::getMacabRecordsMatch(const ::rtl::OUString _tabl } // ----------------------------------------------------------------------------- -MacabGroup *MacabAddressBook::getMacabGroup(::rtl::OUString _groupName) +MacabGroup *MacabAddressBook::getMacabGroup(OUString _groupName) { // initialize groups if not already initialized if(m_bRetrievedGroups == sal_False) @@ -179,7 +179,7 @@ MacabGroup *MacabAddressBook::getMacabGroup(::rtl::OUString _groupName) } // ----------------------------------------------------------------------------- -MacabGroup *MacabAddressBook::getMacabGroupMatch(::rtl::OUString _groupName) +MacabGroup *MacabAddressBook::getMacabGroupMatch(OUString _groupName) { // initialize groups if not already initialized if(m_bRetrievedGroups == sal_False) @@ -235,10 +235,10 @@ void MacabAddressBook::manageDuplicateGroups(::std::vector<MacabGroup *> _xGroup // duplicate! if(count != 1) { - ::rtl::OUString sName = (*iter1)->getName(); - sName += ::rtl::OUString(" (") + - ::rtl::OUString::valueOf(count) + - ::rtl::OUString(")"); + OUString sName = (*iter1)->getName(); + sName += OUString(" (") + + OUString::valueOf(count) + + OUString(")"); (*iter1)->setName(sName); } } diff --git a/connectivity/source/drivers/macab/MacabAddressBook.hxx b/connectivity/source/drivers/macab/MacabAddressBook.hxx index 92f65ae534f9..dbb9477669ff 100644 --- a/connectivity/source/drivers/macab/MacabAddressBook.hxx +++ b/connectivity/source/drivers/macab/MacabAddressBook.hxx @@ -46,16 +46,16 @@ namespace connectivity public: MacabAddressBook(); ~MacabAddressBook(); - static const ::rtl::OUString & getDefaultTableName(); + static const OUString & getDefaultTableName(); MacabRecords *getMacabRecords(); ::std::vector<MacabGroup *> getMacabGroups(); - MacabGroup *getMacabGroup(::rtl::OUString _groupName); - MacabRecords *getMacabRecords(const ::rtl::OUString _tableName); + MacabGroup *getMacabGroup(OUString _groupName); + MacabRecords *getMacabRecords(const OUString _tableName); - MacabGroup *getMacabGroupMatch(::rtl::OUString _groupName); - MacabRecords *getMacabRecordsMatch(const ::rtl::OUString _tableName); + MacabGroup *getMacabGroupMatch(OUString _groupName); + MacabRecords *getMacabRecordsMatch(const OUString _tableName); }; } diff --git a/connectivity/source/drivers/macab/MacabCatalog.cxx b/connectivity/source/drivers/macab/MacabCatalog.cxx index 9bfe86a46ca0..1061782d9c93 100644 --- a/connectivity/source/drivers/macab/MacabCatalog.cxx +++ b/connectivity/source/drivers/macab/MacabCatalog.cxx @@ -42,19 +42,19 @@ MacabCatalog::MacabCatalog(MacabConnection* _pCon) void MacabCatalog::refreshTables() { TStringVector aVector; - Sequence< ::rtl::OUString > aTypes(1); - aTypes[0] = ::rtl::OUString("%"); + Sequence< OUString > aTypes(1); + aTypes[0] = OUString("%"); Reference< XResultSet > xResult = m_xMetaData->getTables( Any(), - ::rtl::OUString("%"), - ::rtl::OUString("%"), + OUString("%"), + OUString("%"), aTypes); if (xResult.is()) { Reference< XRow > xRow(xResult,UNO_QUERY); - ::rtl::OUString aName; - // const ::rtl::OUString& sDot = MacabCatalog::getDot(); + OUString aName; + // const OUString& sDot = MacabCatalog::getDot(); while (xResult->next()) { @@ -82,9 +82,9 @@ void MacabCatalog::refreshUsers() { } // ------------------------------------------------------------------------- -const ::rtl::OUString& MacabCatalog::getDot() +const OUString& MacabCatalog::getDot() { - static const ::rtl::OUString sDot = ::rtl::OUString("."); + static const OUString sDot = OUString("."); return sDot; } // ----------------------------------------------------------------------------- diff --git a/connectivity/source/drivers/macab/MacabCatalog.hxx b/connectivity/source/drivers/macab/MacabCatalog.hxx index e36b17490bdb..61cdec31b880 100644 --- a/connectivity/source/drivers/macab/MacabCatalog.hxx +++ b/connectivity/source/drivers/macab/MacabCatalog.hxx @@ -38,7 +38,7 @@ namespace connectivity inline MacabConnection* getConnection() const { return m_pConnection; } - static const ::rtl::OUString& getDot(); + static const OUString& getDot(); // implementation of the pure virtual methods virtual void refreshTables(); diff --git a/connectivity/source/drivers/macab/MacabColumns.cxx b/connectivity/source/drivers/macab/MacabColumns.cxx index 107ab4575784..38d6e5606051 100644 --- a/connectivity/source/drivers/macab/MacabColumns.cxx +++ b/connectivity/source/drivers/macab/MacabColumns.cxx @@ -35,12 +35,12 @@ using namespace ::com::sun::star::container; using namespace ::com::sun::star::lang; // ------------------------------------------------------------------------- -sdbcx::ObjectType MacabColumns::createObject(const ::rtl::OUString& _rName) +sdbcx::ObjectType MacabColumns::createObject(const OUString& _rName) { const Any aCatalog; - const ::rtl::OUString sCatalogName; - const ::rtl::OUString sSchemaName(m_pTable->getSchema()); - const ::rtl::OUString sTableName(m_pTable->getTableName()); + const OUString sCatalogName; + const OUString sSchemaName(m_pTable->getSchema()); + const OUString sTableName(m_pTable->getTableName()); Reference< XResultSet > xResult = m_pTable->getConnection()->getMetaData()->getColumns( aCatalog, sSchemaName, sTableName, _rName); diff --git a/connectivity/source/drivers/macab/MacabColumns.hxx b/connectivity/source/drivers/macab/MacabColumns.hxx index 0979cf7212e9..4044d6988f94 100644 --- a/connectivity/source/drivers/macab/MacabColumns.hxx +++ b/connectivity/source/drivers/macab/MacabColumns.hxx @@ -32,7 +32,7 @@ namespace connectivity protected: MacabTable* m_pTable; - virtual sdbcx::ObjectType createObject(const ::rtl::OUString& _rName); + virtual sdbcx::ObjectType createObject(const OUString& _rName); virtual void impl_refresh() throw(::com::sun::star::uno::RuntimeException); public: diff --git a/connectivity/source/drivers/macab/MacabConnection.cxx b/connectivity/source/drivers/macab/MacabConnection.cxx index 5b4db40ff89d..6932f5aea724 100644 --- a/connectivity/source/drivers/macab/MacabConnection.cxx +++ b/connectivity/source/drivers/macab/MacabConnection.cxx @@ -59,7 +59,7 @@ void SAL_CALL MacabConnection::release() throw() relase_ChildImpl(); } // ----------------------------------------------------------------------------- -void MacabConnection::construct(const ::rtl::OUString&, const Sequence< PropertyValue >&) throw(SQLException) +void MacabConnection::construct(const OUString&, const Sequence< PropertyValue >&) throw(SQLException) { osl_atomic_increment( &m_refCount ); @@ -82,7 +82,7 @@ Reference< XStatement > SAL_CALL MacabConnection::createStatement( ) throw(SQLE return xReturn; } // -------------------------------------------------------------------------------- -Reference< XPreparedStatement > SAL_CALL MacabConnection::prepareStatement( const ::rtl::OUString& _sSql ) throw(SQLException, RuntimeException) +Reference< XPreparedStatement > SAL_CALL MacabConnection::prepareStatement( const OUString& _sSql ) throw(SQLException, RuntimeException) { ::osl::MutexGuard aGuard( m_aMutex ); checkDisposed(MacabConnection_BASE::rBHelper.bDisposed); @@ -94,7 +94,7 @@ Reference< XPreparedStatement > SAL_CALL MacabConnection::prepareStatement( cons return xReturn; } // -------------------------------------------------------------------------------- -Reference< XPreparedStatement > SAL_CALL MacabConnection::prepareCall( const ::rtl::OUString& ) throw(SQLException, RuntimeException) +Reference< XPreparedStatement > SAL_CALL MacabConnection::prepareCall( const OUString& ) throw(SQLException, RuntimeException) { ::osl::MutexGuard aGuard( m_aMutex ); checkDisposed(MacabConnection_BASE::rBHelper.bDisposed); @@ -103,7 +103,7 @@ Reference< XPreparedStatement > SAL_CALL MacabConnection::prepareCall( const ::r return NULL; } // -------------------------------------------------------------------------------- -::rtl::OUString SAL_CALL MacabConnection::nativeSQL( const ::rtl::OUString& _sSql ) throw(SQLException, RuntimeException) +OUString SAL_CALL MacabConnection::nativeSQL( const OUString& _sSql ) throw(SQLException, RuntimeException) { ::osl::MutexGuard aGuard( m_aMutex ); // when you need to transform SQL92 to you driver specific you can do it here @@ -186,7 +186,7 @@ sal_Bool SAL_CALL MacabConnection::isReadOnly( ) throw(SQLException, RuntimeExc return sal_False; } // -------------------------------------------------------------------------------- -void SAL_CALL MacabConnection::setCatalog( const ::rtl::OUString& ) throw(SQLException, RuntimeException) +void SAL_CALL MacabConnection::setCatalog( const OUString& ) throw(SQLException, RuntimeException) { ::osl::MutexGuard aGuard( m_aMutex ); checkDisposed(MacabConnection_BASE::rBHelper.bDisposed); @@ -194,14 +194,14 @@ void SAL_CALL MacabConnection::setCatalog( const ::rtl::OUString& ) throw(SQLExc // if your database doesn't work with catalogs you go to next method otherwise you kjnow what to do } // -------------------------------------------------------------------------------- -::rtl::OUString SAL_CALL MacabConnection::getCatalog( ) throw(SQLException, RuntimeException) +OUString SAL_CALL MacabConnection::getCatalog( ) throw(SQLException, RuntimeException) { ::osl::MutexGuard aGuard( m_aMutex ); checkDisposed(MacabConnection_BASE::rBHelper.bDisposed); // return your current catalog - return ::rtl::OUString(); + return OUString(); } // -------------------------------------------------------------------------------- void SAL_CALL MacabConnection::setTransactionIsolation( sal_Int32 ) throw(SQLException, RuntimeException) diff --git a/connectivity/source/drivers/macab/MacabConnection.hxx b/connectivity/source/drivers/macab/MacabConnection.hxx index 66c592f5482d..853628625845 100644 --- a/connectivity/source/drivers/macab/MacabConnection.hxx +++ b/connectivity/source/drivers/macab/MacabConnection.hxx @@ -65,7 +65,7 @@ namespace connectivity m_xCatalog; // needed for the SQL interpreter public: - virtual void construct( const ::rtl::OUString& url,const ::com::sun::star::uno::Sequence< ::com::sun::star::beans::PropertyValue >& info) throw(::com::sun::star::sdbc::SQLException); + virtual void construct( const OUString& url,const ::com::sun::star::uno::Sequence< ::com::sun::star::beans::PropertyValue >& info) throw(::com::sun::star::sdbc::SQLException); MacabConnection(MacabDriver* _pDriver); virtual ~MacabConnection(); @@ -83,9 +83,9 @@ namespace connectivity // XConnection virtual ::com::sun::star::uno::Reference< ::com::sun::star::sdbc::XStatement > SAL_CALL createStatement( ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException); - virtual ::com::sun::star::uno::Reference< ::com::sun::star::sdbc::XPreparedStatement > SAL_CALL prepareStatement( const ::rtl::OUString& sql ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException); - virtual ::com::sun::star::uno::Reference< ::com::sun::star::sdbc::XPreparedStatement > SAL_CALL prepareCall( const ::rtl::OUString& sql ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException); - virtual ::rtl::OUString SAL_CALL nativeSQL( const ::rtl::OUString& sql ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException); + virtual ::com::sun::star::uno::Reference< ::com::sun::star::sdbc::XPreparedStatement > SAL_CALL prepareStatement( const OUString& sql ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException); + virtual ::com::sun::star::uno::Reference< ::com::sun::star::sdbc::XPreparedStatement > SAL_CALL prepareCall( const OUString& sql ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException); + virtual OUString SAL_CALL nativeSQL( const OUString& sql ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException); virtual void SAL_CALL setAutoCommit( sal_Bool autoCommit ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException); virtual sal_Bool SAL_CALL getAutoCommit( ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException); virtual void SAL_CALL commit( ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException); @@ -94,8 +94,8 @@ namespace connectivity virtual ::com::sun::star::uno::Reference< ::com::sun::star::sdbc::XDatabaseMetaData > SAL_CALL getMetaData( ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException); virtual void SAL_CALL setReadOnly( sal_Bool readOnly ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException); virtual sal_Bool SAL_CALL isReadOnly( ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException); - virtual void SAL_CALL setCatalog( const ::rtl::OUString& catalog ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException); - virtual ::rtl::OUString SAL_CALL getCatalog( ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException); + virtual void SAL_CALL setCatalog( const OUString& catalog ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException); + virtual OUString SAL_CALL getCatalog( ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException); virtual void SAL_CALL setTransactionIsolation( sal_Int32 level ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException); virtual sal_Int32 SAL_CALL getTransactionIsolation( ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException); virtual ::com::sun::star::uno::Reference< ::com::sun::star::container::XNameAccess > SAL_CALL getTypeMap( ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException); diff --git a/connectivity/source/drivers/macab/MacabDatabaseMetaData.cxx b/connectivity/source/drivers/macab/MacabDatabaseMetaData.cxx index 7ce636312732..a832c33faec7 100644 --- a/connectivity/source/drivers/macab/MacabDatabaseMetaData.cxx +++ b/connectivity/source/drivers/macab/MacabDatabaseMetaData.cxx @@ -54,9 +54,9 @@ MacabDatabaseMetaData::~MacabDatabaseMetaData() { } // ------------------------------------------------------------------------- -::rtl::OUString SAL_CALL MacabDatabaseMetaData::getCatalogSeparator( ) throw(SQLException, RuntimeException) +OUString SAL_CALL MacabDatabaseMetaData::getCatalogSeparator( ) throw(SQLException, RuntimeException) { - ::rtl::OUString aVal; + OUString aVal; if (m_bUseCatalog) { // do some special here for you database } @@ -194,25 +194,25 @@ sal_Bool SAL_CALL MacabDatabaseMetaData::supportsNonNullableColumns( ) throw(SQ return sal_False; } // ------------------------------------------------------------------------- -::rtl::OUString SAL_CALL MacabDatabaseMetaData::getCatalogTerm( ) throw(SQLException, RuntimeException) +OUString SAL_CALL MacabDatabaseMetaData::getCatalogTerm( ) throw(SQLException, RuntimeException) { - ::rtl::OUString aVal; + OUString aVal; if (m_bUseCatalog) { } return aVal; } // ------------------------------------------------------------------------- -::rtl::OUString SAL_CALL MacabDatabaseMetaData::getIdentifierQuoteString( ) throw(SQLException, RuntimeException) +OUString SAL_CALL MacabDatabaseMetaData::getIdentifierQuoteString( ) throw(SQLException, RuntimeException) { // normally this is " - ::rtl::OUString aVal("\""); + OUString aVal("\""); return aVal; } // ------------------------------------------------------------------------- -::rtl::OUString SAL_CALL MacabDatabaseMetaData::getExtraNameCharacters( ) throw(SQLException, RuntimeException) +OUString SAL_CALL MacabDatabaseMetaData::getExtraNameCharacters( ) throw(SQLException, RuntimeException) { - ::rtl::OUString aVal; + OUString aVal; return aVal; } // ------------------------------------------------------------------------- @@ -549,53 +549,53 @@ sal_Bool SAL_CALL MacabDatabaseMetaData::supportsANSI92IntermediateSQL( ) throw return sal_False; } // ------------------------------------------------------------------------- -::rtl::OUString SAL_CALL MacabDatabaseMetaData::getURL( ) throw(SQLException, RuntimeException) +OUString SAL_CALL MacabDatabaseMetaData::getURL( ) throw(SQLException, RuntimeException) { // if someday we support more than the default address book, // this method should return the URL which was used to create it - ::rtl::OUString aValue( "sdbc:address:macab:" ); + OUString aValue( "sdbc:address:macab:" ); return aValue; } // ------------------------------------------------------------------------- -::rtl::OUString SAL_CALL MacabDatabaseMetaData::getUserName( ) throw(SQLException, RuntimeException) +OUString SAL_CALL MacabDatabaseMetaData::getUserName( ) throw(SQLException, RuntimeException) { - ::rtl::OUString aValue; + OUString aValue; return aValue; } // ------------------------------------------------------------------------- -::rtl::OUString SAL_CALL MacabDatabaseMetaData::getDriverName( ) throw(SQLException, RuntimeException) +OUString SAL_CALL MacabDatabaseMetaData::getDriverName( ) throw(SQLException, RuntimeException) { - ::rtl::OUString aValue( "macab" ); + OUString aValue( "macab" ); return aValue; } // ------------------------------------------------------------------------- -::rtl::OUString SAL_CALL MacabDatabaseMetaData::getDriverVersion() throw(SQLException, RuntimeException) +OUString SAL_CALL MacabDatabaseMetaData::getDriverVersion() throw(SQLException, RuntimeException) { - ::rtl::OUString aValue(MACAB_DRIVER_VERSION); + OUString aValue(MACAB_DRIVER_VERSION); return aValue; } // ------------------------------------------------------------------------- -::rtl::OUString SAL_CALL MacabDatabaseMetaData::getDatabaseProductVersion( ) throw(SQLException, RuntimeException) +OUString SAL_CALL MacabDatabaseMetaData::getDatabaseProductVersion( ) throw(SQLException, RuntimeException) { - ::rtl::OUString aValue; + OUString aValue; return aValue; } // ------------------------------------------------------------------------- -::rtl::OUString SAL_CALL MacabDatabaseMetaData::getDatabaseProductName( ) throw(SQLException, RuntimeException) +OUString SAL_CALL MacabDatabaseMetaData::getDatabaseProductName( ) throw(SQLException, RuntimeException) { - ::rtl::OUString aValue; + OUString aValue; return aValue; } // ------------------------------------------------------------------------- -::rtl::OUString SAL_CALL MacabDatabaseMetaData::getProcedureTerm( ) throw(SQLException, RuntimeException) +OUString SAL_CALL MacabDatabaseMetaData::getProcedureTerm( ) throw(SQLException, RuntimeException) { - ::rtl::OUString aValue; + OUString aValue; return aValue; } // ------------------------------------------------------------------------- -::rtl::OUString SAL_CALL MacabDatabaseMetaData::getSchemaTerm( ) throw(SQLException, RuntimeException) +OUString SAL_CALL MacabDatabaseMetaData::getSchemaTerm( ) throw(SQLException, RuntimeException) { - ::rtl::OUString aValue; + OUString aValue; return aValue; } // ------------------------------------------------------------------------- @@ -614,36 +614,36 @@ sal_Int32 SAL_CALL MacabDatabaseMetaData::getDriverMinorVersion( ) throw(Runtim return MACAB_DRIVER_VERSION_MINOR; } // ------------------------------------------------------------------------- -::rtl::OUString SAL_CALL MacabDatabaseMetaData::getSQLKeywords( ) throw(SQLException, RuntimeException) +OUString SAL_CALL MacabDatabaseMetaData::getSQLKeywords( ) throw(SQLException, RuntimeException) { - ::rtl::OUString aValue; + OUString aValue; return aValue; } // ------------------------------------------------------------------------- -::rtl::OUString SAL_CALL MacabDatabaseMetaData::getSearchStringEscape( ) throw(SQLException, RuntimeException) +OUString SAL_CALL MacabDatabaseMetaData::getSearchStringEscape( ) throw(SQLException, RuntimeException) { - ::rtl::OUString aValue; + OUString aValue; return aValue; } // ------------------------------------------------------------------------- -::rtl::OUString SAL_CALL MacabDatabaseMetaData::getStringFunctions( ) throw(SQLException, RuntimeException) +OUString SAL_CALL MacabDatabaseMetaData::getStringFunctions( ) throw(SQLException, RuntimeException) { - return ::rtl::OUString(); + return OUString(); } // ------------------------------------------------------------------------- -::rtl::OUString SAL_CALL MacabDatabaseMetaData::getTimeDateFunctions( ) throw(SQLException, RuntimeException) +OUString SAL_CALL MacabDatabaseMetaData::getTimeDateFunctions( ) throw(SQLException, RuntimeException) { - return ::rtl::OUString(); + return OUString(); } // ------------------------------------------------------------------------- -::rtl::OUString SAL_CALL MacabDatabaseMetaData::getSystemFunctions( ) throw(SQLException, RuntimeException) +OUString SAL_CALL MacabDatabaseMetaData::getSystemFunctions( ) throw(SQLException, RuntimeException) { - return ::rtl::OUString(); + return OUString(); } // ------------------------------------------------------------------------- -::rtl::OUString SAL_CALL MacabDatabaseMetaData::getNumericFunctions( ) throw(SQLException, RuntimeException) +OUString SAL_CALL MacabDatabaseMetaData::getNumericFunctions( ) throw(SQLException, RuntimeException) { - return ::rtl::OUString(); + return OUString(); } // ------------------------------------------------------------------------- sal_Bool SAL_CALL MacabDatabaseMetaData::supportsExtendedSQLGrammar( ) throw(SQLException, RuntimeException) @@ -778,7 +778,7 @@ Reference< XResultSet > SAL_CALL MacabDatabaseMetaData::getTableTypes( ) throw( Reference< XResultSet > xRef = pResult; static ODatabaseMetaDataResultSet::ORows aRows; - static const ::rtl::OUString aTable("TABLE"); + static const OUString aTable("TABLE"); if (aRows.empty()) { @@ -803,7 +803,7 @@ Reference< XResultSet > SAL_CALL MacabDatabaseMetaData::getTypeInfo( ) throw(SQ // We support four types: char, timestamp, integer, float aRow[0] = ODatabaseMetaDataResultSet::getEmptyValue(); - aRow[1] = new ORowSetValueDecorator(::rtl::OUString("CHAR")); + aRow[1] = new ORowSetValueDecorator(OUString("CHAR")); aRow[2] = new ORowSetValueDecorator(DataType::CHAR); aRow[3] = new ORowSetValueDecorator((sal_Int32) 254); aRow[4] = ODatabaseMetaDataResultSet::getQuoteValue(); @@ -824,20 +824,20 @@ Reference< XResultSet > SAL_CALL MacabDatabaseMetaData::getTypeInfo( ) throw(SQ aRows.push_back(aRow); - aRow[1] = new ORowSetValueDecorator(::rtl::OUString("TIMESTAMP")); + aRow[1] = new ORowSetValueDecorator(OUString("TIMESTAMP")); aRow[2] = new ORowSetValueDecorator(DataType::TIMESTAMP); aRow[3] = new ORowSetValueDecorator((sal_Int32)19); aRow[4] = ODatabaseMetaDataResultSet::getQuoteValue(); aRow[5] = ODatabaseMetaDataResultSet::getQuoteValue(); aRows.push_back(aRow); - aRow[1] = new ORowSetValueDecorator(::rtl::OUString("INTEGER")); + aRow[1] = new ORowSetValueDecorator(OUString("INTEGER")); aRow[2] = new ORowSetValueDecorator(DataType::INTEGER); aRow[3] = new ORowSetValueDecorator((sal_Int32)20); aRow[15] = new ORowSetValueDecorator((sal_Int32)20); aRows.push_back(aRow); - aRow[1] = new ORowSetValueDecorator(::rtl::OUString("FLOAT")); + aRow[1] = new ORowSetValueDecorator(OUString("FLOAT")); aRow[2] = new ORowSetValueDecorator(DataType::FLOAT); aRow[3] = new ORowSetValueDecorator((sal_Int32)20); aRow[15] = new ORowSetValueDecorator((sal_Int32)15); @@ -858,22 +858,22 @@ Reference< XResultSet > SAL_CALL MacabDatabaseMetaData::getSchemas( ) throw(SQL } // ------------------------------------------------------------------------- Reference< XResultSet > SAL_CALL MacabDatabaseMetaData::getColumnPrivileges( - const Any&, const ::rtl::OUString&, const ::rtl::OUString&, - const ::rtl::OUString& ) throw(SQLException, RuntimeException) + const Any&, const OUString&, const OUString&, + const OUString& ) throw(SQLException, RuntimeException) { return new ODatabaseMetaDataResultSet( ODatabaseMetaDataResultSet::eColumnPrivileges ); } // ------------------------------------------------------------------------- Reference< XResultSet > SAL_CALL MacabDatabaseMetaData::getColumns( const Any&, - const ::rtl::OUString&, - const ::rtl::OUString& tableNamePattern, - const ::rtl::OUString& columnNamePattern) throw(SQLException, RuntimeException) + const OUString&, + const OUString& tableNamePattern, + const OUString& columnNamePattern) throw(SQLException, RuntimeException) { ::connectivity::ODatabaseMetaDataResultSet* pResult = new ::connectivity::ODatabaseMetaDataResultSet(::connectivity::ODatabaseMetaDataResultSet::eColumns); Reference< XResultSet > xRef = pResult; MacabRecords *aRecords; - ::rtl::OUString sTableName; + OUString sTableName; aRecords = m_xConnection->getAddressBook()->getMacabRecordsMatch(tableNamePattern); @@ -898,10 +898,10 @@ Reference< XResultSet > SAL_CALL MacabDatabaseMetaData::getColumns( aRow[14] = ODatabaseMetaDataResultSet::getEmptyValue(); aRow[15] = ODatabaseMetaDataResultSet::getEmptyValue(); aRow[16] = new ORowSetValueDecorator((sal_Int32) 254); - aRow[18] = new ORowSetValueDecorator(::rtl::OUString("YES")); + aRow[18] = new ORowSetValueDecorator(OUString("YES")); sal_Int32 nPosition = 1; - ::rtl::OUString sName; + OUString sName; MacabHeader::iterator aField; @@ -919,24 +919,24 @@ Reference< XResultSet > SAL_CALL MacabDatabaseMetaData::getColumns( { case kABStringProperty: aRow[5] = new ORowSetValueDecorator(DataType::CHAR); - aRow[6] = new ORowSetValueDecorator(::rtl::OUString("CHAR")); + aRow[6] = new ORowSetValueDecorator(OUString("CHAR")); aRow[7] = new ORowSetValueDecorator((sal_Int32) 256); aRows.push_back(aRow); break; case kABDateProperty: aRow[5] = new ORowSetValueDecorator(DataType::TIMESTAMP); - aRow[6] = new ORowSetValueDecorator(::rtl::OUString("TIMESTAMP")); + aRow[6] = new ORowSetValueDecorator(OUString("TIMESTAMP")); aRows.push_back(aRow); break; case kABIntegerProperty: aRow[5] = new ORowSetValueDecorator(DataType::INTEGER); - aRow[6] = new ORowSetValueDecorator(::rtl::OUString("INTEGER")); + aRow[6] = new ORowSetValueDecorator(OUString("INTEGER")); aRow[7] = new ORowSetValueDecorator((sal_Int32) 20); aRows.push_back(aRow); break; case kABRealProperty: aRow[5] = new ORowSetValueDecorator(DataType::FLOAT); - aRow[6] = new ORowSetValueDecorator(::rtl::OUString("FLOAT")); + aRow[6] = new ORowSetValueDecorator(OUString("FLOAT")); aRow[7] = new ORowSetValueDecorator((sal_Int32) 15); aRows.push_back(aRow); break; @@ -953,9 +953,9 @@ Reference< XResultSet > SAL_CALL MacabDatabaseMetaData::getColumns( // ------------------------------------------------------------------------- Reference< XResultSet > SAL_CALL MacabDatabaseMetaData::getTables( const Any&, - const ::rtl::OUString&, - const ::rtl::OUString&, - const Sequence< ::rtl::OUString >& types) throw(SQLException, RuntimeException) + const OUString&, + const OUString&, + const Sequence< OUString >& types) throw(SQLException, RuntimeException) { ODatabaseMetaDataResultSet* pResult = new ODatabaseMetaDataResultSet(::connectivity::ODatabaseMetaDataResultSet::eTables); Reference< XResultSet > xRef = pResult; @@ -963,9 +963,9 @@ Reference< XResultSet > SAL_CALL MacabDatabaseMetaData::getTables( // check whether we have tables in the requested types // for the moment, we answer only the "TABLE" table type // when no types are given at all, we return all the tables - static const ::rtl::OUString aTable("TABLE"); + static const OUString aTable("TABLE"); sal_Bool bTableFound = sal_False; - const ::rtl::OUString* p = types.getConstArray(), + const OUString* p = types.getConstArray(), * pEnd = p + types.getLength(); if (p == pEnd) @@ -1014,21 +1014,21 @@ Reference< XResultSet > SAL_CALL MacabDatabaseMetaData::getTables( } // ------------------------------------------------------------------------- Reference< XResultSet > SAL_CALL MacabDatabaseMetaData::getProcedureColumns( - const Any&, const ::rtl::OUString&, - const ::rtl::OUString&, const ::rtl::OUString& ) throw(SQLException, RuntimeException) + const Any&, const OUString&, + const OUString&, const OUString& ) throw(SQLException, RuntimeException) { return new ODatabaseMetaDataResultSet( ODatabaseMetaDataResultSet::eProcedureColumns ); } // ------------------------------------------------------------------------- Reference< XResultSet > SAL_CALL MacabDatabaseMetaData::getProcedures( - const Any&, const ::rtl::OUString&, - const ::rtl::OUString& ) throw(SQLException, RuntimeException) + const Any&, const OUString&, + const OUString& ) throw(SQLException, RuntimeException) { return new ODatabaseMetaDataResultSet( ODatabaseMetaDataResultSet::eProcedures ); } // ------------------------------------------------------------------------- Reference< XResultSet > SAL_CALL MacabDatabaseMetaData::getVersionColumns( - const Any&, const ::rtl::OUString&, const ::rtl::OUString& table ) throw(SQLException, RuntimeException) + const Any&, const OUString&, const OUString& table ) throw(SQLException, RuntimeException) { ::connectivity::ODatabaseMetaDataResultSet* pResult = new ::connectivity::ODatabaseMetaDataResultSet(::connectivity::ODatabaseMetaDataResultSet::eVersionColumns); Reference< XResultSet > xRef = pResult; @@ -1039,13 +1039,13 @@ Reference< XResultSet > SAL_CALL MacabDatabaseMetaData::getVersionColumns( { ODatabaseMetaDataResultSet::ORow aRow( 9 ); - ::rtl::OUString sName = CFStringToOUString(kABModificationDateProperty); + OUString sName = CFStringToOUString(kABModificationDateProperty); aRow[0] = ODatabaseMetaDataResultSet::getEmptyValue(); aRow[1] = ODatabaseMetaDataResultSet::getEmptyValue(); aRow[2] = new ORowSetValueDecorator(sName); aRow[3] = new ORowSetValueDecorator(DataType::TIMESTAMP); - aRow[4] = new ORowSetValueDecorator(::rtl::OUString("TIMESTAMP")); + aRow[4] = new ORowSetValueDecorator(OUString("TIMESTAMP")); aRow[5] = ODatabaseMetaDataResultSet::getEmptyValue(); aRow[6] = ODatabaseMetaDataResultSet::getEmptyValue(); @@ -1059,52 +1059,52 @@ Reference< XResultSet > SAL_CALL MacabDatabaseMetaData::getVersionColumns( } // ------------------------------------------------------------------------- Reference< XResultSet > SAL_CALL MacabDatabaseMetaData::getExportedKeys( - const Any&, const ::rtl::OUString&, const ::rtl::OUString& ) throw(SQLException, RuntimeException) + const Any&, const OUString&, const OUString& ) throw(SQLException, RuntimeException) { return new ODatabaseMetaDataResultSet( ODatabaseMetaDataResultSet::eExportedKeys ); } // ------------------------------------------------------------------------- Reference< XResultSet > SAL_CALL MacabDatabaseMetaData::getImportedKeys( - const Any&, const ::rtl::OUString&, const ::rtl::OUString& ) throw(SQLException, RuntimeException) + const Any&, const OUString&, const OUString& ) throw(SQLException, RuntimeException) { return new ODatabaseMetaDataResultSet( ODatabaseMetaDataResultSet::eImportedKeys ); } // ------------------------------------------------------------------------- Reference< XResultSet > SAL_CALL MacabDatabaseMetaData::getPrimaryKeys( - const Any&, const ::rtl::OUString&, const ::rtl::OUString& ) throw(SQLException, RuntimeException) + const Any&, const OUString&, const OUString& ) throw(SQLException, RuntimeException) { return new ODatabaseMetaDataResultSet( ODatabaseMetaDataResultSet::ePrimaryKeys ); } // ------------------------------------------------------------------------- Reference< XResultSet > SAL_CALL MacabDatabaseMetaData::getIndexInfo( - const Any&, const ::rtl::OUString&, const ::rtl::OUString&, + const Any&, const OUString&, const OUString&, sal_Bool, sal_Bool ) throw(SQLException, RuntimeException) { return new ODatabaseMetaDataResultSet( ODatabaseMetaDataResultSet::eIndexInfo ); } // ------------------------------------------------------------------------- Reference< XResultSet > SAL_CALL MacabDatabaseMetaData::getBestRowIdentifier( - const Any&, const ::rtl::OUString&, const ::rtl::OUString&, sal_Int32, + const Any&, const OUString&, const OUString&, sal_Int32, sal_Bool ) throw(SQLException, RuntimeException) { return new ODatabaseMetaDataResultSet( ODatabaseMetaDataResultSet::eBestRowIdentifier ); } // ------------------------------------------------------------------------- Reference< XResultSet > SAL_CALL MacabDatabaseMetaData::getTablePrivileges( - const Any&, const ::rtl::OUString&, const ::rtl::OUString& ) throw(SQLException, RuntimeException) + const Any&, const OUString&, const OUString& ) throw(SQLException, RuntimeException) { return new ODatabaseMetaDataResultSet( ODatabaseMetaDataResultSet::eTablePrivileges ); } // ------------------------------------------------------------------------- Reference< XResultSet > SAL_CALL MacabDatabaseMetaData::getCrossReference( - const Any&, const ::rtl::OUString&, - const ::rtl::OUString&, const Any&, - const ::rtl::OUString&, const ::rtl::OUString& ) throw(SQLException, RuntimeException) + const Any&, const OUString&, + const OUString&, const Any&, + const OUString&, const OUString& ) throw(SQLException, RuntimeException) { return new ODatabaseMetaDataResultSet( ODatabaseMetaDataResultSet::eCrossReference ); } // ------------------------------------------------------------------------- -Reference< XResultSet > SAL_CALL MacabDatabaseMetaData::getUDTs( const Any&, const ::rtl::OUString&, const ::rtl::OUString&, const Sequence< sal_Int32 >& ) throw(SQLException, RuntimeException) +Reference< XResultSet > SAL_CALL MacabDatabaseMetaData::getUDTs( const Any&, const OUString&, const OUString&, const Sequence< sal_Int32 >& ) throw(SQLException, RuntimeException) { OSL_FAIL("Not implemented yet!"); throw SQLException(); diff --git a/connectivity/source/drivers/macab/MacabDatabaseMetaData.hxx b/connectivity/source/drivers/macab/MacabDatabaseMetaData.hxx index 54a626c4adaa..20b75f1da632 100644 --- a/connectivity/source/drivers/macab/MacabDatabaseMetaData.hxx +++ b/connectivity/source/drivers/macab/MacabDatabaseMetaData.hxx @@ -50,17 +50,17 @@ namespace connectivity // XDatabaseMetaData virtual sal_Bool SAL_CALL allProceduresAreCallable( ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException); virtual sal_Bool SAL_CALL allTablesAreSelectable( ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException); - virtual ::rtl::OUString SAL_CALL getURL( ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException); - virtual ::rtl::OUString SAL_CALL getUserName( ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException); + virtual OUString SAL_CALL getURL( ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException); + virtual OUString SAL_CALL getUserName( ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException); virtual sal_Bool SAL_CALL isReadOnly( ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException); virtual sal_Bool SAL_CALL nullsAreSortedHigh( ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException); virtual sal_Bool SAL_CALL nullsAreSortedLow( ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException); virtual sal_Bool SAL_CALL nullsAreSortedAtStart( ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException); virtual sal_Bool SAL_CALL nullsAreSortedAtEnd( ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException); - virtual ::rtl::OUString SAL_CALL getDatabaseProductName( ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException); - virtual ::rtl::OUString SAL_CALL getDatabaseProductVersion( ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException); - virtual ::rtl::OUString SAL_CALL getDriverName( ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException); - virtual ::rtl::OUString SAL_CALL getDriverVersion( ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException); + virtual OUString SAL_CALL getDatabaseProductName( ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException); + virtual OUString SAL_CALL getDatabaseProductVersion( ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException); + virtual OUString SAL_CALL getDriverName( ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException); + virtual OUString SAL_CALL getDriverVersion( ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException); virtual sal_Int32 SAL_CALL getDriverMajorVersion( ) throw(::com::sun::star::uno::RuntimeException); virtual sal_Int32 SAL_CALL getDriverMinorVersion( ) throw(::com::sun::star::uno::RuntimeException); virtual sal_Bool SAL_CALL usesLocalFiles( ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException); @@ -73,14 +73,14 @@ namespace connectivity virtual sal_Bool SAL_CALL storesUpperCaseQuotedIdentifiers( ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException); virtual sal_Bool SAL_CALL storesLowerCaseQuotedIdentifiers( ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException); virtual sal_Bool SAL_CALL storesMixedCaseQuotedIdentifiers( ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException); - virtual ::rtl::OUString SAL_CALL getIdentifierQuoteString( ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException); - virtual ::rtl::OUString SAL_CALL getSQLKeywords( ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException); - virtual ::rtl::OUString SAL_CALL getNumericFunctions( ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException); - virtual ::rtl::OUString SAL_CALL getStringFunctions( ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException); - virtual ::rtl::OUString SAL_CALL getSystemFunctions( ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException); - virtual ::rtl::OUString SAL_CALL getTimeDateFunctions( ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException); - virtual ::rtl::OUString SAL_CALL getSearchStringEscape( ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException); - virtual ::rtl::OUString SAL_CALL getExtraNameCharacters( ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException); + virtual OUString SAL_CALL getIdentifierQuoteString( ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException); + virtual OUString SAL_CALL getSQLKeywords( ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException); + virtual OUString SAL_CALL getNumericFunctions( ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException); + virtual OUString SAL_CALL getStringFunctions( ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException); + virtual OUString SAL_CALL getSystemFunctions( ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException); + virtual OUString SAL_CALL getTimeDateFunctions( ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException); + virtual OUString SAL_CALL getSearchStringEscape( ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException); + virtual OUString SAL_CALL getExtraNameCharacters( ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException); virtual sal_Bool SAL_CALL supportsAlterTableWithAddColumn( ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException); virtual sal_Bool SAL_CALL supportsAlterTableWithDropColumn( ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException); virtual sal_Bool SAL_CALL supportsColumnAliasing( ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException); @@ -108,11 +108,11 @@ namespace connectivity virtual sal_Bool SAL_CALL supportsOuterJoins( ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException); virtual sal_Bool SAL_CALL supportsFullOuterJoins( ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException); virtual sal_Bool SAL_CALL supportsLimitedOuterJoins( ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException); - virtual ::rtl::OUString SAL_CALL getSchemaTerm( ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException); - virtual ::rtl::OUString SAL_CALL getProcedureTerm( ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException); - virtual ::rtl::OUString SAL_CALL getCatalogTerm( ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException); + virtual OUString SAL_CALL getSchemaTerm( ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException); + virtual OUString SAL_CALL getProcedureTerm( ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException); + virtual OUString SAL_CALL getCatalogTerm( ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException); virtual sal_Bool SAL_CALL isCatalogAtStart( ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException); - virtual ::rtl::OUString SAL_CALL getCatalogSeparator( ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException); + virtual OUString SAL_CALL getCatalogSeparator( ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException); virtual sal_Bool SAL_CALL supportsSchemasInDataManipulation( ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException); virtual sal_Bool SAL_CALL supportsSchemasInProcedureCalls( ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException); virtual sal_Bool SAL_CALL supportsSchemasInTableDefinitions( ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException); @@ -166,23 +166,23 @@ namespace connectivity virtual sal_Bool SAL_CALL supportsDataManipulationTransactionsOnly( ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException); virtual sal_Bool SAL_CALL dataDefinitionCausesTransactionCommit( ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException); virtual sal_Bool SAL_CALL dataDefinitionIgnoredInTransactions( ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException); - virtual ::com::sun::star::uno::Reference< ::com::sun::star::sdbc::XResultSet > SAL_CALL getProcedures( const ::com::sun::star::uno::Any& catalog, const ::rtl::OUString& schemaPattern, const ::rtl::OUString& procedureNamePattern ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException); - virtual ::com::sun::star::uno::Reference< ::com::sun::star::sdbc::XResultSet > SAL_CALL getProcedureColumns( const ::com::sun::star::uno::Any& catalog, const ::rtl::OUString& schemaPattern, const ::rtl::OUString& procedureNamePattern, const ::rtl::OUString& columnNamePattern ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException); - virtual ::com::sun::star::uno::Reference< ::com::sun::star::sdbc::XResultSet > SAL_CALL getTables( const ::com::sun::star::uno::Any& catalog, const ::rtl::OUString& schemaPattern, const ::rtl::OUString& tableNamePattern, const ::com::sun::star::uno::Sequence< ::rtl::OUString >& types ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException); + virtual ::com::sun::star::uno::Reference< ::com::sun::star::sdbc::XResultSet > SAL_CALL getProcedures( const ::com::sun::star::uno::Any& catalog, const OUString& schemaPattern, const OUString& procedureNamePattern ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException); + virtual ::com::sun::star::uno::Reference< ::com::sun::star::sdbc::XResultSet > SAL_CALL getProcedureColumns( const ::com::sun::star::uno::Any& catalog, const OUString& schemaPattern, const OUString& procedureNamePattern, const OUString& columnNamePattern ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException); + virtual ::com::sun::star::uno::Reference< ::com::sun::star::sdbc::XResultSet > SAL_CALL getTables( const ::com::sun::star::uno::Any& catalog, const OUString& schemaPattern, const OUString& tableNamePattern, const ::com::sun::star::uno::Sequence< OUString >& types ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException); virtual ::com::sun::star::uno::Reference< ::com::sun::star::sdbc::XResultSet > SAL_CALL getSchemas( ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException); virtual ::com::sun::star::uno::Reference< ::com::sun::star::sdbc::XResultSet > SAL_CALL getCatalogs( ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException); virtual ::com::sun::star::uno::Reference< ::com::sun::star::sdbc::XResultSet > SAL_CALL getTableTypes( ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException); - virtual ::com::sun::star::uno::Reference< ::com::sun::star::sdbc::XResultSet > SAL_CALL getColumns( const ::com::sun::star::uno::Any& catalog, const ::rtl::OUString& schemaPattern, const ::rtl::OUString& tableNamePattern, const ::rtl::OUString& columnNamePattern ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException); - virtual ::com::sun::star::uno::Reference< ::com::sun::star::sdbc::XResultSet > SAL_CALL getColumnPrivileges( const ::com::sun::star::uno::Any& catalog, const ::rtl::OUString& schema, const ::rtl::OUString& table, const ::rtl::OUString& columnNamePattern ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException); - virtual ::com::sun::star::uno::Reference< ::com::sun::star::sdbc::XResultSet > SAL_CALL getTablePrivileges( const ::com::sun::star::uno::Any& catalog, const ::rtl::OUString& schemaPattern, const ::rtl::OUString& tableNamePattern ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException); - virtual ::com::sun::star::uno::Reference< ::com::sun::star::sdbc::XResultSet > SAL_CALL getBestRowIdentifier( const ::com::sun::star::uno::Any& catalog, const ::rtl::OUString& schema, const ::rtl::OUString& table, sal_Int32 scope, sal_Bool nullable ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException); - virtual ::com::sun::star::uno::Reference< ::com::sun::star::sdbc::XResultSet > SAL_CALL getVersionColumns( const ::com::sun::star::uno::Any& catalog, const ::rtl::OUString& schema, const ::rtl::OUString& table ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException); - virtual ::com::sun::star::uno::Reference< ::com::sun::star::sdbc::XResultSet > SAL_CALL getPrimaryKeys( const ::com::sun::star::uno::Any& catalog, const ::rtl::OUString& schema, const ::rtl::OUString& table ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException); - virtual ::com::sun::star::uno::Reference< ::com::sun::star::sdbc::XResultSet > SAL_CALL getImportedKeys( const ::com::sun::star::uno::Any& catalog, const ::rtl::OUString& schema, const ::rtl::OUString& table ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException); - virtual ::com::sun::star::uno::Reference< ::com::sun::star::sdbc::XResultSet > SAL_CALL getExportedKeys( const ::com::sun::star::uno::Any& catalog, const ::rtl::OUString& schema, const ::rtl::OUString& table ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException); - virtual ::com::sun::star::uno::Reference< ::com::sun::star::sdbc::XResultSet > SAL_CALL getCrossReference( const ::com::sun::star::uno::Any& primaryCatalog, const ::rtl::OUString& primarySchema, const ::rtl::OUString& primaryTable, const ::com::sun::star::uno::Any& foreignCatalog, const ::rtl::OUString& foreignSchema, const ::rtl::OUString& foreignTable ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException); + virtual ::com::sun::star::uno::Reference< ::com::sun::star::sdbc::XResultSet > SAL_CALL getColumns( const ::com::sun::star::uno::Any& catalog, const OUString& schemaPattern, const OUString& tableNamePattern, const OUString& columnNamePattern ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException); + virtual ::com::sun::star::uno::Reference< ::com::sun::star::sdbc::XResultSet > SAL_CALL getColumnPrivileges( const ::com::sun::star::uno::Any& catalog, const OUString& schema, const OUString& table, const OUString& columnNamePattern ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException); + virtual ::com::sun::star::uno::Reference< ::com::sun::star::sdbc::XResultSet > SAL_CALL getTablePrivileges( const ::com::sun::star::uno::Any& catalog, const OUString& schemaPattern, const OUString& tableNamePattern ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException); + virtual ::com::sun::star::uno::Reference< ::com::sun::star::sdbc::XResultSet > SAL_CALL getBestRowIdentifier( const ::com::sun::star::uno::Any& catalog, const OUString& schema, const OUString& table, sal_Int32 scope, sal_Bool nullable ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException); + virtual ::com::sun::star::uno::Reference< ::com::sun::star::sdbc::XResultSet > SAL_CALL getVersionColumns( const ::com::sun::star::uno::Any& catalog, const OUString& schema, const OUString& table ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException); + virtual ::com::sun::star::uno::Reference< ::com::sun::star::sdbc::XResultSet > SAL_CALL getPrimaryKeys( const ::com::sun::star::uno::Any& catalog, const OUString& schema, const OUString& table ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException); + virtual ::com::sun::star::uno::Reference< ::com::sun::star::sdbc::XResultSet > SAL_CALL getImportedKeys( const ::com::sun::star::uno::Any& catalog, const OUString& schema, const OUString& table ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException); + virtual ::com::sun::star::uno::Reference< ::com::sun::star::sdbc::XResultSet > SAL_CALL getExportedKeys( const ::com::sun::star::uno::Any& catalog, const OUString& schema, const OUString& table ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException); + virtual ::com::sun::star::uno::Reference< ::com::sun::star::sdbc::XResultSet > SAL_CALL getCrossReference( const ::com::sun::star::uno::Any& primaryCatalog, const OUString& primarySchema, const OUString& primaryTable, const ::com::sun::star::uno::Any& foreignCatalog, const OUString& foreignSchema, const OUString& foreignTable ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException); virtual ::com::sun::star::uno::Reference< ::com::sun::star::sdbc::XResultSet > SAL_CALL getTypeInfo( ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException); - virtual ::com::sun::star::uno::Reference< ::com::sun::star::sdbc::XResultSet > SAL_CALL getIndexInfo( const ::com::sun::star::uno::Any& catalog, const ::rtl::OUString& schema, const ::rtl::OUString& table, sal_Bool unique, sal_Bool approximate ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException); + virtual ::com::sun::star::uno::Reference< ::com::sun::star::sdbc::XResultSet > SAL_CALL getIndexInfo( const ::com::sun::star::uno::Any& catalog, const OUString& schema, const OUString& table, sal_Bool unique, sal_Bool approximate ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException); virtual sal_Bool SAL_CALL supportsResultSetType( sal_Int32 setType ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException); virtual sal_Bool SAL_CALL supportsResultSetConcurrency( sal_Int32 setType, sal_Int32 concurrency ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException); virtual sal_Bool SAL_CALL ownUpdatesAreVisible( sal_Int32 setType ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException); @@ -195,7 +195,7 @@ namespace connectivity virtual sal_Bool SAL_CALL deletesAreDetected( sal_Int32 setType ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException); virtual sal_Bool SAL_CALL insertsAreDetected( sal_Int32 setType ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException); virtual sal_Bool SAL_CALL supportsBatchUpdates( ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException); - virtual ::com::sun::star::uno::Reference< ::com::sun::star::sdbc::XResultSet > SAL_CALL getUDTs( const ::com::sun::star::uno::Any& catalog, const ::rtl::OUString& schemaPattern, const ::rtl::OUString& typeNamePattern, const ::com::sun::star::uno::Sequence< sal_Int32 >& types ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException); + virtual ::com::sun::star::uno::Reference< ::com::sun::star::sdbc::XResultSet > SAL_CALL getUDTs( const ::com::sun::star::uno::Any& catalog, const OUString& schemaPattern, const OUString& typeNamePattern, const ::com::sun::star::uno::Sequence< sal_Int32 >& types ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException); virtual ::com::sun::star::uno::Reference< ::com::sun::star::sdbc::XConnection > SAL_CALL getConnection( ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException); }; } diff --git a/connectivity/source/drivers/macab/MacabDriver.cxx b/connectivity/source/drivers/macab/MacabDriver.cxx index 4a547660b540..a8d736eb8374 100644 --- a/connectivity/source/drivers/macab/MacabDriver.cxx +++ b/connectivity/source/drivers/macab/MacabDriver.cxx @@ -64,12 +64,12 @@ namespace if ( _rModule ) { // - const ::rtl::OUString sSymbolName = ::rtl::OUString::createFromAscii( _pAsciiSymbolName ); + const OUString sSymbolName = OUString::createFromAscii( _pAsciiSymbolName ); _rFunction = (FUNCTION)( osl_getSymbol( _rModule, sSymbolName.pData ) ); if ( !_rFunction ) { // did not find the symbol - OSL_FAIL( ::rtl::OString( ::rtl::OString( "lcl_getFunctionFromModuleOrUnload: could not find the symbol " ) + ::rtl::OString( _pAsciiSymbolName ) ).getStr() ); + OSL_FAIL( OString( OString( "lcl_getFunctionFromModuleOrUnload: could not find the symbol " ) + OString( _pAsciiSymbolName ) ).getStr() ); osl_unloadModule( _rModule ); _rModule = NULL; } @@ -89,7 +89,7 @@ bool MacabImplModule::impl_loadModule() OSL_ENSURE( !m_hConnectorModule && !m_pConnectionFactoryFunc, "MacabImplModule::impl_loadModule: inconsistence: inconsistency (never attempted load before, but some values already set)!"); - const ::rtl::OUString sModuleName( SAL_MODULENAME( "macabdrv1" ) ); + const OUString sModuleName( SAL_MODULENAME( "macabdrv1" ) ); m_hConnectorModule = osl_loadModuleRelative( &thisModule, sModuleName.pData, SAL_LOADMODULE_NOW ); // LAZY! #i61335# OSL_ENSURE( m_hConnectorModule, "MacabImplModule::impl_loadModule: could not load the implementation library!" ); if ( !m_hConnectorModule ) @@ -129,18 +129,18 @@ void MacabImplModule::init() void MacabImplModule::impl_throwNoMacOSException() { ::connectivity::SharedResources aResources; - const ::rtl::OUString sError( aResources.getResourceString( + const OUString sError( aResources.getResourceString( STR_NO_MAC_OS_FOUND ) ); impl_throwGenericSQLException( sError ); } // -------------------------------------------------------------------------------- -void MacabImplModule::impl_throwGenericSQLException( const ::rtl::OUString& _rMessage ) +void MacabImplModule::impl_throwGenericSQLException( const OUString& _rMessage ) { SQLException aError; aError.Message = _rMessage; - aError.SQLState = ::rtl::OUString( "S1000" ); + aError.SQLState = OUString( "S1000" ); aError.ErrorCode = 0; throw aError; } @@ -208,43 +208,43 @@ void MacabDriver::disposing() } // static ServiceInfo //------------------------------------------------------------------------------ -rtl::OUString MacabDriver::getImplementationName_Static( ) throw(RuntimeException) +OUString MacabDriver::getImplementationName_Static( ) throw(RuntimeException) { - return rtl::OUString::createFromAscii( impl_getAsciiImplementationName() ); + return OUString::createFromAscii( impl_getAsciiImplementationName() ); } //------------------------------------------------------------------------------ -Sequence< ::rtl::OUString > MacabDriver::getSupportedServiceNames_Static( ) throw (RuntimeException) +Sequence< OUString > MacabDriver::getSupportedServiceNames_Static( ) throw (RuntimeException) { // which service is supported // for more information @see com.sun.star.sdbc.Driver - 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; } //------------------------------------------------------------------ -::rtl::OUString SAL_CALL MacabDriver::getImplementationName( ) throw(RuntimeException) +OUString SAL_CALL MacabDriver::getImplementationName( ) throw(RuntimeException) { return getImplementationName_Static(); } //------------------------------------------------------------------ -sal_Bool SAL_CALL MacabDriver::supportsService( const ::rtl::OUString& _rServiceName ) throw(RuntimeException) +sal_Bool SAL_CALL MacabDriver::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(); while (pSupported != pEnd && !pSupported->equals(_rServiceName)) ++pSupported; return pSupported != pEnd; } //------------------------------------------------------------------ -Sequence< ::rtl::OUString > SAL_CALL MacabDriver::getSupportedServiceNames( ) throw(RuntimeException) +Sequence< OUString > SAL_CALL MacabDriver::getSupportedServiceNames( ) throw(RuntimeException) { return getSupportedServiceNames_Static(); } // -------------------------------------------------------------------------------- -Reference< XConnection > SAL_CALL MacabDriver::connect( const ::rtl::OUString& url, const Sequence< PropertyValue >& info ) throw(SQLException, RuntimeException) +Reference< XConnection > SAL_CALL MacabDriver::connect( const OUString& url, const Sequence< PropertyValue >& info ) throw(SQLException, RuntimeException) { ::osl::MutexGuard aGuard(m_aMutex); @@ -267,7 +267,7 @@ Reference< XConnection > SAL_CALL MacabDriver::connect( const ::rtl::OUString& u return xConnection; } // -------------------------------------------------------------------------------- -sal_Bool SAL_CALL MacabDriver::acceptsURL( const ::rtl::OUString& url ) +sal_Bool SAL_CALL MacabDriver::acceptsURL( const OUString& url ) throw(SQLException, RuntimeException) { ::osl::MutexGuard aGuard(m_aMutex); @@ -279,7 +279,7 @@ sal_Bool SAL_CALL MacabDriver::acceptsURL( const ::rtl::OUString& url ) return url.startsWith("sdbc:address:macab:"); } // -------------------------------------------------------------------------------- -Sequence< DriverPropertyInfo > SAL_CALL MacabDriver::getPropertyInfo( const ::rtl::OUString&, const Sequence< PropertyValue >& ) throw(SQLException, RuntimeException) +Sequence< DriverPropertyInfo > SAL_CALL MacabDriver::getPropertyInfo( const OUString&, const Sequence< PropertyValue >& ) throw(SQLException, RuntimeException) { // if you have something special to say, return it here :-) return Sequence< DriverPropertyInfo >(); @@ -317,9 +317,9 @@ const sal_Char* MacabDriver::impl_getAsciiImplementationName() // Please be careful when changing it. } // -------------------------------------------------------------------------------- -::rtl::OUString MacabDriver::impl_getConfigurationSettingsPath() +OUString MacabDriver::impl_getConfigurationSettingsPath() { - ::rtl::OUStringBuffer aPath; + OUStringBuffer aPath; aPath.appendAscii( "/org.openoffice.Office.DataAccess/DriverSettings/" ); aPath.appendAscii( "com.sun.star.comp.sdbc.macab.Driver" ); return aPath.makeStringAndClear(); diff --git a/connectivity/source/drivers/macab/MacabDriver.hxx b/connectivity/source/drivers/macab/MacabDriver.hxx index 2f08b685c2e2..124cf38852ec 100644 --- a/connectivity/source/drivers/macab/MacabDriver.hxx +++ b/connectivity/source/drivers/macab/MacabDriver.hxx @@ -105,7 +105,7 @@ namespace connectivity /** throws a generic SQL exception with SQLState S1000 and error code 0 */ - void impl_throwGenericSQLException( const ::rtl::OUString& _rMessage ); + void impl_throwGenericSQLException( const OUString& _rMessage ); }; @@ -129,8 +129,8 @@ namespace connectivity static ::com::sun::star::uno::Reference< ::com::sun::star::uno::XInterface > SAL_CALL Create(const ::com::sun::star::uno::Reference< ::com::sun::star::lang::XMultiServiceFactory >& _rxFactory) throw( ::com::sun::star::uno::Exception ); // XServiceInfo - static versions - static ::rtl::OUString getImplementationName_Static( ) throw(::com::sun::star::uno::RuntimeException); - static ::com::sun::star::uno::Sequence< ::rtl::OUString > getSupportedServiceNames_Static( ) throw (::com::sun::star::uno::RuntimeException); + static OUString getImplementationName_Static( ) throw(::com::sun::star::uno::RuntimeException); + static ::com::sun::star::uno::Sequence< OUString > getSupportedServiceNames_Static( ) throw (::com::sun::star::uno::RuntimeException); ::com::sun::star::uno::Reference< ::com::sun::star::uno::XComponentContext > getComponentContext() const { return m_xContext; } @@ -141,7 +141,7 @@ namespace connectivity /** returns the path of our configuration settings */ - static ::rtl::OUString impl_getConfigurationSettingsPath(); + static OUString impl_getConfigurationSettingsPath(); protected: MacabDriver(const ::com::sun::star::uno::Reference< ::com::sun::star::uno::XComponentContext >& _rxContext); @@ -150,14 +150,14 @@ namespace connectivity virtual void SAL_CALL disposing(void); // XServiceInfo - virtual ::rtl::OUString SAL_CALL getImplementationName( ) throw(::com::sun::star::uno::RuntimeException); - virtual sal_Bool SAL_CALL supportsService( const ::rtl::OUString& ServiceName ) throw(::com::sun::star::uno::RuntimeException); - virtual ::com::sun::star::uno::Sequence< ::rtl::OUString > SAL_CALL getSupportedServiceNames( ) throw(::com::sun::star::uno::RuntimeException); + virtual OUString SAL_CALL getImplementationName( ) throw(::com::sun::star::uno::RuntimeException); + virtual sal_Bool SAL_CALL supportsService( const OUString& ServiceName ) throw(::com::sun::star::uno::RuntimeException); + virtual ::com::sun::star::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames( ) throw(::com::sun::star::uno::RuntimeException); // XDriver - virtual ::com::sun::star::uno::Reference< ::com::sun::star::sdbc::XConnection > SAL_CALL connect( const ::rtl::OUString& url, const ::com::sun::star::uno::Sequence< ::com::sun::star::beans::PropertyValue >& info ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException); - virtual sal_Bool SAL_CALL acceptsURL( const ::rtl::OUString& url ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException); - virtual ::com::sun::star::uno::Sequence< ::com::sun::star::sdbc::DriverPropertyInfo > SAL_CALL getPropertyInfo( const ::rtl::OUString& url, const ::com::sun::star::uno::Sequence< ::com::sun::star::beans::PropertyValue >& info ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException); + virtual ::com::sun::star::uno::Reference< ::com::sun::star::sdbc::XConnection > SAL_CALL connect( const OUString& url, const ::com::sun::star::uno::Sequence< ::com::sun::star::beans::PropertyValue >& info ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException); + virtual sal_Bool SAL_CALL acceptsURL( const OUString& url ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException); + virtual ::com::sun::star::uno::Sequence< ::com::sun::star::sdbc::DriverPropertyInfo > SAL_CALL getPropertyInfo( const OUString& url, const ::com::sun::star::uno::Sequence< ::com::sun::star::beans::PropertyValue >& info ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException); virtual sal_Int32 SAL_CALL getMajorVersion() throw(::com::sun::star::uno::RuntimeException); virtual sal_Int32 SAL_CALL getMinorVersion() throw(::com::sun::star::uno::RuntimeException); diff --git a/connectivity/source/drivers/macab/MacabHeader.cxx b/connectivity/source/drivers/macab/MacabHeader.cxx index c8d4112d1098..419e35101e14 100644 --- a/connectivity/source/drivers/macab/MacabHeader.cxx +++ b/connectivity/source/drivers/macab/MacabHeader.cxx @@ -140,14 +140,14 @@ void MacabHeader::operator+= (const MacabHeader *r) } // ------------------------------------------------------------------------- -::rtl::OUString MacabHeader::getString(const sal_Int32 i) const +OUString MacabHeader::getString(const sal_Int32 i) const { - ::rtl::OUString nRet; + OUString nRet; if(i < size) { if(fields[i] == NULL || fields[i]->value == NULL || CFGetTypeID(fields[i]->value) != CFStringGetTypeID()) - return ::rtl::OUString(); + return OUString(); try { nRet = CFStringToOUString( (CFStringRef) fields[i]->value); @@ -264,7 +264,7 @@ sal_Int32 MacabHeader::compareFields(const macabfield *_field1, const macabfield } // ------------------------------------------------------------------------- -sal_Int32 MacabHeader::getColumnNumber(const ::rtl::OUString s) const +sal_Int32 MacabHeader::getColumnNumber(const OUString s) const { sal_Int32 i; for(i = 0; i < size; i++) diff --git a/connectivity/source/drivers/macab/MacabHeader.hxx b/connectivity/source/drivers/macab/MacabHeader.hxx index c61428059e38..c3284842ec02 100644 --- a/connectivity/source/drivers/macab/MacabHeader.hxx +++ b/connectivity/source/drivers/macab/MacabHeader.hxx @@ -35,9 +35,9 @@ namespace connectivity MacabHeader(const sal_Int32 _size, macabfield **_fields); virtual ~MacabHeader(); void operator+= (const MacabHeader *r); - ::rtl::OUString getString(const sal_Int32 i) const; + OUString getString(const sal_Int32 i) const; void sortRecord(); - sal_Int32 getColumnNumber(const ::rtl::OUString s) const; + sal_Int32 getColumnNumber(const OUString s) const; static sal_Int32 compareFields(const macabfield *_field1, const macabfield *_field2); diff --git a/connectivity/source/drivers/macab/MacabPreparedStatement.cxx b/connectivity/source/drivers/macab/MacabPreparedStatement.cxx index 79a65cc74438..152bd3fd7ee3 100644 --- a/connectivity/source/drivers/macab/MacabPreparedStatement.cxx +++ b/connectivity/source/drivers/macab/MacabPreparedStatement.cxx @@ -54,7 +54,7 @@ void MacabPreparedStatement::setMacabFields() const throw(SQLException) if (!xColumns.is()) { ::connectivity::SharedResources aResources; - const ::rtl::OUString sError( aResources.getResourceString( + const OUString sError( aResources.getResourceString( STR_INVALID_COLUMN_SELECTION ) ); ::dbtools::throwGenericSQLException(sError,NULL); @@ -67,12 +67,12 @@ void MacabPreparedStatement::resetParameters() const throw(SQLException) m_nParameterIndex = 0; } // ------------------------------------------------------------------------- -void MacabPreparedStatement::getNextParameter(::rtl::OUString &rParameter) const throw(SQLException) +void MacabPreparedStatement::getNextParameter(OUString &rParameter) const throw(SQLException) { if (m_nParameterIndex >= (sal_Int32) (m_aParameterRow->get()).size()) { ::connectivity::SharedResources aResources; - const ::rtl::OUString sError( aResources.getResourceString( + const OUString sError( aResources.getResourceString( STR_INVALID_PARA_COUNT ) ); ::dbtools::throwGenericSQLException(sError,*(MacabPreparedStatement *) this); @@ -85,7 +85,7 @@ void MacabPreparedStatement::getNextParameter(::rtl::OUString &rParameter) const // ------------------------------------------------------------------------- MacabPreparedStatement::MacabPreparedStatement( MacabConnection* _pConnection, - const ::rtl::OUString& sql) + const OUString& sql) : MacabPreparedStatement_BASE(_pConnection), m_sSqlStatement(sql), m_bPrepared(sal_False), @@ -118,7 +118,7 @@ Reference< XResultSetMetaData > SAL_CALL MacabPreparedStatement::getMetaData() t if (!m_xMetaData.is()) { const OSQLTables& xTabs = m_aSQLIterator.getTables(); - ::rtl::OUString sTableName = MacabAddressBook::getDefaultTableName(); + OUString sTableName = MacabAddressBook::getDefaultTableName(); if(! xTabs.empty() ) { @@ -200,7 +200,7 @@ void SAL_CALL MacabPreparedStatement::setNull(sal_Int32 parameterIndex, sal_Int3 (m_aParameterRow->get())[parameterIndex - 1].setNull(); } // ------------------------------------------------------------------------- -void SAL_CALL MacabPreparedStatement::setObjectNull(sal_Int32, sal_Int32, const ::rtl::OUString&) throw(SQLException, RuntimeException) +void SAL_CALL MacabPreparedStatement::setObjectNull(sal_Int32, sal_Int32, const OUString&) throw(SQLException, RuntimeException) { @@ -264,7 +264,7 @@ void SAL_CALL MacabPreparedStatement::setDouble(sal_Int32, double) throw(SQLExce ::dbtools::throwFunctionNotSupportedException("setDouble", NULL); } // ------------------------------------------------------------------------- -void SAL_CALL MacabPreparedStatement::setString(sal_Int32 parameterIndex, const ::rtl::OUString &x) throw(SQLException, RuntimeException) +void SAL_CALL MacabPreparedStatement::setString(sal_Int32 parameterIndex, const OUString &x) throw(SQLException, RuntimeException) { ::osl::MutexGuard aGuard( m_aMutex ); checkDisposed(MacabCommonStatement_BASE::rBHelper.bDisposed); @@ -326,9 +326,9 @@ void SAL_CALL MacabPreparedStatement::setObject(sal_Int32 parameterIndex, const { 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/macab/MacabPreparedStatement.hxx b/connectivity/source/drivers/macab/MacabPreparedStatement.hxx index 6b605727072c..d043622b2148 100644 --- a/connectivity/source/drivers/macab/MacabPreparedStatement.hxx +++ b/connectivity/source/drivers/macab/MacabPreparedStatement.hxx @@ -40,7 +40,7 @@ namespace connectivity class MacabPreparedStatement : public MacabPreparedStatement_BASE { protected: - ::rtl::OUString m_sSqlStatement; + OUString m_sSqlStatement; ::rtl::Reference< MacabResultSetMetaData > m_xMetaData; sal_Bool m_bPrepared; @@ -56,12 +56,12 @@ namespace connectivity const ::com::sun::star::uno::Any& rValue) throw (::com::sun::star::uno::Exception); virtual void resetParameters() const throw(::com::sun::star::sdbc::SQLException); - virtual void getNextParameter(::rtl::OUString &rParameter) const throw(::com::sun::star::sdbc::SQLException); + virtual void getNextParameter(OUString &rParameter) const throw(::com::sun::star::sdbc::SQLException); virtual ~MacabPreparedStatement(); public: DECLARE_SERVICE_INFO(); - MacabPreparedStatement(MacabConnection* _pConnection, const ::rtl::OUString& sql); + MacabPreparedStatement(MacabConnection* _pConnection, const OUString& sql); // OComponentHelper virtual void SAL_CALL disposing(); @@ -78,7 +78,7 @@ namespace connectivity // XParameters virtual void SAL_CALL setNull( sal_Int32 parameterIndex, sal_Int32 sqlType ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException); - virtual void SAL_CALL setObjectNull( sal_Int32 parameterIndex, sal_Int32 sqlType, const ::rtl::OUString& typeName ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException); + virtual void SAL_CALL setObjectNull( sal_Int32 parameterIndex, sal_Int32 sqlType, const OUString& typeName ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException); virtual void SAL_CALL setBoolean( sal_Int32 parameterIndex, sal_Bool x ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException); virtual void SAL_CALL setByte( sal_Int32 parameterIndex, sal_Int8 x ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException); virtual void SAL_CALL setShort( sal_Int32 parameterIndex, sal_Int16 x ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException); @@ -86,7 +86,7 @@ namespace connectivity virtual void SAL_CALL setLong( sal_Int32 parameterIndex, sal_Int64 x ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException); virtual void SAL_CALL setFloat( sal_Int32 parameterIndex, float x ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException); virtual void SAL_CALL setDouble( sal_Int32 parameterIndex, double x ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException); - virtual void SAL_CALL setString( sal_Int32 parameterIndex, const ::rtl::OUString& x ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException); + virtual void SAL_CALL setString( sal_Int32 parameterIndex, const OUString& x ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException); virtual void SAL_CALL setBytes( sal_Int32 parameterIndex, const ::com::sun::star::uno::Sequence< sal_Int8 >& x ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException); virtual void SAL_CALL setDate( sal_Int32 parameterIndex, const ::com::sun::star::util::Date& x ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException); virtual void SAL_CALL setTime( sal_Int32 parameterIndex, const ::com::sun::star::util::Time& x ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException); diff --git a/connectivity/source/drivers/macab/MacabRecord.cxx b/connectivity/source/drivers/macab/MacabRecord.cxx index e9ad40b8038b..b814b4415242 100644 --- a/connectivity/source/drivers/macab/MacabRecord.cxx +++ b/connectivity/source/drivers/macab/MacabRecord.cxx @@ -223,7 +223,7 @@ sal_Int32 MacabRecord::compareFields(const macabfield *_field1, const macabfield * between an OUString and a macabfield (for use when creating and handling * SQL statement). */ -macabfield *MacabRecord::createMacabField(const ::rtl::OUString _newFieldString, const ABPropertyType _abType) +macabfield *MacabRecord::createMacabField(const OUString _newFieldString, const ABPropertyType _abType) { macabfield *newField = NULL; switch(_abType) @@ -291,12 +291,12 @@ macabfield *MacabRecord::createMacabField(const ::rtl::OUString _newFieldString, * between an OUString and a macabfield (for use when creating and handling * SQL statement). */ -::rtl::OUString MacabRecord::fieldToString(const macabfield *_aField) +OUString MacabRecord::fieldToString(const macabfield *_aField) { if(_aField == NULL) - return ::rtl::OUString(); + return OUString(); - ::rtl::OUString fieldString; + OUString fieldString; switch(_aField->type) { @@ -316,7 +316,7 @@ macabfield *MacabRecord::createMacabField(const ::rtl::OUString _newFieldString, // Should we check for the wrong type here, e.g., a float? sal_Bool m_bSuccess = !CFNumberGetValue((CFNumberRef) _aField->value, numberType, &nVal); if(m_bSuccess != sal_False) - fieldString = ::rtl::OUString::valueOf(nVal); + fieldString = OUString::valueOf(nVal); } break; case kABRealProperty: @@ -326,7 +326,7 @@ macabfield *MacabRecord::createMacabField(const ::rtl::OUString _newFieldString, // Should we check for the wrong type here, e.g., an int? sal_Bool m_bSuccess = !CFNumberGetValue((CFNumberRef) _aField->value, numberType, &nVal); if(m_bSuccess != sal_False) - fieldString = ::rtl::OUString::valueOf(nVal); + fieldString = OUString::valueOf(nVal); } break; default: diff --git a/connectivity/source/drivers/macab/MacabRecord.hxx b/connectivity/source/drivers/macab/MacabRecord.hxx index 859761707335..9d96a52cdc8a 100644 --- a/connectivity/source/drivers/macab/MacabRecord.hxx +++ b/connectivity/source/drivers/macab/MacabRecord.hxx @@ -59,8 +59,8 @@ namespace connectivity macabfield *get(const sal_Int32 i) const; static sal_Int32 compareFields(const macabfield *_field1, const macabfield *_field2); - static macabfield *createMacabField(const ::rtl::OUString _newFieldString, const ABPropertyType _abtype); - static ::rtl::OUString fieldToString(const macabfield *_aField); + static macabfield *createMacabField(const OUString _newFieldString, const ABPropertyType _abtype); + static OUString fieldToString(const macabfield *_aField); }; } diff --git a/connectivity/source/drivers/macab/MacabRecords.cxx b/connectivity/source/drivers/macab/MacabRecords.cxx index 5ecb54fd84ab..1f4769b3f505 100644 --- a/connectivity/source/drivers/macab/MacabRecords.cxx +++ b/connectivity/source/drivers/macab/MacabRecords.cxx @@ -229,7 +229,7 @@ macabfield *MacabRecords::getField(const sal_Int32 _recordNumber, const sal_Int3 } // ------------------------------------------------------------------------- -macabfield *MacabRecords::getField(const sal_Int32 _recordNumber, const ::rtl::OUString _columnName) const +macabfield *MacabRecords::getField(const sal_Int32 _recordNumber, const OUString _columnName) const { if(header != NULL) { @@ -247,7 +247,7 @@ macabfield *MacabRecords::getField(const sal_Int32 _recordNumber, const ::rtl::O } // ------------------------------------------------------------------------- -sal_Int32 MacabRecords::getFieldNumber(const ::rtl::OUString _columnName) const +sal_Int32 MacabRecords::getFieldNumber(const OUString _columnName) const { if(header != NULL) return header->getColumnNumber(_columnName); @@ -437,8 +437,8 @@ MacabHeader *MacabRecords::createHeaderForRecordType(const CFArrayRef _records, else { // Couldn't find a required property... - OSL_FAIL(::rtl::OString(::rtl::OString("MacabRecords::createHeaderForRecordType: could not find required property: ") + - ::rtl::OUStringToOString(CFStringToOUString(requiredProperties[i]), RTL_TEXTENCODING_ASCII_US)).getStr()); + OSL_FAIL(OString(OString("MacabRecords::createHeaderForRecordType: could not find required property: ") + + OUStringToOString(CFStringToOUString(requiredProperties[i]), RTL_TEXTENCODING_ASCII_US)).getStr()); } } @@ -538,9 +538,9 @@ MacabHeader *MacabRecords::createHeaderForProperty(const ABPropertyType _propert sal_Int32 multiLength = ABMultiValueCount((ABMutableMultiValueRef) _propertyValue); CFStringRef multiLabel, localizedMultiLabel; - ::rtl::OUString multiLabelString; - ::rtl::OUString multiPropertyString; - ::rtl::OUString headerNameString; + OUString multiLabelString; + OUString multiPropertyString; + OUString headerNameString; ABPropertyType multiType = (ABPropertyType) (ABMultiValuePropertyType((ABMutableMultiValueRef) _propertyValue) - 0x100); length = multiLength; @@ -557,7 +557,7 @@ MacabHeader *MacabRecords::createHeaderForProperty(const ABPropertyType _propert multiLabelString = CFStringToOUString(localizedMultiLabel); CFRelease(multiLabel); CFRelease(localizedMultiLabel); - headerNameString = multiPropertyString + ::rtl::OUString(": ") + fixLabel(multiLabelString); + headerNameString = multiPropertyString + OUString(": ") + fixLabel(multiLabelString); headerNames[i] = new macabfield; headerNames[i]->value = OUStringToCFString(headerNameString); headerNames[i]->type = multiType; @@ -587,8 +587,8 @@ MacabHeader *MacabRecords::createHeaderForProperty(const ABPropertyType _propert CFStringRef multiLabel, localizedMultiLabel; CFTypeRef multiValue; - ::rtl::OUString multiLabelString; - ::rtl::OUString multiPropertyString; + OUString multiLabelString; + OUString multiPropertyString; MacabHeader **multiHeaders = new MacabHeader *[multiLengthFirstLevel]; ABPropertyType multiType = (ABPropertyType) (ABMultiValuePropertyType((ABMutableMultiValueRef) _propertyValue) - 0x100); @@ -608,7 +608,7 @@ MacabHeader *MacabRecords::createHeaderForProperty(const ABPropertyType _propert if(multiValue && multiLabel) { localizedMultiLabel = ABCopyLocalizedPropertyOrLabel(multiLabel); - multiLabelString = multiPropertyString + ::rtl::OUString(": ") + fixLabel(CFStringToOUString(localizedMultiLabel)); + multiLabelString = multiPropertyString + OUString(": ") + fixLabel(CFStringToOUString(localizedMultiLabel)); CFRelease(multiLabel); CFRelease(localizedMultiLabel); multiLabel = OUStringToCFString(multiLabelString); @@ -668,10 +668,10 @@ MacabHeader *MacabRecords::createHeaderForProperty(const ABPropertyType _propert CFTypeRef *dictValues; sal_Int32 i,j,k; - ::rtl::OUString dictKeyString, propertyNameString; + OUString dictKeyString, propertyNameString; ABPropertyType dictType; MacabHeader **dictHeaders = new MacabHeader *[numRecords]; - ::rtl::OUString dictLabelString; + OUString dictLabelString; CFStringRef dictLabel, localizedDictKey; /* Get the keys and values */ @@ -696,7 +696,7 @@ MacabHeader *MacabRecords::createHeaderForProperty(const ABPropertyType _propert dictType = (ABPropertyType) getABTypeFromCFType( CFGetTypeID(dictValues[i]) ); localizedDictKey = ABCopyLocalizedPropertyOrLabel(dictKeys[i]); dictKeyString = CFStringToOUString(localizedDictKey); - dictLabelString = propertyNameString + ::rtl::OUString(": ") + fixLabel(dictKeyString); + dictLabelString = propertyNameString + OUString(": ") + fixLabel(dictKeyString); dictLabel = OUStringToCFString(dictLabelString); dictHeaders[i] = createHeaderForProperty(dictType, dictValues[i], dictLabel); if (!dictHeaders[i]) @@ -743,8 +743,8 @@ MacabHeader *MacabRecords::createHeaderForProperty(const ABPropertyType _propert CFTypeRef arrValue; ABPropertyType arrType; MacabHeader **arrHeaders = new MacabHeader *[arrLength]; - ::rtl::OUString propertyNameString = CFStringToOUString(_propertyName); - ::rtl::OUString arrLabelString; + OUString propertyNameString = CFStringToOUString(_propertyName); + OUString arrLabelString; CFStringRef arrLabel; length = 0; @@ -761,7 +761,7 @@ MacabHeader *MacabRecords::createHeaderForProperty(const ABPropertyType _propert { arrValue = (CFTypeRef) CFArrayGetValueAtIndex( (CFArrayRef) _propertyValue, i); arrType = (ABPropertyType) getABTypeFromCFType( CFGetTypeID(arrValue) ); - arrLabelString = propertyNameString + ::rtl::OUString::valueOf(i); + arrLabelString = propertyNameString + OUString::valueOf(i); arrLabel = OUStringToCFString(arrLabelString); arrHeaders[i] = createHeaderForProperty(arrType, arrValue, arrLabel); if (!arrHeaders[i]) @@ -834,9 +834,9 @@ void MacabRecords::manageDuplicateHeaders(macabfield **_headerNames, const sal_I if(count != 1) { // There is probably a better way to do this... - ::rtl::OUString newName = CFStringToOUString((CFStringRef) _headerNames[i]->value); + OUString newName = CFStringToOUString((CFStringRef) _headerNames[i]->value); CFRelease(_headerNames[i]->value); - newName += ::rtl::OUString(" (") + ::rtl::OUString::valueOf(count) + ::rtl::OUString(")"); + newName += OUString(" (") + OUString::valueOf(count) + OUString(")"); _headerNames[i]->value = OUStringToCFString(newName); } } @@ -866,7 +866,7 @@ MacabRecord *MacabRecords::createMacabRecord(const ABRecordRef _abrecord, const ABPropertyType propertyType; CFStringRef propertyName, localizedPropertyName; - ::rtl::OUString propertyNameString; + OUString propertyNameString; for(i = 0; i < numProperties; i++) { propertyName = (CFStringRef) CFArrayGetValueAtIndex(recordProperties, i); @@ -895,7 +895,7 @@ MacabRecord *MacabRecords::createMacabRecord(const ABRecordRef _abrecord, const * receives the property value). It is called when we aren't given the * property's type already. */ -void MacabRecords::insertPropertyIntoMacabRecord(MacabRecord *_abrecord, const MacabHeader *_header, const ::rtl::OUString _propertyName, const CFTypeRef _propertyValue) const +void MacabRecords::insertPropertyIntoMacabRecord(MacabRecord *_abrecord, const MacabHeader *_header, const OUString _propertyName, const CFTypeRef _propertyValue) const { CFTypeID cf_type = CFGetTypeID(_propertyValue); ABPropertyType ab_type = getABTypeFromCFType( cf_type ); @@ -908,7 +908,7 @@ void MacabRecords::insertPropertyIntoMacabRecord(MacabRecord *_abrecord, const M /* Inserts a given property into a MacabRecord. This method is recursive * because properties can contain many sub-properties. */ -void MacabRecords::insertPropertyIntoMacabRecord(const ABPropertyType _propertyType, MacabRecord *_abrecord, const MacabHeader *_header, const ::rtl::OUString _propertyName, const CFTypeRef _propertyValue) const +void MacabRecords::insertPropertyIntoMacabRecord(const ABPropertyType _propertyType, MacabRecord *_abrecord, const MacabHeader *_header, const OUString _propertyName, const CFTypeRef _propertyValue) const { /* If there is no value, return */ if(_propertyValue == NULL) @@ -942,7 +942,7 @@ void MacabRecords::insertPropertyIntoMacabRecord(const ABPropertyType _propertyT * property into the record. */ sal_Bool bPlaced = sal_False; - ::rtl::OUString columnName = ::rtl::OUString(_propertyName); + OUString columnName = OUString(_propertyName); sal_Int32 i = 1; // A big safeguard to prevent two fields from having the same name. @@ -957,7 +957,7 @@ void MacabRecords::insertPropertyIntoMacabRecord(const ABPropertyType _propertyT { bPlaced = sal_False; i++; - columnName = ::rtl::OUString(_propertyName) + ::rtl::OUString(" (") + ::rtl::OUString::valueOf(i) + ::rtl::OUString(")"); + columnName = OUString(_propertyName) + OUString(" (") + OUString::valueOf(i) + OUString(")"); } // success! @@ -980,13 +980,13 @@ void MacabRecords::insertPropertyIntoMacabRecord(const ABPropertyType _propertyT sal_Int32 arrLength = (sal_Int32) CFArrayGetCount( (CFArrayRef) _propertyValue); sal_Int32 i; const void *arrValue; - ::rtl::OUString newPropertyName; + OUString newPropertyName; /* Going through each element... */ for(i = 0; i < arrLength; i++) { arrValue = CFArrayGetValueAtIndex( (CFArrayRef) _propertyValue, i); - newPropertyName = _propertyName + ::rtl::OUString::valueOf(i); + newPropertyName = _propertyName + OUString::valueOf(i); insertPropertyIntoMacabRecord(_abrecord, _header, newPropertyName, arrValue); CFRelease(arrValue); } @@ -1008,9 +1008,9 @@ void MacabRecords::insertPropertyIntoMacabRecord(const ABPropertyType _propertyT */ sal_Int32 numRecords = (sal_Int32) CFDictionaryGetCount((CFDictionaryRef) _propertyValue); - ::rtl::OUString dictKeyString; + OUString dictKeyString; sal_Int32 i; - ::rtl::OUString newPropertyName; + OUString newPropertyName; /* Unfortunately, the only way to get both keys and values out * of a dictionary in Carbon is to get them all at once, so we @@ -1029,7 +1029,7 @@ void MacabRecords::insertPropertyIntoMacabRecord(const ABPropertyType _propertyT localizedDictKey = ABCopyLocalizedPropertyOrLabel(dictKeys[i]); dictKeyString = CFStringToOUString(localizedDictKey); CFRelease(localizedDictKey); - newPropertyName = _propertyName + ::rtl::OUString(": ") + fixLabel(dictKeyString); + newPropertyName = _propertyName + OUString(": ") + fixLabel(dictKeyString); insertPropertyIntoMacabRecord(_abrecord, _header, newPropertyName, dictValues[i]); } @@ -1060,7 +1060,7 @@ void MacabRecords::insertPropertyIntoMacabRecord(const ABPropertyType _propertyT sal_Int32 multiLength = ABMultiValueCount((ABMutableMultiValueRef) _propertyValue); CFStringRef multiLabel, localizedMultiLabel; CFTypeRef multiValue; - ::rtl::OUString multiLabelString, newPropertyName; + OUString multiLabelString, newPropertyName; ABPropertyType multiType = (ABPropertyType) (ABMultiValuePropertyType((ABMutableMultiValueRef) _propertyValue) - 0x100); /* Go through each element... */ @@ -1072,7 +1072,7 @@ void MacabRecords::insertPropertyIntoMacabRecord(const ABPropertyType _propertyT localizedMultiLabel = ABCopyLocalizedPropertyOrLabel(multiLabel); multiLabelString = CFStringToOUString(localizedMultiLabel); - newPropertyName = _propertyName + ::rtl::OUString(": ") + fixLabel(multiLabelString); + newPropertyName = _propertyName + OUString(": ") + fixLabel(multiLabelString); insertPropertyIntoMacabRecord(multiType, _abrecord, _header, newPropertyName, multiValue); /* free our variables */ @@ -1190,13 +1190,13 @@ void MacabRecords::swap(const sal_Int32 _id1, const sal_Int32 _id2) } // ------------------------------------------------------------------------- -void MacabRecords::setName(const ::rtl::OUString _sName) +void MacabRecords::setName(const OUString _sName) { m_sName = _sName; } // ------------------------------------------------------------------------- -::rtl::OUString MacabRecords::getName() const +OUString MacabRecords::getName() const { return m_sName; } diff --git a/connectivity/source/drivers/macab/MacabRecords.hxx b/connectivity/source/drivers/macab/MacabRecords.hxx index 902a8d870279..730dc57a6b4f 100644 --- a/connectivity/source/drivers/macab/MacabRecords.hxx +++ b/connectivity/source/drivers/macab/MacabRecords.hxx @@ -53,7 +53,7 @@ namespace connectivity MacabHeader *header; MacabRecord **records; ABAddressBookRef addressBook; - ::rtl::OUString m_sName; + OUString m_sName; /* For converting CF types to AB types */ sal_Int32 lcl_CFTypesLength; @@ -75,8 +75,8 @@ namespace connectivity MacabHeader *createHeaderForProperty(const ABPropertyType _propertyType, const CFTypeRef _propertyValue, const CFStringRef _propertyName) const; void manageDuplicateHeaders(macabfield **_headerNames, const sal_Int32 _length) const; ABPropertyType getABTypeFromCFType(const CFTypeID cf_type ) const; - void insertPropertyIntoMacabRecord(MacabRecord *_abrecord, const MacabHeader *_header, const ::rtl::OUString _propertyName, const CFTypeRef _propertyValue) const; - void insertPropertyIntoMacabRecord(const ABPropertyType _propertyType, MacabRecord *_abrecord, const MacabHeader *_header, const ::rtl::OUString _propertyName, const CFTypeRef _propertyValue) const; + void insertPropertyIntoMacabRecord(MacabRecord *_abrecord, const MacabHeader *_header, const OUString _propertyName, const CFTypeRef _propertyValue) const; + void insertPropertyIntoMacabRecord(const ABPropertyType _propertyType, MacabRecord *_abrecord, const MacabHeader *_header, const OUString _propertyName, const CFTypeRef _propertyValue) const; public: MacabRecords(const ABAddressBookRef _addressBook, MacabHeader *_header, MacabRecord **_records, sal_Int32 _numRecords); MacabRecords(const MacabRecords *_copy); @@ -88,8 +88,8 @@ namespace connectivity void setHeader(MacabHeader *_header); MacabHeader *getHeader() const; - void setName(const ::rtl::OUString _sName); - ::rtl::OUString getName() const; + void setName(const OUString _sName); + OUString getName() const; MacabRecord *insertRecord(MacabRecord *_newRecord, const sal_Int32 _location); void insertRecord(MacabRecord *_newRecord); @@ -97,8 +97,8 @@ namespace connectivity void swap(const sal_Int32 _id1, const sal_Int32 _id2); macabfield *getField(const sal_Int32 _recordNumber, const sal_Int32 _columnNumber) const; - macabfield *getField(const sal_Int32 _recordNumber, const ::rtl::OUString _columnName) const; - sal_Int32 getFieldNumber(const ::rtl::OUString _columnName) const; + macabfield *getField(const sal_Int32 _recordNumber, const OUString _columnName) const; + sal_Int32 getFieldNumber(const OUString _columnName) const; sal_Int32 size() const; diff --git a/connectivity/source/drivers/macab/MacabResultSet.cxx b/connectivity/source/drivers/macab/MacabResultSet.cxx index 02c32addfde7..7a743742c733 100644 --- a/connectivity/source/drivers/macab/MacabResultSet.cxx +++ b/connectivity/source/drivers/macab/MacabResultSet.cxx @@ -127,7 +127,7 @@ void MacabResultSet::sortMacabRecords(const MacabOrder *pOrder) } // ------------------------------------------------------------------------- -void MacabResultSet::setTableName(::rtl::OUString _sTableName) +void MacabResultSet::setTableName(OUString _sTableName) { m_sTableName = _sTableName; } @@ -175,7 +175,7 @@ Sequence< Type > SAL_CALL MacabResultSet::getTypes() throw(RuntimeException) return ::cppu::OPropertySetHelper::createPropertySetInfo(getInfoHelper()); } // ------------------------------------------------------------------------- -sal_Int32 SAL_CALL MacabResultSet::findColumn(const ::rtl::OUString& columnName) throw(SQLException, RuntimeException) +sal_Int32 SAL_CALL MacabResultSet::findColumn(const OUString& columnName) throw(SQLException, RuntimeException) { ::osl::MutexGuard aGuard( m_aMutex ); checkDisposed(MacabResultSet_BASE::rBHelper.bDisposed); @@ -191,7 +191,7 @@ sal_Int32 SAL_CALL MacabResultSet::findColumn(const ::rtl::OUString& columnName) return i; ::connectivity::SharedResources aResources; - const ::rtl::OUString sError( aResources.getResourceStringWithSubstitution( + const OUString sError( aResources.getResourceStringWithSubstitution( STR_NO_ELEMENT_NAME, "$name$", columnName ) ); @@ -201,12 +201,12 @@ sal_Int32 SAL_CALL MacabResultSet::findColumn(const ::rtl::OUString& columnName) return 0; } // ------------------------------------------------------------------------- -::rtl::OUString SAL_CALL MacabResultSet::getString(sal_Int32 columnIndex) throw(SQLException, RuntimeException) +OUString SAL_CALL MacabResultSet::getString(sal_Int32 columnIndex) throw(SQLException, RuntimeException) { ::osl::MutexGuard aGuard( m_aMutex ); checkDisposed(MacabResultSet_BASE::rBHelper.bDisposed); - ::rtl::OUString aRet; + OUString aRet; sal_Int32 nRecords = m_aMacabRecords->size(); m_bWasNull = true; @@ -809,7 +809,7 @@ void SAL_CALL MacabResultSet::updateDouble(sal_Int32, double) throw(SQLException checkDisposed(MacabResultSet_BASE::rBHelper.bDisposed); } // ------------------------------------------------------------------------- -void SAL_CALL MacabResultSet::updateString(sal_Int32, const ::rtl::OUString&) throw(SQLException, RuntimeException) +void SAL_CALL MacabResultSet::updateString(sal_Int32, const OUString&) throw(SQLException, RuntimeException) { ::osl::MutexGuard aGuard( m_aMutex ); checkDisposed(MacabResultSet_BASE::rBHelper.bDisposed); @@ -879,7 +879,7 @@ Any SAL_CALL MacabResultSet::getBookmark() throw( SQLException, RuntimeExceptio if (m_nRowPos != -1 && m_nRowPos != nRecords) { - macabfield *uidField = m_aMacabRecords->getField(m_nRowPos,::rtl::OUString("UID")); + macabfield *uidField = m_aMacabRecords->getField(m_nRowPos,OUString("UID")); if(uidField != NULL) { if(uidField->type == kABStringProperty) @@ -896,17 +896,17 @@ sal_Bool SAL_CALL MacabResultSet::moveToBookmark(const Any& bookmark) throw( SQ ::osl::MutexGuard aGuard( m_aMutex ); checkDisposed(MacabResultSet_BASE::rBHelper.bDisposed); - ::rtl::OUString sBookmark = comphelper::getString(bookmark); + OUString sBookmark = comphelper::getString(bookmark); sal_Int32 nRecords = m_aMacabRecords->size(); for (sal_Int32 nRow = 0; nRow < nRecords; nRow++) { - macabfield *uidField = m_aMacabRecords->getField(m_nRowPos,::rtl::OUString("UID")); + macabfield *uidField = m_aMacabRecords->getField(m_nRowPos,OUString("UID")); if(uidField != NULL) { if(uidField->type == kABStringProperty) { - ::rtl::OUString sUniqueIdentifier = CFStringToOUString( (CFStringRef) uidField->value ); + OUString sUniqueIdentifier = CFStringToOUString( (CFStringRef) uidField->value ); if (sUniqueIdentifier == sBookmark) { m_nRowPos = nRow; @@ -944,8 +944,8 @@ sal_Int32 SAL_CALL MacabResultSet::compareBookmarks(const Any& firstItem, const ::osl::MutexGuard aGuard( m_aMutex ); checkDisposed(MacabResultSet_BASE::rBHelper.bDisposed); - ::rtl::OUString sFirst = comphelper::getString(firstItem); - ::rtl::OUString sSecond = comphelper::getString(secondItem); + OUString sFirst = comphelper::getString(firstItem); + OUString sSecond = comphelper::getString(secondItem); if (sFirst < sSecond) return CompareBookmark::LESS; @@ -964,7 +964,7 @@ sal_Int32 SAL_CALL MacabResultSet::hashBookmark(const Any& bookmark) throw( SQL ::osl::MutexGuard aGuard( m_aMutex ); checkDisposed(MacabResultSet_BASE::rBHelper.bDisposed); - ::rtl::OUString sBookmark = comphelper::getString(bookmark); + OUString sBookmark = comphelper::getString(bookmark); return sBookmark.hashCode(); } @@ -983,7 +983,7 @@ IPropertyArrayHelper* MacabResultSet::createArrayHelper() const Sequence< Property > aProps(6); 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_BOOL_PROP1IMPL(ISBOOKMARKABLE) PropertyAttribute::READONLY); diff --git a/connectivity/source/drivers/macab/MacabResultSet.hxx b/connectivity/source/drivers/macab/MacabResultSet.hxx index 3a34437d1cd3..84c8788b7042 100644 --- a/connectivity/source/drivers/macab/MacabResultSet.hxx +++ b/connectivity/source/drivers/macab/MacabResultSet.hxx @@ -63,7 +63,7 @@ namespace connectivity MacabRecords * m_aMacabRecords; // address book entries matching the query sal_Int32 m_nRowPos; // the current row within the result set sal_Bool m_bWasNull; // last entry retrieved from this result set was NULL - ::rtl::OUString m_sTableName; + OUString m_sTableName; // OPropertyArrayUsageHelper virtual ::cppu::IPropertyArrayHelper* createArrayHelper( ) const; @@ -101,7 +101,7 @@ namespace connectivity void allMacabRecords(); void someMacabRecords(const class MacabCondition *pCondition); void sortMacabRecords(const class MacabOrder *pOrder); - void setTableName(const ::rtl::OUString _sTableName); + void setTableName(const OUString _sTableName); // ::cppu::OComponentHelper virtual void SAL_CALL disposing(void); @@ -139,7 +139,7 @@ namespace connectivity // 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); @@ -188,7 +188,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); @@ -199,7 +199,7 @@ namespace connectivity 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); diff --git a/connectivity/source/drivers/macab/MacabResultSetMetaData.cxx b/connectivity/source/drivers/macab/MacabResultSetMetaData.cxx index 9311f63dd87d..c3199ebe8670 100644 --- a/connectivity/source/drivers/macab/MacabResultSetMetaData.cxx +++ b/connectivity/source/drivers/macab/MacabResultSetMetaData.cxx @@ -30,7 +30,7 @@ using namespace com::sun::star::uno; using namespace com::sun::star::lang; using namespace com::sun::star::sdbc; -MacabResultSetMetaData::MacabResultSetMetaData(MacabConnection* _pConnection, ::rtl::OUString _sTableName) +MacabResultSetMetaData::MacabResultSetMetaData(MacabConnection* _pConnection, OUString _sTableName) : m_pConnection(_pConnection), m_sTableName(_sTableName), m_aMacabFields() @@ -44,7 +44,7 @@ MacabResultSetMetaData::~MacabResultSetMetaData() void MacabResultSetMetaData::setMacabFields(const ::rtl::Reference<connectivity::OSQLColumns> &xColumns) throw(SQLException) { OSQLColumns::Vector::const_iterator aIter; - static const ::rtl::OUString aName("Name"); + static const OUString aName("Name"); MacabRecords *aRecords; MacabHeader *aHeader; @@ -60,7 +60,7 @@ void MacabResultSetMetaData::setMacabFields(const ::rtl::Reference<connectivity: for (aIter = xColumns->get().begin(); aIter != xColumns->get().end(); ++aIter) { - ::rtl::OUString aFieldName; + OUString aFieldName; sal_uInt32 nFieldNumber; (*aIter)->getPropertyValue(aName) >>= aFieldName; @@ -112,12 +112,12 @@ sal_Bool SAL_CALL MacabResultSetMetaData::isCaseSensitive(sal_Int32) throw(SQLEx return sal_True; } // ------------------------------------------------------------------------- -::rtl::OUString SAL_CALL MacabResultSetMetaData::getSchemaName(sal_Int32) throw(SQLException, RuntimeException) +OUString SAL_CALL MacabResultSetMetaData::getSchemaName(sal_Int32) throw(SQLException, RuntimeException) { - return ::rtl::OUString(); + return OUString(); } // ------------------------------------------------------------------------- -::rtl::OUString SAL_CALL MacabResultSetMetaData::getColumnName(sal_Int32 column) throw(SQLException, RuntimeException) +OUString SAL_CALL MacabResultSetMetaData::getColumnName(sal_Int32 column) throw(SQLException, RuntimeException) { sal_uInt32 nFieldNumber = m_aMacabFields[column - 1]; MacabRecords *aRecords; @@ -132,34 +132,34 @@ sal_Bool SAL_CALL MacabResultSetMetaData::isCaseSensitive(sal_Int32) throw(SQLEx } aHeader = aRecords->getHeader(); - ::rtl::OUString aName = aHeader->getString(nFieldNumber); + OUString aName = aHeader->getString(nFieldNumber); return aName; } // ------------------------------------------------------------------------- -::rtl::OUString SAL_CALL MacabResultSetMetaData::getTableName(sal_Int32) throw(SQLException, RuntimeException) +OUString SAL_CALL MacabResultSetMetaData::getTableName(sal_Int32) throw(SQLException, RuntimeException) { return m_sTableName; } // ------------------------------------------------------------------------- -::rtl::OUString SAL_CALL MacabResultSetMetaData::getCatalogName(sal_Int32) throw(SQLException, RuntimeException) +OUString SAL_CALL MacabResultSetMetaData::getCatalogName(sal_Int32) throw(SQLException, RuntimeException) { - return ::rtl::OUString(); + return OUString(); } // ------------------------------------------------------------------------- -::rtl::OUString SAL_CALL MacabResultSetMetaData::getColumnTypeName(sal_Int32) throw(SQLException, RuntimeException) +OUString SAL_CALL MacabResultSetMetaData::getColumnTypeName(sal_Int32) throw(SQLException, RuntimeException) { - return ::rtl::OUString(); + return OUString(); } // ------------------------------------------------------------------------- -::rtl::OUString SAL_CALL MacabResultSetMetaData::getColumnLabel(sal_Int32) throw(SQLException, RuntimeException) +OUString SAL_CALL MacabResultSetMetaData::getColumnLabel(sal_Int32) throw(SQLException, RuntimeException) { - return ::rtl::OUString(); + return OUString(); } // ------------------------------------------------------------------------- -::rtl::OUString SAL_CALL MacabResultSetMetaData::getColumnServiceName(sal_Int32) throw(SQLException, RuntimeException) +OUString SAL_CALL MacabResultSetMetaData::getColumnServiceName(sal_Int32) throw(SQLException, RuntimeException) { - return ::rtl::OUString(); + return OUString(); } // ------------------------------------------------------------------------- sal_Bool SAL_CALL MacabResultSetMetaData::isCurrency(sal_Int32) throw(SQLException, RuntimeException) diff --git a/connectivity/source/drivers/macab/MacabResultSetMetaData.hxx b/connectivity/source/drivers/macab/MacabResultSetMetaData.hxx index 0b24b1fac3e6..c3ea852c414f 100644 --- a/connectivity/source/drivers/macab/MacabResultSetMetaData.hxx +++ b/connectivity/source/drivers/macab/MacabResultSetMetaData.hxx @@ -39,7 +39,7 @@ namespace connectivity class MacabResultSetMetaData : public MacabResultSetMetaData_BASE { MacabConnection* m_pConnection; - ::rtl::OUString m_sTableName; + OUString m_sTableName; ::std::vector<sal_Int32> m_aMacabFields; // for each selected column, contains the number // of the corresponding AddressBook field @@ -47,7 +47,7 @@ namespace connectivity virtual ~MacabResultSetMetaData(); public: - MacabResultSetMetaData(MacabConnection* _pConnection, ::rtl::OUString _sTableName); + MacabResultSetMetaData(MacabConnection* _pConnection, OUString _sTableName); // avoid ambigous cast error from the compiler inline operator ::com::sun::star::uno::Reference< ::com::sun::star::sdbc::XResultSetMetaData > () throw() @@ -66,19 +66,19 @@ namespace connectivity virtual sal_Int32 SAL_CALL isNullable( sal_Int32 column ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException); virtual sal_Bool SAL_CALL isSigned( sal_Int32 column ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException); virtual sal_Int32 SAL_CALL getColumnDisplaySize( sal_Int32 column ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException); - virtual ::rtl::OUString SAL_CALL getColumnLabel( sal_Int32 column ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException); - virtual ::rtl::OUString SAL_CALL getColumnName( sal_Int32 column ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException); - virtual ::rtl::OUString SAL_CALL getSchemaName( sal_Int32 column ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException); + virtual OUString SAL_CALL getColumnLabel( sal_Int32 column ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException); + virtual OUString SAL_CALL getColumnName( sal_Int32 column ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException); + virtual OUString SAL_CALL getSchemaName( sal_Int32 column ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException); virtual sal_Int32 SAL_CALL getPrecision( sal_Int32 column ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException); virtual sal_Int32 SAL_CALL getScale( sal_Int32 column ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException); - virtual ::rtl::OUString SAL_CALL getTableName( sal_Int32 column ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException); - virtual ::rtl::OUString SAL_CALL getCatalogName( sal_Int32 column ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException); + virtual OUString SAL_CALL getTableName( sal_Int32 column ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException); + virtual OUString SAL_CALL getCatalogName( sal_Int32 column ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException); virtual sal_Int32 SAL_CALL getColumnType( sal_Int32 column ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException); - virtual ::rtl::OUString SAL_CALL getColumnTypeName( sal_Int32 column ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException); + virtual OUString SAL_CALL getColumnTypeName( sal_Int32 column ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException); virtual sal_Bool SAL_CALL isReadOnly( sal_Int32 column ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException); virtual sal_Bool SAL_CALL isWritable( sal_Int32 column ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException); virtual sal_Bool SAL_CALL isDefinitelyWritable( sal_Int32 column ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException); - virtual ::rtl::OUString SAL_CALL getColumnServiceName( sal_Int32 column ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException); + virtual OUString SAL_CALL getColumnServiceName( sal_Int32 column ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException); }; } } diff --git a/connectivity/source/drivers/macab/MacabServices.cxx b/connectivity/source/drivers/macab/MacabServices.cxx index 3944bf872e40..cff50dd32f88 100644 --- a/connectivity/source/drivers/macab/MacabServices.cxx +++ b/connectivity/source/drivers/macab/MacabServices.cxx @@ -22,7 +22,6 @@ #include <cppuhelper/factory.hxx> using namespace connectivity::macab; -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/macab/MacabStatement.cxx b/connectivity/source/drivers/macab/MacabStatement.cxx index 170608c2fdf9..026e69dc28cb 100644 --- a/connectivity/source/drivers/macab/MacabStatement.cxx +++ b/connectivity/source/drivers/macab/MacabStatement.cxx @@ -32,7 +32,7 @@ #include "resource/macab_res.hrc" #if OSL_DEBUG_LEVEL > 0 -# define OUtoCStr( x ) ( ::rtl::OUStringToOString ( (x), RTL_TEXTENCODING_ASCII_US).getStr()) +# define OUtoCStr( x ) ( OUStringToOString ( (x), RTL_TEXTENCODING_ASCII_US).getStr()) #else /* OSL_DEBUG_LEVEL */ # define OUtoCStr( x ) ("dummy") #endif /* OSL_DEBUG_LEVEL */ @@ -54,7 +54,7 @@ namespace connectivity void impl_throwError(sal_uInt16 _nErrorId) { ::connectivity::SharedResources aResources; - const ::rtl::OUString sError( aResources.getResourceString(_nErrorId) ); + const OUString sError( aResources.getResourceString(_nErrorId) ); ::dbtools::throwGenericSQLException(sError,NULL); } } @@ -88,7 +88,7 @@ void MacabCommonStatement::resetParameters() const throw(::com::sun::star::sdbc: impl_throwError(STR_PARA_ONLY_PREPARED); } // ----------------------------------------------------------------------------- -void MacabCommonStatement::getNextParameter(::rtl::OUString &) const throw(::com::sun::star::sdbc::SQLException) +void MacabCommonStatement::getNextParameter(OUString &) const throw(::com::sun::star::sdbc::SQLException) { impl_throwError(STR_PARA_ONLY_PREPARED); } @@ -127,14 +127,14 @@ MacabCondition *MacabCommonStatement::analyseWhereClause(const OSQLParseNode *pP } else if (SQL_ISRULE(pLeft, column_ref)) { - ::rtl::OUString sColumnName, + OUString sColumnName, sTableRange; m_aSQLIterator.getColumnRange(pLeft, sColumnName, sTableRange); if (pRight->isToken() || SQL_ISRULE(pRight, parameter)) { - ::rtl::OUString sMatchString; + OUString sMatchString; if (pRight->isToken()) // WHERE Name = 'Doe' sMatchString = pRight->getTokenValue(); @@ -192,7 +192,7 @@ MacabCondition *MacabCommonStatement::analyseWhereClause(const OSQLParseNode *pP SQL_ISTOKEN(pMiddleLeft, IS) && SQL_ISTOKEN(pRight, NULL)) { - ::rtl::OUString sColumnName, + OUString sColumnName, sTableRange; m_aSQLIterator.getColumnRange(pLeft, sColumnName, sTableRange); @@ -213,14 +213,14 @@ MacabCondition *MacabCommonStatement::analyseWhereClause(const OSQLParseNode *pP { if (SQL_ISRULE(pLeft, column_ref)) { - ::rtl::OUString sColumnName, + OUString sColumnName, sTableRange; m_aSQLIterator.getColumnRange(pLeft, sColumnName, sTableRange); if (pMiddleRight->isToken() || SQL_ISRULE(pMiddleRight, parameter)) { - ::rtl::OUString sMatchString; + OUString sMatchString; if (pMiddleRight->isToken()) // WHERE Name LIKE 'Sm%' sMatchString = pMiddleRight->getTokenValue(); @@ -268,7 +268,7 @@ MacabOrder *MacabCommonStatement::analyseOrderByClause(const OSQLParseNode *pPar if (pColumnRef->count() == 1) { - ::rtl::OUString sColumnName = + OUString sColumnName = pColumnRef->getChild(0)->getTokenValue(); sal_Bool bAscending = SQL_ISTOKEN(pAscendingDescending, DESC)? @@ -286,16 +286,16 @@ MacabOrder *MacabCommonStatement::analyseOrderByClause(const OSQLParseNode *pPar return 0; } //------------------------------------------------------------------------------ -::rtl::OUString MacabCommonStatement::getTableName() const +OUString MacabCommonStatement::getTableName() const { const OSQLTables& xTabs = m_aSQLIterator.getTables(); if( xTabs.empty() ) - return ::rtl::OUString(); + return OUString(); // can only deal with one table at a time if(xTabs.size() > 1 || m_aSQLIterator.hasErrors() ) - return ::rtl::OUString(); + return OUString(); return xTabs.begin()->first; } @@ -309,7 +309,7 @@ void MacabCommonStatement::setMacabFields(MacabResultSet *pResult) const throw(S if (!xColumns.is()) { ::connectivity::SharedResources aResources; - const ::rtl::OUString sError( aResources.getResourceString( + const OUString sError( aResources.getResourceString( STR_INVALID_COLUMN_SELECTION ) ); ::dbtools::throwGenericSQLException(sError,NULL); @@ -398,7 +398,7 @@ void SAL_CALL MacabCommonStatement::close( ) throw(SQLException, RuntimeExcepti } // ------------------------------------------------------------------------- sal_Bool SAL_CALL MacabCommonStatement::execute( - const ::rtl::OUString& sql ) throw(SQLException, RuntimeException) + const OUString& sql ) throw(SQLException, RuntimeException) { ::osl::MutexGuard aGuard( m_aMutex ); checkDisposed(MacabCommonStatement_BASE::rBHelper.bDisposed); @@ -409,7 +409,7 @@ sal_Bool SAL_CALL MacabCommonStatement::execute( } // ------------------------------------------------------------------------- Reference< XResultSet > SAL_CALL MacabCommonStatement::executeQuery( - const ::rtl::OUString& sql ) throw(SQLException, RuntimeException) + const OUString& sql ) throw(SQLException, RuntimeException) { ::osl::MutexGuard aGuard( m_aMutex ); checkDisposed(MacabCommonStatement_BASE::rBHelper.bDisposed); @@ -418,7 +418,7 @@ OSL_TRACE("Mac OS Address book - SQL Request: %s", OUtoCStr(sql)); MacabResultSet* pResult = new MacabResultSet(this); Reference< XResultSet > xRS = pResult; - ::rtl::OUString aErr; + OUString aErr; m_pParseTree = m_aParser.parseTree(aErr, sql); if (m_pParseTree == NULL) @@ -430,7 +430,7 @@ OSL_TRACE("Mac OS Address book - SQL Request: %s", OUtoCStr(sql)); { case SQL_STATEMENT_SELECT: { - ::rtl::OUString sTableName = getTableName(); // FROM which table ? + OUString sTableName = getTableName(); // FROM which table ? if (sTableName.getLength() != 0) // a match { MacabRecords *aRecords; @@ -477,7 +477,7 @@ Reference< XConnection > SAL_CALL MacabCommonStatement::getConnection( ) throw( return (Reference< XConnection >) m_pConnection; } // ------------------------------------------------------------------------- -sal_Int32 SAL_CALL MacabCommonStatement::executeUpdate( const ::rtl::OUString& ) throw(SQLException, RuntimeException) +sal_Int32 SAL_CALL MacabCommonStatement::executeUpdate( const OUString& ) throw(SQLException, RuntimeException) { ::osl::MutexGuard aGuard( m_aMutex ); checkDisposed(MacabCommonStatement_BASE::rBHelper.bDisposed); @@ -509,7 +509,7 @@ void SAL_CALL MacabCommonStatement::clearWarnings( ) throw(SQLException, Runtim 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/macab/MacabStatement.hxx b/connectivity/source/drivers/macab/MacabStatement.hxx index 5fb3d510c257..75da079ea67f 100644 --- a/connectivity/source/drivers/macab/MacabStatement.hxx +++ b/connectivity/source/drivers/macab/MacabStatement.hxx @@ -53,7 +53,7 @@ namespace connectivity ::com::sun::star::sdbc::SQLWarning m_aLastWarning; protected: - ::std::list< ::rtl::OUString> m_aBatchList; + ::std::list< OUString> m_aBatchList; connectivity::OSQLParser m_aParser; connectivity::OSQLParseTreeIterator m_aSQLIterator; connectivity::OSQLParseNode* m_pParseTree; @@ -67,7 +67,7 @@ namespace connectivity const OSQLParseNode *pParseNode) const throw(::com::sun::star::sdbc::SQLException); class MacabOrder *analyseOrderByClause( const OSQLParseNode *pParseNode) const throw(::com::sun::star::sdbc::SQLException); - ::rtl::OUString getTableName( ) const; + OUString getTableName( ) const; void setMacabFields(class MacabResultSet *pResult) const throw(::com::sun::star::sdbc::SQLException); void selectRecords(MacabResultSet *pResult) const throw(::com::sun::star::sdbc::SQLException); void sortRecords(MacabResultSet *pResult) const throw(::com::sun::star::sdbc::SQLException); @@ -90,7 +90,7 @@ namespace connectivity sal_Int32 nHandle) const; virtual void resetParameters() const throw(::com::sun::star::sdbc::SQLException); - virtual void getNextParameter(::rtl::OUString &rParameter) const throw(::com::sun::star::sdbc::SQLException); + virtual void getNextParameter(OUString &rParameter) const throw(::com::sun::star::sdbc::SQLException); virtual ~MacabCommonStatement(); public: @@ -119,11 +119,11 @@ namespace connectivity // XStatement virtual ::com::sun::star::uno::Reference< ::com::sun::star::sdbc::XResultSet > SAL_CALL executeQuery( - const ::rtl::OUString& sql ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException); + const OUString& sql ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException); virtual sal_Int32 SAL_CALL executeUpdate( - const ::rtl::OUString& sql ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException); + const OUString& sql ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException); virtual sal_Bool SAL_CALL execute( - const ::rtl::OUString& sql ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException); + const OUString& sql ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException); virtual ::com::sun::star::uno::Reference< ::com::sun::star::sdbc::XConnection > SAL_CALL getConnection( ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException); diff --git a/connectivity/source/drivers/macab/MacabTable.cxx b/connectivity/source/drivers/macab/MacabTable.cxx index a5fec27c8550..341b2ff5e87b 100644 --- a/connectivity/source/drivers/macab/MacabTable.cxx +++ b/connectivity/source/drivers/macab/MacabTable.cxx @@ -43,11 +43,11 @@ MacabTable::MacabTable( sdbcx::OCollection* _pTables, MacabConnection* _pConnect // ------------------------------------------------------------------------- MacabTable::MacabTable( sdbcx::OCollection* _pTables, MacabConnection* _pConnection, - const ::rtl::OUString& _Name, - const ::rtl::OUString& _Type, - const ::rtl::OUString& _Description , - const ::rtl::OUString& _SchemaName, - const ::rtl::OUString& _CatalogName + const OUString& _Name, + const OUString& _Type, + const OUString& _Description , + const OUString& _SchemaName, + const OUString& _CatalogName ) : MacabTable_TYPEDEF(_pTables,sal_True, _Name, _Type, @@ -69,7 +69,7 @@ void MacabTable::refreshColumns() Any(), m_SchemaName, m_Name, - ::rtl::OUString("%")); + OUString("%")); if (xResult.is()) { diff --git a/connectivity/source/drivers/macab/MacabTable.hxx b/connectivity/source/drivers/macab/MacabTable.hxx index a1c63d57f31a..ca22067cd069 100644 --- a/connectivity/source/drivers/macab/MacabTable.hxx +++ b/connectivity/source/drivers/macab/MacabTable.hxx @@ -29,7 +29,7 @@ namespace connectivity { typedef connectivity::sdbcx::OTable MacabTable_TYPEDEF; - ::rtl::OUString getTypeString(const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySet >& xColProp); + OUString getTypeString(const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySet >& xColProp); class MacabTable : public MacabTable_TYPEDEF { @@ -40,19 +40,19 @@ namespace connectivity MacabTable( sdbcx::OCollection* _pTables, MacabConnection* _pConnection); MacabTable( sdbcx::OCollection* _pTables, MacabConnection* _pConnection, - const ::rtl::OUString& _Name, - const ::rtl::OUString& _Type, - const ::rtl::OUString& _Description = ::rtl::OUString(), - const ::rtl::OUString& _SchemaName = ::rtl::OUString(), - const ::rtl::OUString& _CatalogName = ::rtl::OUString() + const OUString& _Name, + const OUString& _Type, + const OUString& _Description = OUString(), + const OUString& _SchemaName = OUString(), + const OUString& _CatalogName = OUString() ); MacabConnection* getConnection() { return m_pConnection;} virtual void refreshColumns(); - ::rtl::OUString getTableName() const { return m_Name; } - ::rtl::OUString getSchema() const { return m_SchemaName; } + OUString getTableName() const { return m_Name; } + OUString getSchema() const { return m_SchemaName; } }; } } diff --git a/connectivity/source/drivers/macab/MacabTables.cxx b/connectivity/source/drivers/macab/MacabTables.cxx index a9f7d9685f0c..285d6d992a58 100644 --- a/connectivity/source/drivers/macab/MacabTables.cxx +++ b/connectivity/source/drivers/macab/MacabTables.cxx @@ -35,15 +35,15 @@ using namespace ::com::sun::star::sdbc; using namespace ::com::sun::star::container; using namespace ::com::sun::star::lang; -sdbcx::ObjectType MacabTables::createObject(const ::rtl::OUString& _rName) +sdbcx::ObjectType MacabTables::createObject(const OUString& _rName) { - ::rtl::OUString aName,aSchema; - aSchema = ::rtl::OUString("%"); + OUString aName,aSchema; + aSchema = OUString("%"); aName = _rName; - Sequence< ::rtl::OUString > aTypes(1); - aTypes[0] = ::rtl::OUString("%"); - ::rtl::OUString sEmpty; + Sequence< OUString > aTypes(1); + aTypes[0] = OUString("%"); + OUString sEmpty; Reference< XResultSet > xResult = m_xMetaData->getTables(Any(), aSchema, aName, aTypes); diff --git a/connectivity/source/drivers/macab/MacabTables.hxx b/connectivity/source/drivers/macab/MacabTables.hxx index 993a79f37ac4..d33d23098b8d 100644 --- a/connectivity/source/drivers/macab/MacabTables.hxx +++ b/connectivity/source/drivers/macab/MacabTables.hxx @@ -32,7 +32,7 @@ namespace connectivity ::com::sun::star::uno::Reference< ::com::sun::star::sdbc::XDatabaseMetaData > m_xMetaData; protected: - virtual sdbcx::ObjectType createObject(const ::rtl::OUString& _rName); + virtual sdbcx::ObjectType createObject(const OUString& _rName); virtual void impl_refresh() throw(::com::sun::star::uno::RuntimeException); public: diff --git a/connectivity/source/drivers/macab/macabcondition.cxx b/connectivity/source/drivers/macab/macabcondition.cxx index 2d68567af781..175076ea6447 100644 --- a/connectivity/source/drivers/macab/macabcondition.cxx +++ b/connectivity/source/drivers/macab/macabcondition.cxx @@ -51,7 +51,7 @@ sal_Bool MacabConditionConstant::eval(const MacabRecord *) const return m_bValue; } // ----------------------------------------------------------------------------- -MacabConditionColumn::MacabConditionColumn(const MacabHeader *header, const ::rtl::OUString &sColumnName) throw(SQLException) +MacabConditionColumn::MacabConditionColumn(const MacabHeader *header, const OUString &sColumnName) throw(SQLException) : MacabCondition(), m_nFieldNumber(header->getColumnNumber(sColumnName)) { @@ -69,7 +69,7 @@ sal_Bool MacabConditionColumn::isAlwaysFalse() const return sal_False; } // ----------------------------------------------------------------------------- -MacabConditionNull::MacabConditionNull(const MacabHeader *header, const ::rtl::OUString &sColumnName) throw(SQLException) +MacabConditionNull::MacabConditionNull(const MacabHeader *header, const OUString &sColumnName) throw(SQLException) : MacabConditionColumn(header, sColumnName) { } @@ -86,7 +86,7 @@ sal_Bool MacabConditionNull::eval(const MacabRecord *aRecord) const return sal_False; } // ----------------------------------------------------------------------------- -MacabConditionNotNull::MacabConditionNotNull(const MacabHeader *header, const ::rtl::OUString &sColumnName) throw(SQLException) +MacabConditionNotNull::MacabConditionNotNull(const MacabHeader *header, const OUString &sColumnName) throw(SQLException) : MacabConditionColumn(header, sColumnName) { } @@ -103,13 +103,13 @@ sal_Bool MacabConditionNotNull::eval(const MacabRecord *aRecord) const return sal_True; } // ----------------------------------------------------------------------------- -MacabConditionCompare::MacabConditionCompare(const MacabHeader *header, const ::rtl::OUString &sColumnName, const ::rtl::OUString &sMatchString) throw(SQLException) +MacabConditionCompare::MacabConditionCompare(const MacabHeader *header, const OUString &sColumnName, const OUString &sMatchString) throw(SQLException) : MacabConditionColumn(header, sColumnName), m_sMatchString(sMatchString) { } // ----------------------------------------------------------------------------- -MacabConditionEqual::MacabConditionEqual(const MacabHeader *header, const ::rtl::OUString &sColumnName, const ::rtl::OUString &sMatchString) throw(SQLException) +MacabConditionEqual::MacabConditionEqual(const MacabHeader *header, const OUString &sColumnName, const OUString &sMatchString) throw(SQLException) : MacabConditionCompare(header, sColumnName, sMatchString) { } @@ -132,7 +132,7 @@ sal_Bool MacabConditionEqual::eval(const MacabRecord *aRecord) const return nReturn == 0; } // ----------------------------------------------------------------------------- -MacabConditionDifferent::MacabConditionDifferent(const MacabHeader *header, const ::rtl::OUString &sColumnName, const ::rtl::OUString &sMatchString) throw(SQLException) +MacabConditionDifferent::MacabConditionDifferent(const MacabHeader *header, const OUString &sColumnName, const OUString &sMatchString) throw(SQLException) : MacabConditionCompare(header, sColumnName, sMatchString) { } @@ -155,7 +155,7 @@ sal_Bool MacabConditionDifferent::eval(const MacabRecord *aRecord) const return nReturn != 0; } // ----------------------------------------------------------------------------- -MacabConditionSimilar::MacabConditionSimilar(const MacabHeader *header, const ::rtl::OUString &sColumnName, const ::rtl::OUString &sMatchString) throw(SQLException) +MacabConditionSimilar::MacabConditionSimilar(const MacabHeader *header, const OUString &sColumnName, const OUString &sMatchString) throw(SQLException) : MacabConditionCompare(header, sColumnName, sMatchString) { } @@ -167,7 +167,7 @@ sal_Bool MacabConditionSimilar::eval(const MacabRecord *aRecord) const if(aValue == NULL) return sal_False; - ::rtl::OUString sName = MacabRecord::fieldToString(aValue); + OUString sName = MacabRecord::fieldToString(aValue); return match(m_sMatchString, sName, '\0'); } diff --git a/connectivity/source/drivers/macab/macabcondition.hxx b/connectivity/source/drivers/macab/macabcondition.hxx index 506707c2b08e..76acf95056d0 100644 --- a/connectivity/source/drivers/macab/macabcondition.hxx +++ b/connectivity/source/drivers/macab/macabcondition.hxx @@ -60,7 +60,7 @@ class MacabConditionColumn : public MacabCondition public: MacabConditionColumn( const MacabHeader *header, - const ::rtl::OUString &sColumnName) throw(::com::sun::star::sdbc::SQLException); + const OUString &sColumnName) throw(::com::sun::star::sdbc::SQLException); virtual sal_Bool isAlwaysTrue() const; virtual sal_Bool isAlwaysFalse() const; }; @@ -70,7 +70,7 @@ class MacabConditionNull : public MacabConditionColumn public: MacabConditionNull( const MacabHeader *header, - const ::rtl::OUString &sColumnName) throw(::com::sun::star::sdbc::SQLException); + const OUString &sColumnName) throw(::com::sun::star::sdbc::SQLException); virtual sal_Bool eval(const MacabRecord *aRecord) const; }; // ----------------------------------------------------------------------------- @@ -79,20 +79,20 @@ class MacabConditionNotNull : public MacabConditionColumn public: MacabConditionNotNull( const MacabHeader *header, - const ::rtl::OUString &sColumnName) throw(::com::sun::star::sdbc::SQLException); + const OUString &sColumnName) throw(::com::sun::star::sdbc::SQLException); virtual sal_Bool eval(const MacabRecord *aRecord) const; }; // ----------------------------------------------------------------------------- class MacabConditionCompare : public MacabConditionColumn { protected: - const ::rtl::OUString m_sMatchString; + const OUString m_sMatchString; public: MacabConditionCompare( const MacabHeader *header, - const ::rtl::OUString &sColumnName, - const ::rtl::OUString &sMatchString) throw(::com::sun::star::sdbc::SQLException); + const OUString &sColumnName, + const OUString &sMatchString) throw(::com::sun::star::sdbc::SQLException); }; // ----------------------------------------------------------------------------- class MacabConditionEqual : public MacabConditionCompare @@ -100,8 +100,8 @@ class MacabConditionEqual : public MacabConditionCompare public: MacabConditionEqual( const MacabHeader *header, - const ::rtl::OUString &sColumnName, - const ::rtl::OUString &sMatchString) throw(::com::sun::star::sdbc::SQLException); + const OUString &sColumnName, + const OUString &sMatchString) throw(::com::sun::star::sdbc::SQLException); virtual sal_Bool eval(const MacabRecord *aRecord) const; }; // ----------------------------------------------------------------------------- @@ -110,8 +110,8 @@ class MacabConditionDifferent : public MacabConditionCompare public: MacabConditionDifferent( const MacabHeader *header, - const ::rtl::OUString &sColumnName, - const ::rtl::OUString &sMatchString) throw(::com::sun::star::sdbc::SQLException); + const OUString &sColumnName, + const OUString &sMatchString) throw(::com::sun::star::sdbc::SQLException); virtual sal_Bool eval(const MacabRecord *aRecord) const; }; // ----------------------------------------------------------------------------- @@ -120,8 +120,8 @@ class MacabConditionSimilar : public MacabConditionCompare public: MacabConditionSimilar( const MacabHeader *header, - const ::rtl::OUString &sColumnName, - const ::rtl::OUString &sMatchString) throw(::com::sun::star::sdbc::SQLException); + const OUString &sColumnName, + const OUString &sMatchString) throw(::com::sun::star::sdbc::SQLException); virtual sal_Bool eval(const MacabRecord *aRecord) const; }; // ----------------------------------------------------------------------------- diff --git a/connectivity/source/drivers/macab/macaborder.cxx b/connectivity/source/drivers/macab/macaborder.cxx index ebcc6421e09a..79dd1c18619d 100644 --- a/connectivity/source/drivers/macab/macaborder.cxx +++ b/connectivity/source/drivers/macab/macaborder.cxx @@ -28,7 +28,7 @@ MacabOrder::~MacabOrder() { } // ----------------------------------------------------------------------------- -MacabSimpleOrder::MacabSimpleOrder(MacabHeader *header, ::rtl::OUString &sColumnName, sal_Bool bAscending) +MacabSimpleOrder::MacabSimpleOrder(MacabHeader *header, OUString &sColumnName, sal_Bool bAscending) : MacabOrder(), m_nFieldNumber(header->getColumnNumber(sColumnName)), m_bAscending(bAscending) diff --git a/connectivity/source/drivers/macab/macaborder.hxx b/connectivity/source/drivers/macab/macaborder.hxx index b813d118fbcc..f53969349d5c 100644 --- a/connectivity/source/drivers/macab/macaborder.hxx +++ b/connectivity/source/drivers/macab/macaborder.hxx @@ -44,7 +44,7 @@ namespace connectivity sal_Bool m_bAscending; public: - MacabSimpleOrder(MacabHeader *header, ::rtl::OUString &sColumnName, sal_Bool bAscending); + MacabSimpleOrder(MacabHeader *header, OUString &sColumnName, sal_Bool bAscending); virtual sal_Int32 compare(const MacabRecord *record1, const MacabRecord *record2) const; }; diff --git a/connectivity/source/drivers/macab/macabutilities.hxx b/connectivity/source/drivers/macab/macabutilities.hxx index d2b2ed28a412..b6afd1cbbe5f 100644 --- a/connectivity/source/drivers/macab/macabutilities.hxx +++ b/connectivity/source/drivers/macab/macabutilities.hxx @@ -34,7 +34,7 @@ namespace connectivity namespace macab { // ------------------------------------------------------------------------- - inline ::rtl::OUString CFStringToOUString(const CFStringRef sOrig) + inline OUString CFStringToOUString(const CFStringRef sOrig) { /* Copied all-but directly from code by Florian Heckl in * cws_src680_aquafilepicker01 @@ -43,7 +43,7 @@ namespace connectivity * names. */ if (NULL == sOrig) { - return rtl::OUString(); + return OUString(); } CFRetain(sOrig); @@ -57,11 +57,11 @@ namespace connectivity CFStringGetCharacters (sOrig, CFRangeMake(0,nStringLength), unichars); CFRelease(sOrig); - return rtl::OUString(unichars); + return OUString(unichars); } // ------------------------------------------------------------------------- - inline CFStringRef OUStringToCFString(const ::rtl::OUString& aString) + inline CFStringRef OUStringToCFString(const OUString& aString) { /* Copied directly from code by Florian Heckl in * cws_src680_aquafilepicker01 @@ -97,7 +97,7 @@ namespace connectivity } // ------------------------------------------------------------------------- - inline ::rtl::OUString fixLabel(const ::rtl::OUString _originalLabel) + inline OUString fixLabel(const OUString _originalLabel) { /* Get the length, and make sure that there is actually a string * here. |