From c733be973e1483fb40f48bacc9182ccf0977ede3 Mon Sep 17 00:00:00 2001 From: Noel Grandin Date: Fri, 23 Oct 2015 14:35:25 +0200 Subject: com::sun::star->css in lotuswordpro,mysqlc,oox Change-Id: Id99ff87c4eb3f1b36702261ce63d5d2793ea35d7 --- mysqlc/source/mysqlc_connection.hxx | 20 ++++----- mysqlc/source/mysqlc_databasemetadata.cxx | 4 +- mysqlc/source/mysqlc_databasemetadata.hxx | 8 ++-- mysqlc/source/mysqlc_driver.cxx | 4 +- mysqlc/source/mysqlc_driver.hxx | 16 +++---- mysqlc/source/mysqlc_general.cxx | 44 +++++++++--------- mysqlc/source/mysqlc_general.hxx | 16 +++---- mysqlc/source/mysqlc_preparedstatement.cxx | 2 +- mysqlc/source/mysqlc_preparedstatement.hxx | 44 +++++++++--------- mysqlc/source/mysqlc_resultset.cxx | 6 +-- mysqlc/source/mysqlc_resultset.hxx | 72 +++++++++++++++--------------- mysqlc/source/mysqlc_resultsetmetadata.cxx | 2 +- mysqlc/source/mysqlc_resultsetmetadata.hxx | 4 +- mysqlc/source/mysqlc_statement.cxx | 2 +- mysqlc/source/mysqlc_statement.hxx | 36 +++++++-------- mysqlc/source/mysqlc_subcomponent.hxx | 14 +++--- 16 files changed, 147 insertions(+), 147 deletions(-) (limited to 'mysqlc') diff --git a/mysqlc/source/mysqlc_connection.hxx b/mysqlc/source/mysqlc_connection.hxx index b9dc1321a0dc..e21b2f6d7725 100644 --- a/mysqlc/source/mysqlc_connection.hxx +++ b/mysqlc/source/mysqlc_connection.hxx @@ -59,11 +59,11 @@ namespace connectivity using ::com::sun::star::sdbc::SQLWarning; using ::com::sun::star::sdbc::SQLException; using ::com::sun::star::uno::RuntimeException; - typedef ::com::sun::star::uno::Reference< ::com::sun::star::container::XNameAccess > my_XNameAccessRef; + typedef css::uno::Reference< css::container::XNameAccess > my_XNameAccessRef; - typedef ::cppu::WeakComponentImplHelper3< ::com::sun::star::sdbc::XConnection, - ::com::sun::star::sdbc::XWarningsSupplier, - ::com::sun::star::lang::XServiceInfo + typedef ::cppu::WeakComponentImplHelper3< css::sdbc::XConnection, + css::sdbc::XWarningsSupplier, + css::lang::XServiceInfo > OMetaConnection_BASE; struct ConnectionSettings { @@ -79,7 +79,7 @@ namespace connectivity typedef OMetaConnection_BASE OConnection_BASE; - typedef std::vector< ::com::sun::star::uno::WeakReferenceHelper > OWeakRefArray; + typedef std::vector< css::uno::WeakReferenceHelper > OWeakRefArray; class OConnection : public OBase_Mutex, public OConnection_BASE, @@ -91,14 +91,14 @@ namespace connectivity ConnectionSettings m_settings; private: - ::com::sun::star::uno::Reference< com::sun::star::container::XNameAccess > m_typeMap; - ::com::sun::star::uno::Reference< com::sun::star::util::XStringSubstitution > m_xParameterSubstitution; + css::uno::Reference< css::container::XNameAccess > m_typeMap; + css::uno::Reference< css::util::XStringSubstitution > m_xParameterSubstitution; protected: // Data attributes - ::com::sun::star::uno::WeakReference< ::com::sun::star::sdbc::XDatabaseMetaData > m_xMetaData; + css::uno::WeakReference< css::sdbc::XDatabaseMetaData > m_xMetaData; OWeakRefArray m_aStatements; // vector containing a list // of all the Statement objects @@ -121,7 +121,7 @@ namespace connectivity sal_Int32 getMysqlVersion() throw(SQLException, RuntimeException); - virtual void construct(const rtl::OUString& url,const ::com::sun::star::uno::Sequence< ::com::sun::star::beans::PropertyValue >& info) + virtual void construct(const rtl::OUString& url,const css::uno::Sequence< css::beans::PropertyValue >& info) throw(SQLException); OConnection(MysqlCDriver& _rDriver, sql::Driver * cppDriver); @@ -206,7 +206,7 @@ namespace connectivity void SAL_CALL close() throw(SQLException, RuntimeException, std::exception) SAL_OVERRIDE; // XWarningsSupplier - ::com::sun::star::uno::Any SAL_CALL getWarnings() + css::uno::Any SAL_CALL getWarnings() throw(SQLException, RuntimeException, std::exception) SAL_OVERRIDE; void SAL_CALL clearWarnings() throw(SQLException, RuntimeException, std::exception) SAL_OVERRIDE; diff --git a/mysqlc/source/mysqlc_databasemetadata.cxx b/mysqlc/source/mysqlc_databasemetadata.cxx index 8cea781d1123..fdb73d679410 100644 --- a/mysqlc/source/mysqlc_databasemetadata.cxx +++ b/mysqlc/source/mysqlc_databasemetadata.cxx @@ -976,9 +976,9 @@ sal_Bool SAL_CALL ODatabaseMetaData::supportsResultSetConcurrency(sal_Int32 setT OSL_TRACE("ODatabaseMetaData::supportsResultSetConcurrency"); /* TODO: Check this out */ try { - return meta->supportsResultSetConcurrency(setType, concurrency==com::sun::star::sdbc::TransactionIsolation::READ_COMMITTED? + return meta->supportsResultSetConcurrency(setType, concurrency==css::sdbc::TransactionIsolation::READ_COMMITTED? sql::TRANSACTION_READ_COMMITTED: - (concurrency == com::sun::star::sdbc::TransactionIsolation::SERIALIZABLE? + (concurrency == css::sdbc::TransactionIsolation::SERIALIZABLE? sql::TRANSACTION_SERIALIZABLE:sql::TRANSACTION_SERIALIZABLE)); } catch (const sql::MethodNotImplementedException &) { mysqlc_sdbc_driver::throwFeatureNotImplementedException("ODatabaseMetaData::supportsResultSetConcurrency", *this); diff --git a/mysqlc/source/mysqlc_databasemetadata.hxx b/mysqlc/source/mysqlc_databasemetadata.hxx index a7a6bd83e09e..687039d96f69 100644 --- a/mysqlc/source/mysqlc_databasemetadata.hxx +++ b/mysqlc/source/mysqlc_databasemetadata.hxx @@ -37,7 +37,7 @@ namespace connectivity //************ Class: ODatabaseMetaData - typedef ::cppu::WeakImplHelper1< ::com::sun::star::sdbc::XDatabaseMetaData> ODatabaseMetaData_BASE; + typedef ::cppu::WeakImplHelper1< css::sdbc::XDatabaseMetaData> ODatabaseMetaData_BASE; class ODatabaseMetaData : public ODatabaseMetaData_BASE { @@ -189,7 +189,7 @@ namespace connectivity sal_Bool SAL_CALL dataDefinitionIgnoredInTransactions() throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) SAL_OVERRIDE; css::uno::Reference< css::sdbc::XResultSet > SAL_CALL getProcedures(const Any& catalog, const rtl::OUString& schemaPattern, const rtl::OUString& procedureNamePattern) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) SAL_OVERRIDE; css::uno::Reference< css::sdbc::XResultSet > SAL_CALL getProcedureColumns(const Any& catalog, const rtl::OUString& schemaPattern, const rtl::OUString& procedureNamePattern, const rtl::OUString& columnNamePattern) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) SAL_OVERRIDE; - css::uno::Reference< css::sdbc::XResultSet > SAL_CALL getTables(const Any& catalog, const rtl::OUString& schemaPattern, const rtl::OUString& tableNamePattern, const ::com::sun::star::uno::Sequence< rtl::OUString >& types) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) SAL_OVERRIDE; + css::uno::Reference< css::sdbc::XResultSet > SAL_CALL getTables(const Any& catalog, const rtl::OUString& schemaPattern, const rtl::OUString& tableNamePattern, const css::uno::Sequence< rtl::OUString >& types) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) SAL_OVERRIDE; css::uno::Reference< css::sdbc::XResultSet > SAL_CALL getSchemas() throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) SAL_OVERRIDE; css::uno::Reference< css::sdbc::XResultSet > SAL_CALL getCatalogs() throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) SAL_OVERRIDE; css::uno::Reference< css::sdbc::XResultSet > SAL_CALL getTableTypes() throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) SAL_OVERRIDE; @@ -216,8 +216,8 @@ namespace connectivity sal_Bool SAL_CALL deletesAreDetected(sal_Int32 setType) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) SAL_OVERRIDE; sal_Bool SAL_CALL insertsAreDetected(sal_Int32 setType) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) SAL_OVERRIDE; sal_Bool SAL_CALL supportsBatchUpdates() throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) SAL_OVERRIDE; - css::uno::Reference< css::sdbc::XResultSet > SAL_CALL getUDTs(const Any& catalog, const rtl::OUString& schemaPattern, const rtl::OUString& typeNamePattern, const ::com::sun::star::uno::Sequence< sal_Int32 >& types) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) SAL_OVERRIDE; - ::com::sun::star::uno::Reference< ::com::sun::star::sdbc::XConnection > SAL_CALL getConnection() throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) SAL_OVERRIDE; + css::uno::Reference< css::sdbc::XResultSet > SAL_CALL getUDTs(const Any& catalog, const rtl::OUString& schemaPattern, const rtl::OUString& typeNamePattern, const css::uno::Sequence< sal_Int32 >& types) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) SAL_OVERRIDE; + css::uno::Reference< css::sdbc::XConnection > SAL_CALL getConnection() throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) SAL_OVERRIDE; }; } } diff --git a/mysqlc/source/mysqlc_driver.cxx b/mysqlc/source/mysqlc_driver.cxx index 96a4e666de62..ed43d27b235c 100644 --- a/mysqlc/source/mysqlc_driver.cxx +++ b/mysqlc/source/mysqlc_driver.cxx @@ -276,7 +276,7 @@ namespace mysqlc { Reference< XInterface > SAL_CALL MysqlCDriver_CreateInstance(const Reference< XMultiServiceFactory >& _rxFactory) - throw(::com::sun::star::uno::Exception) + throw(css::uno::Exception) { return(*(new MysqlCDriver(_rxFactory))); } @@ -284,7 +284,7 @@ Reference< XInterface > SAL_CALL MysqlCDriver_CreateInstance(const Reference< X void release(oslInterlockedCount& _refCount, ::cppu::OBroadcastHelper& rBHelper, Reference< XInterface >& _xInterface, - ::com::sun::star::lang::XComponent* _pObject) + css::lang::XComponent* _pObject) { if (osl_atomic_decrement(&_refCount) == 0) { osl_atomic_increment(&_refCount); diff --git a/mysqlc/source/mysqlc_driver.hxx b/mysqlc/source/mysqlc_driver.hxx index f95e914729dc..85f82d2d5b56 100644 --- a/mysqlc/source/mysqlc_driver.hxx +++ b/mysqlc/source/mysqlc_driver.hxx @@ -48,17 +48,17 @@ namespace connectivity using ::com::sun::star::uno::Exception; using ::com::sun::star::uno::Reference; using ::com::sun::star::uno::Sequence; - Reference< ::com::sun::star::uno::XInterface > SAL_CALL MysqlCDriver_CreateInstance(const Reference< ::com::sun::star::lang::XMultiServiceFactory >& _rxFactory) throw(Exception); + Reference< css::uno::XInterface > SAL_CALL MysqlCDriver_CreateInstance(const Reference< css::lang::XMultiServiceFactory >& _rxFactory) throw(Exception); - typedef ::cppu::WeakComponentImplHelper2< ::com::sun::star::sdbc::XDriver, - ::com::sun::star::lang::XServiceInfo > ODriver_BASE; + typedef ::cppu::WeakComponentImplHelper2< css::sdbc::XDriver, + css::lang::XServiceInfo > ODriver_BASE; typedef void* (SAL_CALL * OMysqlCConnection_CreateInstanceFunction)(void* _pDriver); class MysqlCDriver : public ODriver_BASE { protected: - Reference< ::com::sun::star::lang::XMultiServiceFactory > m_xFactory; + Reference< css::lang::XMultiServiceFactory > m_xFactory; ::osl::Mutex m_aMutex; // mutex is need to control member access OWeakRefArray m_xConnections; // vector containing a list // of all the Connection objects @@ -76,7 +76,7 @@ namespace connectivity public: - MysqlCDriver(const Reference< ::com::sun::star::lang::XMultiServiceFactory >& _rxFactory); + MysqlCDriver(const Reference< css::lang::XMultiServiceFactory >& _rxFactory); // OComponentHelper void SAL_CALL disposing() SAL_OVERRIDE; @@ -90,17 +90,17 @@ namespace connectivity Sequence< rtl::OUString > SAL_CALL getSupportedServiceNames() throw(RuntimeException, std::exception) SAL_OVERRIDE; // XDriver - Reference< ::com::sun::star::sdbc::XConnection > SAL_CALL connect(const rtl::OUString& url, const Sequence< ::com::sun::star::beans::PropertyValue >& info) + Reference< css::sdbc::XConnection > SAL_CALL connect(const rtl::OUString& url, const Sequence< css::beans::PropertyValue >& info) throw(SQLException, RuntimeException, std::exception) SAL_OVERRIDE; sal_Bool SAL_CALL acceptsURL(const rtl::OUString& url) throw(SQLException, RuntimeException, std::exception) SAL_OVERRIDE; - Sequence< ::com::sun::star::sdbc::DriverPropertyInfo > SAL_CALL getPropertyInfo(const rtl::OUString& url, const Sequence< ::com::sun::star::beans::PropertyValue >& info) + Sequence< css::sdbc::DriverPropertyInfo > SAL_CALL getPropertyInfo(const rtl::OUString& url, const Sequence< css::beans::PropertyValue >& info) throw(SQLException, RuntimeException, std::exception) SAL_OVERRIDE; sal_Int32 SAL_CALL getMajorVersion() throw(RuntimeException, std::exception) SAL_OVERRIDE; sal_Int32 SAL_CALL getMinorVersion() throw(RuntimeException, std::exception) SAL_OVERRIDE; - inline Reference< ::com::sun::star::lang::XMultiServiceFactory > getFactory() const { return m_xFactory; } + inline Reference< css::lang::XMultiServiceFactory > getFactory() const { return m_xFactory; } static rtl_TextEncoding getDefaultEncoding() { return RTL_TEXTENCODING_UTF8; } diff --git a/mysqlc/source/mysqlc_general.cxx b/mysqlc/source/mysqlc_general.cxx index 885bb021d485..57683f666edb 100644 --- a/mysqlc/source/mysqlc_general.cxx +++ b/mysqlc/source/mysqlc_general.cxx @@ -58,7 +58,7 @@ void throwInvalidArgumentException( const sal_Char* _pAsciiFeatureName, const Re ); } -void translateAndThrow(const ::sql::SQLException& _error, const ::com::sun::star::uno::Reference< ::com::sun::star::uno::XInterface >& _context, const rtl_TextEncoding encoding) +void translateAndThrow(const ::sql::SQLException& _error, const css::uno::Reference< css::uno::XInterface >& _context, const rtl_TextEncoding encoding) { throw SQLException( convert(_error.what(), encoding), @@ -81,70 +81,70 @@ int mysqlToOOOType(int cppConnType) { switch (cppConnType) { case sql::DataType::BIT: - return com::sun::star::sdbc::DataType::VARCHAR; + return css::sdbc::DataType::VARCHAR; case sql::DataType::TINYINT: - return com::sun::star::sdbc::DataType::TINYINT; + return css::sdbc::DataType::TINYINT; case sql::DataType::SMALLINT: - return com::sun::star::sdbc::DataType::SMALLINT; + return css::sdbc::DataType::SMALLINT; case sql::DataType::INTEGER: - return com::sun::star::sdbc::DataType::INTEGER; + return css::sdbc::DataType::INTEGER; case sql::DataType::BIGINT: - return com::sun::star::sdbc::DataType::BIGINT; + return css::sdbc::DataType::BIGINT; case sql::DataType::REAL: - return com::sun::star::sdbc::DataType::REAL; + return css::sdbc::DataType::REAL; case sql::DataType::DOUBLE: - return com::sun::star::sdbc::DataType::DOUBLE; + return css::sdbc::DataType::DOUBLE; case sql::DataType::DECIMAL: - return com::sun::star::sdbc::DataType::DECIMAL; + return css::sdbc::DataType::DECIMAL; case sql::DataType::CHAR: - return com::sun::star::sdbc::DataType::CHAR; + return css::sdbc::DataType::CHAR; case sql::DataType::BINARY: - return com::sun::star::sdbc::DataType::BINARY; + return css::sdbc::DataType::BINARY; case sql::DataType::ENUM: case sql::DataType::SET: case sql::DataType::VARCHAR: - return com::sun::star::sdbc::DataType::VARCHAR; + return css::sdbc::DataType::VARCHAR; case sql::DataType::VARBINARY: - return com::sun::star::sdbc::DataType::VARBINARY; + return css::sdbc::DataType::VARBINARY; case sql::DataType::LONGVARCHAR: - return com::sun::star::sdbc::DataType::LONGVARCHAR; + return css::sdbc::DataType::LONGVARCHAR; case sql::DataType::LONGVARBINARY: - return com::sun::star::sdbc::DataType::LONGVARBINARY; + return css::sdbc::DataType::LONGVARBINARY; case sql::DataType::TIMESTAMP: - return com::sun::star::sdbc::DataType::TIMESTAMP; + return css::sdbc::DataType::TIMESTAMP; case sql::DataType::DATE: - return com::sun::star::sdbc::DataType::DATE; + return css::sdbc::DataType::DATE; case sql::DataType::TIME: - return com::sun::star::sdbc::DataType::TIME; + return css::sdbc::DataType::TIME; case sql::DataType::GEOMETRY: - return com::sun::star::sdbc::DataType::VARCHAR; + return css::sdbc::DataType::VARCHAR; case sql::DataType::SQLNULL: - return com::sun::star::sdbc::DataType::SQLNULL; + return css::sdbc::DataType::SQLNULL; case sql::DataType::UNKNOWN: - return com::sun::star::sdbc::DataType::VARCHAR; + return css::sdbc::DataType::VARCHAR; } OSL_FAIL( "mysqlToOOOType: unhandled case, falling back to VARCHAR" ); - return com::sun::star::sdbc::DataType::VARCHAR; + return css::sdbc::DataType::VARCHAR; } rtl::OUString convert(const ::std::string& _string, const rtl_TextEncoding encoding) diff --git a/mysqlc/source/mysqlc_general.hxx b/mysqlc/source/mysqlc_general.hxx index d78f823c964a..83318944a047 100644 --- a/mysqlc/source/mysqlc_general.hxx +++ b/mysqlc/source/mysqlc_general.hxx @@ -29,23 +29,23 @@ namespace mysqlc_sdbc_driver { - rtl::OUString getStringFromAny(const ::com::sun::star::uno::Any& _rAny); + rtl::OUString getStringFromAny(const css::uno::Any& _rAny); void throwFeatureNotImplementedException( const sal_Char* _pAsciiFeatureName, - const ::com::sun::star::uno::Reference< ::com::sun::star::uno::XInterface >& _rxContext, - const ::com::sun::star::uno::Any* _pNextException = NULL + const css::uno::Reference< css::uno::XInterface >& _rxContext, + const css::uno::Any* _pNextException = NULL ) - throw (::com::sun::star::sdbc::SQLException); + throw (css::sdbc::SQLException); void throwInvalidArgumentException( const sal_Char* _pAsciiFeatureName, - const ::com::sun::star::uno::Reference< ::com::sun::star::uno::XInterface >& _rxContext, - const ::com::sun::star::uno::Any* _pNextException = NULL + const css::uno::Reference< css::uno::XInterface >& _rxContext, + const css::uno::Any* _pNextException = NULL ) - throw (::com::sun::star::sdbc::SQLException); + throw (css::sdbc::SQLException); - void translateAndThrow(const ::sql::SQLException& _error, const ::com::sun::star::uno::Reference< ::com::sun::star::uno::XInterface >& _context, const rtl_TextEncoding encoding); + void translateAndThrow(const ::sql::SQLException& _error, const css::uno::Reference< css::uno::XInterface >& _context, const rtl_TextEncoding encoding); int mysqlToOOOType(int mysqlType) throw (); diff --git a/mysqlc/source/mysqlc_preparedstatement.cxx b/mysqlc/source/mysqlc_preparedstatement.cxx index 7736e7386d8c..96d756f3ef4d 100644 --- a/mysqlc/source/mysqlc_preparedstatement.cxx +++ b/mysqlc/source/mysqlc_preparedstatement.cxx @@ -626,7 +626,7 @@ void SAL_CALL OPreparedStatement::setObjectWithInfo(sal_Int32 _parameterIndex, c ) break; - Reference< ::com::sun::star::io::XInputStream > xBinStream; + Reference< css::io::XInputStream > xBinStream; if ( _value >>= xBinStream ) { setBinaryStream( _parameterIndex, xBinStream, xBinStream->available() ); diff --git a/mysqlc/source/mysqlc_preparedstatement.hxx b/mysqlc/source/mysqlc_preparedstatement.hxx index b037c1c4205e..693d21f9f573 100644 --- a/mysqlc/source/mysqlc_preparedstatement.hxx +++ b/mysqlc/source/mysqlc_preparedstatement.hxx @@ -41,11 +41,11 @@ namespace connectivity using ::com::sun::star::uno::RuntimeException; using ::com::sun::star::sdbc::XResultSetMetaData; - typedef ::cppu::ImplHelper5< ::com::sun::star::sdbc::XPreparedStatement, - ::com::sun::star::sdbc::XParameters, - ::com::sun::star::sdbc::XPreparedBatchExecution, - ::com::sun::star::sdbc::XResultSetMetaDataSupplier, - ::com::sun::star::lang::XServiceInfo> OPreparedStatement_BASE; + typedef ::cppu::ImplHelper5< css::sdbc::XPreparedStatement, + css::sdbc::XParameters, + css::sdbc::XPreparedBatchExecution, + css::sdbc::XResultSetMetaDataSupplier, + css::lang::XServiceInfo> OPreparedStatement_BASE; class OPreparedStatement : public OCommonStatement, public OPreparedStatement_BASE @@ -59,7 +59,7 @@ namespace connectivity protected: void SAL_CALL setFastPropertyValue_NoBroadcast(sal_Int32 nHandle, const Any& rValue) - throw (::com::sun::star::uno::Exception, std::exception) SAL_OVERRIDE; + throw (css::uno::Exception, std::exception) SAL_OVERRIDE; virtual ~OPreparedStatement(); public: virtual rtl::OUString SAL_CALL getImplementationName() @@ -81,17 +81,17 @@ namespace connectivity void SAL_CALL release() throw() SAL_OVERRIDE; //XTypeProvider - ::com::sun::star::uno::Sequence< Type > SAL_CALL getTypes() + css::uno::Sequence< Type > SAL_CALL getTypes() throw(RuntimeException, std::exception) SAL_OVERRIDE; // XPreparedStatement - Reference< ::com::sun::star::sdbc::XResultSet > SAL_CALL executeQuery() throw(SQLException, RuntimeException, std::exception) SAL_OVERRIDE; + Reference< css::sdbc::XResultSet > SAL_CALL executeQuery() throw(SQLException, RuntimeException, std::exception) SAL_OVERRIDE; sal_Int32 SAL_CALL executeUpdate() throw(SQLException, RuntimeException, std::exception) SAL_OVERRIDE; sal_Bool SAL_CALL execute() throw(SQLException, RuntimeException, std::exception) SAL_OVERRIDE; - Reference< ::com::sun::star::sdbc::XConnection > SAL_CALL getConnection() throw(SQLException, RuntimeException, std::exception) SAL_OVERRIDE; + Reference< css::sdbc::XConnection > SAL_CALL getConnection() throw(SQLException, RuntimeException, std::exception) SAL_OVERRIDE; // XStatement - ::com::sun::star::uno::Reference< ::com::sun::star::sdbc::XResultSet > SAL_CALL executeQuery(const rtl::OUString& sql) + css::uno::Reference< css::sdbc::XResultSet > SAL_CALL executeQuery(const rtl::OUString& sql) throw(SQLException, RuntimeException, std::exception) SAL_OVERRIDE; sal_Int32 SAL_CALL executeUpdate(const rtl::OUString& sql) throw(SQLException, RuntimeException, std::exception) SAL_OVERRIDE; @@ -120,21 +120,21 @@ namespace connectivity void SAL_CALL setString(sal_Int32 parameter, const rtl::OUString& x) throw(SQLException, RuntimeException, std::exception) SAL_OVERRIDE; - void SAL_CALL setBytes(sal_Int32 parameter, const ::com::sun::star::uno::Sequence< sal_Int8 >& x) + void SAL_CALL setBytes(sal_Int32 parameter, const css::uno::Sequence< sal_Int8 >& x) throw(SQLException, RuntimeException, std::exception) SAL_OVERRIDE; - void SAL_CALL setDate(sal_Int32 parameter, const ::com::sun::star::util::Date& x) + void SAL_CALL setDate(sal_Int32 parameter, const css::util::Date& x) throw(SQLException, RuntimeException, std::exception) SAL_OVERRIDE; - void SAL_CALL setTime(sal_Int32 parameter, const ::com::sun::star::util::Time& x) + void SAL_CALL setTime(sal_Int32 parameter, const css::util::Time& x) throw(SQLException, RuntimeException, std::exception) SAL_OVERRIDE; - void SAL_CALL setTimestamp(sal_Int32 parameter, const ::com::sun::star::util::DateTime& x) + void SAL_CALL setTimestamp(sal_Int32 parameter, const css::util::DateTime& x) throw(SQLException, RuntimeException, std::exception) SAL_OVERRIDE; - void SAL_CALL setBinaryStream(sal_Int32 parameter, const Reference< ::com::sun::star::io::XInputStream >& x, sal_Int32 length) + void SAL_CALL setBinaryStream(sal_Int32 parameter, const Reference< css::io::XInputStream >& x, sal_Int32 length) throw(SQLException, RuntimeException, std::exception) SAL_OVERRIDE; - void SAL_CALL setCharacterStream(sal_Int32 parameter, const Reference< ::com::sun::star::io::XInputStream >& x, sal_Int32 length) + void SAL_CALL setCharacterStream(sal_Int32 parameter, const Reference< css::io::XInputStream >& x, sal_Int32 length) throw(SQLException, RuntimeException, std::exception) SAL_OVERRIDE; void SAL_CALL setObject(sal_Int32 parameter, const Any& x) throw(SQLException, RuntimeException, std::exception) SAL_OVERRIDE; @@ -142,16 +142,16 @@ namespace connectivity void SAL_CALL setObjectWithInfo(sal_Int32 parameter, const Any& x, sal_Int32 targetSqlType, sal_Int32 scale) throw(SQLException, RuntimeException, std::exception) SAL_OVERRIDE; - void SAL_CALL setRef(sal_Int32 parameter, const Reference< ::com::sun::star::sdbc::XRef >& x) + void SAL_CALL setRef(sal_Int32 parameter, const Reference< css::sdbc::XRef >& x) throw(SQLException, RuntimeException, std::exception) SAL_OVERRIDE; - void SAL_CALL setBlob(sal_Int32 parameter, const Reference< ::com::sun::star::sdbc::XBlob >& x) + void SAL_CALL setBlob(sal_Int32 parameter, const Reference< css::sdbc::XBlob >& x) throw(SQLException, RuntimeException, std::exception) SAL_OVERRIDE; - void SAL_CALL setClob(sal_Int32 parameter, const Reference< ::com::sun::star::sdbc::XClob >& x) + void SAL_CALL setClob(sal_Int32 parameter, const Reference< css::sdbc::XClob >& x) throw(SQLException, RuntimeException, std::exception) SAL_OVERRIDE; - void SAL_CALL setArray(sal_Int32 parameter, const Reference< ::com::sun::star::sdbc::XArray >& x) + void SAL_CALL setArray(sal_Int32 parameter, const Reference< css::sdbc::XArray >& x) throw(SQLException, RuntimeException, std::exception) SAL_OVERRIDE; void SAL_CALL clearParameters() throw(SQLException, RuntimeException, std::exception) SAL_OVERRIDE; @@ -159,13 +159,13 @@ namespace connectivity // XPreparedBatchExecution void SAL_CALL addBatch() throw(SQLException, RuntimeException, std::exception) SAL_OVERRIDE; void SAL_CALL clearBatch() throw(SQLException, RuntimeException, std::exception) SAL_OVERRIDE; - ::com::sun::star::uno::Sequence< sal_Int32 > SAL_CALL executeBatch() throw(SQLException, RuntimeException, std::exception) SAL_OVERRIDE; + css::uno::Sequence< sal_Int32 > SAL_CALL executeBatch() throw(SQLException, RuntimeException, std::exception) SAL_OVERRIDE; // XCloseable void SAL_CALL close() throw(SQLException, RuntimeException, std::exception) SAL_OVERRIDE; // XResultSetMetaDataSupplier - Reference< ::com::sun::star::sdbc::XResultSetMetaData > SAL_CALL getMetaData() + Reference< css::sdbc::XResultSetMetaData > SAL_CALL getMetaData() throw(SQLException, RuntimeException, std::exception) SAL_OVERRIDE; }; } /* mysqlc */ diff --git a/mysqlc/source/mysqlc_resultset.cxx b/mysqlc/source/mysqlc_resultset.cxx index 92943380f79e..c371bbced9c1 100644 --- a/mysqlc/source/mysqlc_resultset.cxx +++ b/mysqlc/source/mysqlc_resultset.cxx @@ -1127,7 +1127,7 @@ sal_Bool OResultSet::convertFastPropertyValue(Any & /* rConvertedValue */, Any & /* rOldValue */, sal_Int32 nHandle, const Any& /* rValue */) - throw (::com::sun::star::lang::IllegalArgumentException) + throw (css::lang::IllegalArgumentException) { OSL_TRACE("OResultSet::convertFastPropertyValue"); switch (nHandle) { @@ -1135,7 +1135,7 @@ sal_Bool OResultSet::convertFastPropertyValue(Any & /* rConvertedValue */, case PROPERTY_ID_CURSORNAME: case PROPERTY_ID_RESULTSETCONCURRENCY: case PROPERTY_ID_RESULTSETTYPE: - throw ::com::sun::star::lang::IllegalArgumentException(); + throw css::lang::IllegalArgumentException(); case PROPERTY_ID_FETCHDIRECTION: case PROPERTY_ID_FETCHSIZE: default: @@ -1204,7 +1204,7 @@ void SAL_CALL OResultSet::release() OResultSet_BASE::release(); } -::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySetInfo > SAL_CALL OResultSet::getPropertySetInfo() throw(::com::sun::star::uno::RuntimeException, std::exception) +css::uno::Reference< css::beans::XPropertySetInfo > SAL_CALL OResultSet::getPropertySetInfo() throw(css::uno::RuntimeException, std::exception) { OSL_TRACE("OResultSet::getPropertySetInfo"); return ::cppu::OPropertySetHelper::createPropertySetInfo(getInfoHelper()); diff --git a/mysqlc/source/mysqlc_resultset.hxx b/mysqlc/source/mysqlc_resultset.hxx index d6eb0539d054..d971461c7a85 100644 --- a/mysqlc/source/mysqlc_resultset.hxx +++ b/mysqlc/source/mysqlc_resultset.hxx @@ -50,18 +50,18 @@ namespace connectivity /* ** OResultSet */ - typedef ::cppu::WeakComponentImplHelper12< ::com::sun::star::sdbc::XResultSet, - ::com::sun::star::sdbc::XRow, - ::com::sun::star::sdbc::XResultSetMetaDataSupplier, - ::com::sun::star::util::XCancellable, - ::com::sun::star::sdbc::XWarningsSupplier, - ::com::sun::star::sdbc::XResultSetUpdate, - ::com::sun::star::sdbc::XRowUpdate, - ::com::sun::star::sdbcx::XRowLocate, - ::com::sun::star::sdbcx::XDeleteRows, - ::com::sun::star::sdbc::XCloseable, - ::com::sun::star::sdbc::XColumnLocate, - ::com::sun::star::lang::XServiceInfo> OResultSet_BASE; + typedef ::cppu::WeakComponentImplHelper12< css::sdbc::XResultSet, + css::sdbc::XRow, + css::sdbc::XResultSetMetaDataSupplier, + css::util::XCancellable, + css::sdbc::XWarningsSupplier, + css::sdbc::XResultSetUpdate, + css::sdbc::XRowUpdate, + css::sdbcx::XRowLocate, + css::sdbcx::XDeleteRows, + css::sdbc::XCloseable, + css::sdbc::XColumnLocate, + css::lang::XServiceInfo> OResultSet_BASE; class OResultSet : public OBase_Mutex, public OResultSet_BASE, @@ -69,8 +69,8 @@ namespace connectivity public OPropertyArrayUsageHelper { protected: - ::com::sun::star::uno::WeakReferenceHelper m_aStatement; - ::com::sun::star::uno::Reference< ::com::sun::star::sdbc::XResultSetMetaData> m_xMetaData; + css::uno::WeakReferenceHelper m_aStatement; + css::uno::Reference< css::sdbc::XResultSetMetaData> m_xMetaData; sql::ResultSet *m_result; unsigned int fieldCount; rtl_TextEncoding m_encoding; @@ -80,10 +80,10 @@ namespace connectivity ::cppu::IPropertyArrayHelper & SAL_CALL getInfoHelper() SAL_OVERRIDE; sal_Bool SAL_CALL convertFastPropertyValue(Any & rConvertedValue, Any & rOldValue, sal_Int32 nHandle, const Any& rValue) - throw (::com::sun::star::lang::IllegalArgumentException) SAL_OVERRIDE; + throw (css::lang::IllegalArgumentException) SAL_OVERRIDE; void SAL_CALL setFastPropertyValue_NoBroadcast(sal_Int32 nHandle, const Any& rValue) - throw (::com::sun::star::uno::Exception, std::exception) SAL_OVERRIDE; + throw (css::uno::Exception, std::exception) SAL_OVERRIDE; void SAL_CALL getFastPropertyValue(Any& rValue, sal_Int32 nHandle) const SAL_OVERRIDE; @@ -104,27 +104,27 @@ namespace connectivity OResultSet( OCommonStatement* pStmt, sql::ResultSet *result, rtl_TextEncoding _encoding ); - ::com::sun::star::uno::Reference< ::com::sun::star::uno::XInterface > operator *() + css::uno::Reference< css::uno::XInterface > operator *() { - return ::com::sun::star::uno::Reference< ::com::sun::star::uno::XInterface >(*static_cast(this)); + return css::uno::Reference< css::uno::XInterface >(*static_cast(this)); } // ::cppu::OComponentHelper void SAL_CALL disposing() SAL_OVERRIDE; // XInterface - Any SAL_CALL queryInterface(const ::com::sun::star::uno::Type & rType) + Any SAL_CALL queryInterface(const css::uno::Type & rType) throw(RuntimeException, std::exception) SAL_OVERRIDE; void SAL_CALL acquire() throw() SAL_OVERRIDE; void SAL_CALL release() throw() SAL_OVERRIDE; //XTypeProvider - ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Type > SAL_CALL getTypes() + css::uno::Sequence< css::uno::Type > SAL_CALL getTypes() throw(RuntimeException, std::exception) SAL_OVERRIDE; // XPropertySet - ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySetInfo > SAL_CALL getPropertySetInfo() + css::uno::Reference< css::beans::XPropertySetInfo > SAL_CALL getPropertySetInfo() throw(RuntimeException, std::exception) SAL_OVERRIDE; // XResultSet @@ -152,7 +152,7 @@ namespace connectivity sal_Bool SAL_CALL rowInserted() throw(SQLException, RuntimeException, std::exception) SAL_OVERRIDE; sal_Bool SAL_CALL rowDeleted() throw(SQLException, RuntimeException, std::exception) SAL_OVERRIDE; - ::com::sun::star::uno::Reference< ::com::sun::star::uno::XInterface > SAL_CALL getStatement() + css::uno::Reference< css::uno::XInterface > SAL_CALL getStatement() throw(SQLException, RuntimeException, std::exception) SAL_OVERRIDE; // XRow sal_Bool SAL_CALL wasNull() throw(SQLException, RuntimeException, std::exception) SAL_OVERRIDE; @@ -168,13 +168,13 @@ namespace connectivity float SAL_CALL getFloat(sal_Int32 column) throw(SQLException, RuntimeException, std::exception) SAL_OVERRIDE; double SAL_CALL getDouble(sal_Int32 column) throw(SQLException, RuntimeException, std::exception) SAL_OVERRIDE; - ::com::sun::star::uno::Sequence< sal_Int8 > SAL_CALL getBytes(sal_Int32 column) + css::uno::Sequence< sal_Int8 > SAL_CALL getBytes(sal_Int32 column) throw(SQLException, RuntimeException, std::exception) SAL_OVERRIDE; - ::com::sun::star::util::Date SAL_CALL getDate(sal_Int32 column) + css::util::Date SAL_CALL getDate(sal_Int32 column) throw(SQLException, RuntimeException, std::exception) SAL_OVERRIDE; - ::com::sun::star::util::Time SAL_CALL getTime(sal_Int32 column) + css::util::Time SAL_CALL getTime(sal_Int32 column) throw(SQLException, RuntimeException, std::exception) SAL_OVERRIDE; - ::com::sun::star::util::DateTime SAL_CALL getTimestamp(sal_Int32 column) + css::util::DateTime SAL_CALL getTimestamp(sal_Int32 column) throw(SQLException, RuntimeException, std::exception) SAL_OVERRIDE; css::uno::Reference< css::io::XInputStream > SAL_CALL getBinaryStream(sal_Int32 column) @@ -185,17 +185,17 @@ namespace connectivity Any SAL_CALL getObject(sal_Int32 column, const my_XNameAccessRef& typeMap) throw(SQLException, RuntimeException, std::exception) SAL_OVERRIDE; - ::com::sun::star::uno::Reference< ::com::sun::star::sdbc::XRef > SAL_CALL getRef(sal_Int32 column) + css::uno::Reference< css::sdbc::XRef > SAL_CALL getRef(sal_Int32 column) throw(SQLException, RuntimeException, std::exception) SAL_OVERRIDE; - ::com::sun::star::uno::Reference< ::com::sun::star::sdbc::XBlob > SAL_CALL getBlob(sal_Int32 column) + css::uno::Reference< css::sdbc::XBlob > SAL_CALL getBlob(sal_Int32 column) throw(SQLException, RuntimeException, std::exception) SAL_OVERRIDE; - ::com::sun::star::uno::Reference< ::com::sun::star::sdbc::XClob > SAL_CALL getClob(sal_Int32 column) + css::uno::Reference< css::sdbc::XClob > SAL_CALL getClob(sal_Int32 column) throw(SQLException, RuntimeException, std::exception) SAL_OVERRIDE; - ::com::sun::star::uno::Reference< ::com::sun::star::sdbc::XArray > SAL_CALL getArray(sal_Int32 column) + css::uno::Reference< css::sdbc::XArray > SAL_CALL getArray(sal_Int32 column) throw(SQLException, RuntimeException, std::exception) SAL_OVERRIDE; // XResultSetMetaDataSupplier - ::com::sun::star::uno::Reference< ::com::sun::star::sdbc::XResultSetMetaData > SAL_CALL getMetaData() + css::uno::Reference< css::sdbc::XResultSetMetaData > SAL_CALL getMetaData() throw(SQLException, RuntimeException, std::exception) SAL_OVERRIDE; // XCancellable @@ -228,13 +228,13 @@ namespace connectivity void SAL_CALL updateDouble(sal_Int32 column, double x) throw(SQLException, RuntimeException, std::exception) SAL_OVERRIDE; void SAL_CALL updateString(sal_Int32 column, const rtl::OUString& x) throw(SQLException, RuntimeException, std::exception) SAL_OVERRIDE; - void SAL_CALL updateBytes(sal_Int32 column, const ::com::sun::star::uno::Sequence< sal_Int8 >& x) + void SAL_CALL updateBytes(sal_Int32 column, const css::uno::Sequence< sal_Int8 >& x) throw(SQLException, RuntimeException, std::exception) SAL_OVERRIDE; - void SAL_CALL updateDate(sal_Int32 column, const ::com::sun::star::util::Date& x) + void SAL_CALL updateDate(sal_Int32 column, const css::util::Date& x) throw(SQLException, RuntimeException, std::exception) SAL_OVERRIDE; - void SAL_CALL updateTime(sal_Int32 column, const ::com::sun::star::util::Time& x) + void SAL_CALL updateTime(sal_Int32 column, const css::util::Time& x) throw(SQLException, RuntimeException, std::exception) SAL_OVERRIDE; - void SAL_CALL updateTimestamp(sal_Int32 column, const ::com::sun::star::util::DateTime& x) + void SAL_CALL updateTimestamp(sal_Int32 column, const css::util::DateTime& x) throw(SQLException, RuntimeException, std::exception) SAL_OVERRIDE; void SAL_CALL updateBinaryStream(sal_Int32 column, const css::uno::Reference< css::io::XInputStream >& x, sal_Int32 length) throw(SQLException, RuntimeException, std::exception) SAL_OVERRIDE; @@ -263,7 +263,7 @@ namespace connectivity throw(SQLException, RuntimeException, std::exception) SAL_OVERRIDE; // XDeleteRows - ::com::sun::star::uno::Sequence< sal_Int32 > SAL_CALL deleteRows(const ::com::sun::star::uno::Sequence< Any >& rows) + css::uno::Sequence< sal_Int32 > SAL_CALL deleteRows(const css::uno::Sequence< Any >& rows) throw(SQLException, RuntimeException, std::exception) SAL_OVERRIDE; void checkColumnIndex(sal_Int32 index) throw(SQLException, RuntimeException); diff --git a/mysqlc/source/mysqlc_resultsetmetadata.cxx b/mysqlc/source/mysqlc_resultsetmetadata.cxx index 464eab07801d..6466910b6ab8 100644 --- a/mysqlc/source/mysqlc_resultsetmetadata.cxx +++ b/mysqlc/source/mysqlc_resultsetmetadata.cxx @@ -270,7 +270,7 @@ sal_Int32 SAL_CALL OResultSetMetaData::getPrecision(sal_Int32 column) } sal_Int32 SAL_CALL OResultSetMetaData::getScale(sal_Int32 column) - throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException, std::exception) + throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) { OSL_TRACE("OResultSetMetaData::getScale"); checkColumnIndex(column); diff --git a/mysqlc/source/mysqlc_resultsetmetadata.hxx b/mysqlc/source/mysqlc_resultsetmetadata.hxx index ef4c53efd60d..e79bb9be9422 100644 --- a/mysqlc/source/mysqlc_resultsetmetadata.hxx +++ b/mysqlc/source/mysqlc_resultsetmetadata.hxx @@ -36,7 +36,7 @@ namespace connectivity //************ Class: ResultSetMetaData - typedef ::cppu::WeakImplHelper1< ::com::sun::star::sdbc::XResultSetMetaData> OResultSetMetaData_BASE; + typedef ::cppu::WeakImplHelper1< css::sdbc::XResultSetMetaData> OResultSetMetaData_BASE; class OResultSetMetaData : public OResultSetMetaData_BASE { @@ -57,7 +57,7 @@ namespace connectivity } /// Avoid ambigous cast error from the compiler. - inline operator ::com::sun::star::uno::Reference< ::com::sun::star::sdbc::XResultSetMetaData > () throw() + inline operator css::uno::Reference< css::sdbc::XResultSetMetaData > () throw() { return this; } sal_Int32 SAL_CALL getColumnCount() throw(SQLException, RuntimeException, std::exception) SAL_OVERRIDE; diff --git a/mysqlc/source/mysqlc_statement.cxx b/mysqlc/source/mysqlc_statement.cxx index fc167d711e46..56a9859073c5 100644 --- a/mysqlc/source/mysqlc_statement.cxx +++ b/mysqlc/source/mysqlc_statement.cxx @@ -431,7 +431,7 @@ void SAL_CALL OStatement::release() OCommonStatement::release(); } -Reference< ::com::sun::star::beans::XPropertySetInfo > SAL_CALL OCommonStatement::getPropertySetInfo() +Reference< css::beans::XPropertySetInfo > SAL_CALL OCommonStatement::getPropertySetInfo() throw(RuntimeException, std::exception) { OSL_TRACE("OCommonStatement::getPropertySetInfo"); diff --git a/mysqlc/source/mysqlc_statement.hxx b/mysqlc/source/mysqlc_statement.hxx index f9eb191d0f98..18b63aa0bcfa 100644 --- a/mysqlc/source/mysqlc_statement.hxx +++ b/mysqlc/source/mysqlc_statement.hxx @@ -45,11 +45,11 @@ namespace connectivity using ::com::sun::star::uno::Any; using ::com::sun::star::uno::RuntimeException; - typedef ::cppu::WeakComponentImplHelper5< ::com::sun::star::sdbc::XStatement, - ::com::sun::star::sdbc::XWarningsSupplier, - ::com::sun::star::util::XCancellable, - ::com::sun::star::sdbc::XCloseable, - ::com::sun::star::sdbc::XMultipleResults> OCommonStatement_IBase; + typedef ::cppu::WeakComponentImplHelper5< css::sdbc::XStatement, + css::sdbc::XWarningsSupplier, + css::util::XCancellable, + css::sdbc::XCloseable, + css::sdbc::XMultipleResults> OCommonStatement_IBase; class OCommonStatement; typedef OSubComponent< OCommonStatement, OCommonStatement_IBase > OStatement_CBase; @@ -87,10 +87,10 @@ namespace connectivity ::cppu::IPropertyArrayHelper & SAL_CALL getInfoHelper() SAL_OVERRIDE; sal_Bool SAL_CALL convertFastPropertyValue(Any & rConvertedValue, Any & rOldValue, sal_Int32 nHandle, const Any& rValue) - throw (::com::sun::star::lang::IllegalArgumentException) SAL_OVERRIDE; + throw (css::lang::IllegalArgumentException) SAL_OVERRIDE; void SAL_CALL setFastPropertyValue_NoBroadcast(sal_Int32 nHandle, const Any& rValue) - throw(::com::sun::star::uno::Exception, std::exception) SAL_OVERRIDE; + throw(css::uno::Exception, std::exception) SAL_OVERRIDE; void SAL_CALL getFastPropertyValue(Any& rValue, sal_Int32 nHandle) const SAL_OVERRIDE; virtual ~OCommonStatement(); @@ -100,7 +100,7 @@ namespace connectivity public: ::cppu::OBroadcastHelper& rBHelper; - using OCommonStatement_IBase::operator ::com::sun::star::uno::Reference< ::com::sun::star::uno::XInterface >; + using OCommonStatement_IBase::operator css::uno::Reference< css::uno::XInterface >; // OComponentHelper void SAL_CALL disposing() SAL_OVERRIDE; @@ -111,19 +111,19 @@ namespace connectivity void SAL_CALL acquire() throw() SAL_OVERRIDE; // XInterface - Any SAL_CALL queryInterface(const ::com::sun::star::uno::Type & rType) + Any SAL_CALL queryInterface(const css::uno::Type & rType) throw(RuntimeException, std::exception) SAL_OVERRIDE; //XTypeProvider - ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Type > SAL_CALL getTypes() + css::uno::Sequence< css::uno::Type > SAL_CALL getTypes() throw(RuntimeException, std::exception) SAL_OVERRIDE; // XPropertySet - ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySetInfo > SAL_CALL getPropertySetInfo() + css::uno::Reference< css::beans::XPropertySetInfo > SAL_CALL getPropertySetInfo() throw(RuntimeException, std::exception) SAL_OVERRIDE; // XStatement - ::com::sun::star::uno::Reference< ::com::sun::star::sdbc::XResultSet > SAL_CALL executeQuery(const rtl::OUString& sql) + css::uno::Reference< css::sdbc::XResultSet > SAL_CALL executeQuery(const rtl::OUString& sql) throw(SQLException, RuntimeException, std::exception) SAL_OVERRIDE; sal_Int32 SAL_CALL executeUpdate(const rtl::OUString& sql) @@ -132,7 +132,7 @@ namespace connectivity sal_Bool SAL_CALL execute( const rtl::OUString& sql ) throw(SQLException, RuntimeException, std::exception) SAL_OVERRIDE; - ::com::sun::star::uno::Reference< ::com::sun::star::sdbc::XConnection > SAL_CALL getConnection() + css::uno::Reference< css::sdbc::XConnection > SAL_CALL getConnection() throw(SQLException, RuntimeException, std::exception) SAL_OVERRIDE; // XWarningsSupplier @@ -147,7 +147,7 @@ namespace connectivity void SAL_CALL close() throw(SQLException, RuntimeException, std::exception) SAL_OVERRIDE; // XMultipleResults - ::com::sun::star::uno::Reference< ::com::sun::star::sdbc::XResultSet > SAL_CALL getResultSet() + css::uno::Reference< css::sdbc::XResultSet > SAL_CALL getResultSet() throw(SQLException, RuntimeException, std::exception) SAL_OVERRIDE; sal_Int32 SAL_CALL getUpdateCount() throw(SQLException, RuntimeException, std::exception) SAL_OVERRIDE; @@ -163,8 +163,8 @@ namespace connectivity class OStatement : public OCommonStatement, - public ::com::sun::star::sdbc::XBatchExecution, - public ::com::sun::star::lang::XServiceInfo + public css::sdbc::XBatchExecution, + public css::lang::XServiceInfo { protected: @@ -186,7 +186,7 @@ namespace connectivity getSupportedServiceNames() throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE; - Any SAL_CALL queryInterface( const ::com::sun::star::uno::Type & rType ) + Any SAL_CALL queryInterface( const css::uno::Type & rType ) throw(RuntimeException, std::exception) SAL_OVERRIDE; void SAL_CALL acquire() throw() SAL_OVERRIDE; @@ -198,7 +198,7 @@ namespace connectivity void SAL_CALL clearBatch() throw(SQLException, RuntimeException, std::exception) SAL_OVERRIDE; - ::com::sun::star::uno::Sequence< sal_Int32 > SAL_CALL executeBatch() + css::uno::Sequence< sal_Int32 > SAL_CALL executeBatch() throw(SQLException, RuntimeException, std::exception) SAL_OVERRIDE; }; diff --git a/mysqlc/source/mysqlc_subcomponent.hxx b/mysqlc/source/mysqlc_subcomponent.hxx index b225e6754aa0..e052bf85490f 100644 --- a/mysqlc/source/mysqlc_subcomponent.hxx +++ b/mysqlc/source/mysqlc_subcomponent.hxx @@ -52,21 +52,21 @@ namespace connectivity { void release(oslInterlockedCount& _refCount, ::cppu::OBroadcastHelper& rBHelper, - ::com::sun::star::uno::Reference< ::com::sun::star::uno::XInterface >& _xInterface, - ::com::sun::star::lang::XComponent* _pObject); + css::uno::Reference< css::uno::XInterface >& _xInterface, + css::lang::XComponent* _pObject); - void checkDisposed(bool _bThrow) throw (::com::sun::star::lang::DisposedException); + void checkDisposed(bool _bThrow) throw (css::lang::DisposedException); template class OSubComponent { protected: // the parent must support the tunnel implementation - ::com::sun::star::uno::Reference< ::com::sun::star::uno::XInterface > m_xParent; + css::uno::Reference< css::uno::XInterface > m_xParent; SELF* m_pDerivedImplementation; public: OSubComponent( - const ::com::sun::star::uno::Reference< ::com::sun::star::uno::XInterface >& _xParent, + const css::uno::Reference< css::uno::XInterface >& _xParent, SELF* _pDerivedImplementation) :m_xParent(_xParent) ,m_pDerivedImplementation(_pDerivedImplementation) @@ -178,14 +178,14 @@ namespace connectivity /// concat two sequences template - ::com::sun::star::uno::Sequence concatSequences(const ::com::sun::star::uno::Sequence& _rLeft, const ::com::sun::star::uno::Sequence& _rRight) + css::uno::Sequence concatSequences(const css::uno::Sequence& _rLeft, const css::uno::Sequence& _rRight) { sal_Int32 nLeft(_rLeft.getLength()), nRight(_rRight.getLength()); const T* pLeft = _rLeft.getConstArray(); const T* pRight = _rRight.getConstArray(); sal_Int32 nReturnLen(nLeft + nRight); - ::com::sun::star::uno::Sequence aReturn(nReturnLen); + css::uno::Sequence aReturn(nReturnLen); T* pReturn = aReturn.getArray(); internal::implCopySequence(pLeft, pReturn, nLeft); -- cgit