From a52231c78526e14977d2129fa1abe812de567f03 Mon Sep 17 00:00:00 2001 From: Noel Grandin Date: Fri, 27 May 2016 12:31:29 +0200 Subject: com::sun::star->css in connectivity Change-Id: I9489e92dc89a6d83a26ff4f0d9aad26acd28ad9f Reviewed-on: https://gerrit.libreoffice.org/25537 Tested-by: Jenkins Reviewed-by: Noel Grandin --- connectivity/source/inc/hsqldb/HCatalog.hxx | 12 ++--- connectivity/source/inc/hsqldb/HColumns.hxx | 4 +- connectivity/source/inc/hsqldb/HConnection.hxx | 40 ++++++++-------- connectivity/source/inc/hsqldb/HDriver.hxx | 66 +++++++++++++------------- connectivity/source/inc/hsqldb/HStorageMap.hxx | 24 +++++----- connectivity/source/inc/hsqldb/HTable.hxx | 20 ++++---- connectivity/source/inc/hsqldb/HTables.hxx | 12 ++--- connectivity/source/inc/hsqldb/HUser.hxx | 20 ++++---- connectivity/source/inc/hsqldb/HUsers.hxx | 10 ++-- connectivity/source/inc/hsqldb/HView.hxx | 16 +++---- connectivity/source/inc/hsqldb/HViews.hxx | 14 +++--- 11 files changed, 119 insertions(+), 119 deletions(-) (limited to 'connectivity/source/inc/hsqldb') diff --git a/connectivity/source/inc/hsqldb/HCatalog.hxx b/connectivity/source/inc/hsqldb/HCatalog.hxx index d22e065ecfe8..897a8878d952 100644 --- a/connectivity/source/inc/hsqldb/HCatalog.hxx +++ b/connectivity/source/inc/hsqldb/HCatalog.hxx @@ -30,7 +30,7 @@ namespace connectivity // some compilers have problems with this task as I noticed on windows class OHCatalog : public connectivity::sdbcx::OCatalog { - ::com::sun::star::uno::Reference< ::com::sun::star::sdbc::XConnection > m_xConnection; + css::uno::Reference< css::sdbc::XConnection > m_xConnection; /** calls XDatabaseMetaData::getTables. @param _sKindOfObject @@ -38,7 +38,7 @@ namespace connectivity @param _rNames The container for the names to be filled. */ - void refreshObjects(const ::com::sun::star::uno::Sequence< OUString >& _sKindOfObject,TStringVector& _rNames); + void refreshObjects(const css::uno::Sequence< OUString >& _sKindOfObject,TStringVector& _rNames); public: // implementation of the pure virtual methods @@ -48,15 +48,15 @@ namespace connectivity virtual void refreshUsers() override ; public: - OHCatalog(const ::com::sun::star::uno::Reference< ::com::sun::star::sdbc::XConnection >& _xConnection); + OHCatalog(const css::uno::Reference< css::sdbc::XConnection >& _xConnection); inline sdbcx::OCollection* getPrivateTables() const { return m_pTables;} inline sdbcx::OCollection* getPrivateViews() const { return m_pViews; } - const ::com::sun::star::uno::Reference< ::com::sun::star::sdbc::XConnection >& getConnection() const { return m_xConnection; } + const css::uno::Reference< css::sdbc::XConnection >& getConnection() const { return m_xConnection; } - virtual ::com::sun::star::uno::Any SAL_CALL queryInterface( const ::com::sun::star::uno::Type & rType ) throw(::com::sun::star::uno::RuntimeException, std::exception) override; + virtual css::uno::Any SAL_CALL queryInterface( const css::uno::Type & rType ) throw(css::uno::RuntimeException, std::exception) override; // ::cppu::OComponentHelper - virtual ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Type > SAL_CALL getTypes( ) throw(::com::sun::star::uno::RuntimeException, std::exception) override; + virtual css::uno::Sequence< css::uno::Type > SAL_CALL getTypes( ) throw(css::uno::RuntimeException, std::exception) override; }; } } diff --git a/connectivity/source/inc/hsqldb/HColumns.hxx b/connectivity/source/inc/hsqldb/HColumns.hxx index 4ccedf95f0e1..72b3c8ec6ce0 100644 --- a/connectivity/source/inc/hsqldb/HColumns.hxx +++ b/connectivity/source/inc/hsqldb/HColumns.hxx @@ -28,7 +28,7 @@ namespace connectivity class OHSQLColumns : public OColumnsHelper { protected: - virtual ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySet > createDescriptor() override; + virtual css::uno::Reference< css::beans::XPropertySet > createDescriptor() override; public: OHSQLColumns( ::cppu::OWeakObject& _rParent ,::osl::Mutex& _rMutex @@ -52,7 +52,7 @@ namespace connectivity OHSQLColumn(); virtual void construct() override; - virtual ::com::sun::star::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames( ) throw(::com::sun::star::uno::RuntimeException, std::exception) override; + virtual css::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames( ) throw(css::uno::RuntimeException, std::exception) override; }; } } diff --git a/connectivity/source/inc/hsqldb/HConnection.hxx b/connectivity/source/inc/hsqldb/HConnection.hxx index 309c033d9dff..26d8a8e6dfc9 100644 --- a/connectivity/source/inc/hsqldb/HConnection.hxx +++ b/connectivity/source/inc/hsqldb/HConnection.hxx @@ -47,8 +47,8 @@ namespace connectivity // OHsqlConnection - wraps all methods to the real connection from the driver // but when disposed it doesn't dispose the real connection - typedef ::cppu::WeakComponentImplHelper< ::com::sun::star::util::XFlushable - , ::com::sun::star::sdb::application::XTableUIProvider + typedef ::cppu::WeakComponentImplHelper< css::util::XFlushable + , css::sdb::application::XTableUIProvider > OHsqlConnection_BASE; class OHsqlConnection :public ::comphelper::OBaseMutex @@ -57,11 +57,11 @@ namespace connectivity ,public IMethodGuardAccess { private: - ::comphelper::OInterfaceContainerHelper2 m_aFlushListeners; - ::com::sun::star::uno::Reference< ::com::sun::star::sdbc::XDriver > m_xDriver; - ::com::sun::star::uno::Reference< ::com::sun::star::uno::XComponentContext > m_xContext; - bool m_bIni; - bool m_bReadOnly; + ::comphelper::OInterfaceContainerHelper2 m_aFlushListeners; + css::uno::Reference< css::sdbc::XDriver > m_xDriver; + css::uno::Reference< css::uno::XComponentContext > m_xContext; + bool m_bIni; + bool m_bReadOnly; protected: virtual void SAL_CALL disposing() override; @@ -69,9 +69,9 @@ namespace connectivity public: OHsqlConnection( - const ::com::sun::star::uno::Reference< ::com::sun::star::sdbc::XDriver >& _rxDriver, - const ::com::sun::star::uno::Reference< ::com::sun::star::sdbc::XConnection >& _xConnection, - const ::com::sun::star::uno::Reference< ::com::sun::star::uno::XComponentContext>& _rxContext + const css::uno::Reference< css::sdbc::XDriver >& _rxDriver, + const css::uno::Reference< css::sdbc::XConnection >& _xConnection, + const css::uno::Reference< css::uno::XComponentContext>& _rxContext ); // XServiceInfo @@ -84,33 +84,33 @@ namespace connectivity virtual void checkDisposed() const override; // XFlushable - virtual void SAL_CALL flush( ) throw (::com::sun::star::uno::RuntimeException, std::exception) override; - virtual void SAL_CALL addFlushListener( const ::com::sun::star::uno::Reference< ::com::sun::star::util::XFlushListener >& l ) throw (::com::sun::star::uno::RuntimeException, std::exception) override; - virtual void SAL_CALL removeFlushListener( const ::com::sun::star::uno::Reference< ::com::sun::star::util::XFlushListener >& l ) throw (::com::sun::star::uno::RuntimeException, std::exception) override; + virtual void SAL_CALL flush( ) throw (css::uno::RuntimeException, std::exception) override; + virtual void SAL_CALL addFlushListener( const css::uno::Reference< css::util::XFlushListener >& l ) throw (css::uno::RuntimeException, std::exception) override; + virtual void SAL_CALL removeFlushListener( const css::uno::Reference< css::util::XFlushListener >& l ) throw (css::uno::RuntimeException, std::exception) override; // XTableUIProvider - virtual ::com::sun::star::uno::Reference< ::com::sun::star::graphic::XGraphic > SAL_CALL getTableIcon( const OUString& TableName, ::sal_Int32 ColorMode ) throw (::com::sun::star::uno::RuntimeException, std::exception) override; - virtual ::com::sun::star::uno::Reference< ::com::sun::star::uno::XInterface > SAL_CALL getTableEditor( const ::com::sun::star::uno::Reference< ::com::sun::star::sdb::application::XDatabaseDocumentUI >& DocumentUI, const OUString& TableName ) throw (::com::sun::star::lang::IllegalArgumentException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException, std::exception) override; + virtual css::uno::Reference< css::graphic::XGraphic > SAL_CALL getTableIcon( const OUString& TableName, ::sal_Int32 ColorMode ) throw (css::uno::RuntimeException, std::exception) override; + virtual css::uno::Reference< css::uno::XInterface > SAL_CALL getTableEditor( const css::uno::Reference< css::sdb::application::XDatabaseDocumentUI >& DocumentUI, const OUString& TableName ) throw (css::lang::IllegalArgumentException, css::lang::WrappedTargetException, css::uno::RuntimeException, std::exception) override; private: /** retrieves our table container @return our table container. Guaranteed to not be . - @throws ::com::sun::star::lang::WrappedTargetException + @throws css::lang::WrappedTargetException if a non-RuntimeException is caught during obtaining the container. - @throws ::com::sun::star::uno::RuntimeException + @throws css::uno::RuntimeException if a serious error occurs @precond We're not disposed. */ - ::com::sun::star::uno::Reference< ::com::sun::star::container::XNameAccess > + css::uno::Reference< css::container::XNameAccess > impl_getTableContainer_throw(); /** checks whether the given table name denotes an existing table @param _rTableName the fully name of the table to check for existence - @throws ::com::sun::star::lang::IllegalArgumentException + @throws css::lang::IllegalArgumentException if the name does not denote an existing table @precond We're not disposed. @@ -123,7 +123,7 @@ namespace connectivity /** retrieves the icon for HSQL TEXT TABLEs */ - ::com::sun::star::uno::Reference< ::com::sun::star::graphic::XGraphic > + css::uno::Reference< css::graphic::XGraphic > impl_getTextTableIcon_nothrow(); }; diff --git a/connectivity/source/inc/hsqldb/HDriver.hxx b/connectivity/source/inc/hsqldb/HDriver.hxx index 26bf02062a23..90a467033e16 100644 --- a/connectivity/source/inc/hsqldb/HDriver.hxx +++ b/connectivity/source/inc/hsqldb/HDriver.hxx @@ -38,19 +38,19 @@ namespace connectivity namespace hsqldb { - ::com::sun::star::uno::Reference< ::com::sun::star::uno::XInterface > SAL_CALL ODriverDelegator_CreateInstance(const ::com::sun::star::uno::Reference< ::com::sun::star::lang::XMultiServiceFactory >& _rxFactory) throw( ::com::sun::star::uno::Exception ); + css::uno::Reference< css::uno::XInterface > SAL_CALL ODriverDelegator_CreateInstance(const css::uno::Reference< css::lang::XMultiServiceFactory >& _rxFactory) throw( css::uno::Exception ); - typedef ::cppu::WeakComponentImplHelper< ::com::sun::star::sdbc::XDriver - ,::com::sun::star::sdbcx::XDataDefinitionSupplier - , ::com::sun::star::lang::XServiceInfo - , ::com::sun::star::sdbcx::XCreateCatalog - , ::com::sun::star::embed::XTransactionListener - > ODriverDelegator_BASE; + typedef ::cppu::WeakComponentImplHelper< css::sdbc::XDriver + , css::sdbcx::XDataDefinitionSupplier + , css::lang::XServiceInfo + , css::sdbcx::XCreateCatalog + , css::embed::XTransactionListener + > ODriverDelegator_BASE; - typedef ::std::pair< ::com::sun::star::uno::WeakReferenceHelper,::com::sun::star::uno::WeakReferenceHelper> TWeakRefPair; + typedef ::std::pair< css::uno::WeakReferenceHelper,css::uno::WeakReferenceHelper> TWeakRefPair; typedef ::std::pair< OUString ,TWeakRefPair > TWeakConnectionPair; - typedef ::std::pair< ::com::sun::star::uno::WeakReferenceHelper,TWeakConnectionPair> TWeakPair; + typedef ::std::pair< css::uno::WeakReferenceHelper,TWeakConnectionPair> TWeakPair; typedef ::std::vector< TWeakPair > TWeakPairVector; @@ -60,19 +60,19 @@ namespace connectivity class ODriverDelegator : public ::comphelper::OBaseMutex ,public ODriverDelegator_BASE { - TWeakPairVector m_aConnections; // vector containing a list - // of all the Connection objects - // for this Driver - ::com::sun::star::uno::Reference< ::com::sun::star::sdbc::XDriver > m_xDriver; - ::com::sun::star::uno::Reference< ::com::sun::star::uno::XComponentContext > m_xContext; - bool m_bInShutDownConnections; + TWeakPairVector m_aConnections; // vector containing a list + // of all the Connection objects + // for this Driver + css::uno::Reference< css::sdbc::XDriver > m_xDriver; + css::uno::Reference< css::uno::XComponentContext > m_xContext; + bool m_bInShutDownConnections; /** load the driver we want to delegate. The m_xDriver may be if the driver could not be loaded. @return The driver which was currently selected. */ - ::com::sun::star::uno::Reference< ::com::sun::star::sdbc::XDriver > loadDriver( ); + css::uno::Reference< css::sdbc::XDriver > loadDriver( ); /** shut down the connection and revoke the storage from the map @param _aIter @@ -83,35 +83,35 @@ namespace connectivity public: /** creates a new delegator for a HSQLDB driver */ - ODriverDelegator(const ::com::sun::star::uno::Reference< ::com::sun::star::uno::XComponentContext >& _rxContext); + ODriverDelegator(const css::uno::Reference< css::uno::XComponentContext >& _rxContext); // XServiceInfo DECLARE_SERVICE_INFO(); - 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); + static OUString getImplementationName_Static( ) throw(css::uno::RuntimeException); + static css::uno::Sequence< OUString > getSupportedServiceNames_Static( ) throw (css::uno::RuntimeException); // XDriver - 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, std::exception) override; - virtual sal_Bool SAL_CALL acceptsURL( const OUString& url ) throw (::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException, std::exception) override; - 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, std::exception) override; - virtual sal_Int32 SAL_CALL getMajorVersion( ) throw (::com::sun::star::uno::RuntimeException, std::exception) override; - virtual sal_Int32 SAL_CALL getMinorVersion( ) throw (::com::sun::star::uno::RuntimeException, std::exception) override; + virtual css::uno::Reference< css::sdbc::XConnection > SAL_CALL connect( const OUString& url, const css::uno::Sequence< css::beans::PropertyValue >& info ) throw (css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override; + virtual sal_Bool SAL_CALL acceptsURL( const OUString& url ) throw (css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override; + virtual css::uno::Sequence< css::sdbc::DriverPropertyInfo > SAL_CALL getPropertyInfo( const OUString& url, const css::uno::Sequence< css::beans::PropertyValue >& info ) throw (css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override; + virtual sal_Int32 SAL_CALL getMajorVersion( ) throw (css::uno::RuntimeException, std::exception) override; + virtual sal_Int32 SAL_CALL getMinorVersion( ) throw (css::uno::RuntimeException, std::exception) override; // XDataDefinitionSupplier - virtual ::com::sun::star::uno::Reference< ::com::sun::star::sdbcx::XTablesSupplier > SAL_CALL getDataDefinitionByConnection( const ::com::sun::star::uno::Reference< ::com::sun::star::sdbc::XConnection >& connection ) throw (::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException, std::exception) override; - virtual ::com::sun::star::uno::Reference< ::com::sun::star::sdbcx::XTablesSupplier > SAL_CALL getDataDefinitionByURL( 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, std::exception) override; + virtual css::uno::Reference< css::sdbcx::XTablesSupplier > SAL_CALL getDataDefinitionByConnection( const css::uno::Reference< css::sdbc::XConnection >& connection ) throw (css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override; + virtual css::uno::Reference< css::sdbcx::XTablesSupplier > SAL_CALL getDataDefinitionByURL( const OUString& url, const css::uno::Sequence< css::beans::PropertyValue >& info ) throw (css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override; // XCreateCatalog - virtual void SAL_CALL createCatalog( const ::com::sun::star::uno::Sequence< ::com::sun::star::beans::PropertyValue >& info ) throw (::com::sun::star::sdbc::SQLException, ::com::sun::star::container::ElementExistException, ::com::sun::star::uno::RuntimeException, std::exception) override; + virtual void SAL_CALL createCatalog( const css::uno::Sequence< css::beans::PropertyValue >& info ) throw (css::sdbc::SQLException, css::container::ElementExistException, css::uno::RuntimeException, std::exception) override; // XEventListener - virtual void SAL_CALL disposing( const ::com::sun::star::lang::EventObject& Source ) throw(::com::sun::star::uno::RuntimeException, std::exception) override; + virtual void SAL_CALL disposing( const css::lang::EventObject& Source ) throw(css::uno::RuntimeException, std::exception) override; // XTransactionListener - virtual void SAL_CALL preCommit( const ::com::sun::star::lang::EventObject& aEvent ) throw (::com::sun::star::uno::Exception, ::com::sun::star::uno::RuntimeException, std::exception) override; - virtual void SAL_CALL commited( const ::com::sun::star::lang::EventObject& aEvent ) throw (::com::sun::star::uno::RuntimeException, std::exception) override; - virtual void SAL_CALL preRevert( const ::com::sun::star::lang::EventObject& aEvent ) throw (::com::sun::star::uno::Exception, ::com::sun::star::uno::RuntimeException, std::exception) override; - virtual void SAL_CALL reverted( const ::com::sun::star::lang::EventObject& aEvent ) throw (::com::sun::star::uno::RuntimeException, std::exception) override; + virtual void SAL_CALL preCommit( const css::lang::EventObject& aEvent ) throw (css::uno::Exception, css::uno::RuntimeException, std::exception) override; + virtual void SAL_CALL commited( const css::lang::EventObject& aEvent ) throw (css::uno::RuntimeException, std::exception) override; + virtual void SAL_CALL preRevert( const css::lang::EventObject& aEvent ) throw (css::uno::Exception, css::uno::RuntimeException, std::exception) override; + virtual void SAL_CALL reverted( const css::lang::EventObject& aEvent ) throw (css::uno::RuntimeException, std::exception) override; void shutdownConnections(); void flushConnections(); @@ -124,7 +124,7 @@ namespace connectivity /** called when we connected to a newly created embedded database */ void onConnectedNewDatabase( - const ::com::sun::star::uno::Reference< ::com::sun::star::sdbc::XConnection >& _rxConnection + const css::uno::Reference< css::sdbc::XConnection >& _rxConnection ); }; } diff --git a/connectivity/source/inc/hsqldb/HStorageMap.hxx b/connectivity/source/inc/hsqldb/HStorageMap.hxx index d3bba8eda7b3..f0bbe98e24d2 100644 --- a/connectivity/source/inc/hsqldb/HStorageMap.hxx +++ b/connectivity/source/inc/hsqldb/HStorageMap.hxx @@ -40,17 +40,17 @@ namespace connectivity { class StreamHelper { - ::com::sun::star::uno::Reference< ::com::sun::star::io::XStream> m_xStream; - ::com::sun::star::uno::Reference< ::com::sun::star::io::XSeekable> m_xSeek; - ::com::sun::star::uno::Reference< ::com::sun::star::io::XOutputStream> m_xOutputStream; - ::com::sun::star::uno::Reference< ::com::sun::star::io::XInputStream> m_xInputStream; + css::uno::Reference< css::io::XStream> m_xStream; + css::uno::Reference< css::io::XSeekable> m_xSeek; + css::uno::Reference< css::io::XOutputStream> m_xOutputStream; + css::uno::Reference< css::io::XInputStream> m_xInputStream; public: - StreamHelper(const ::com::sun::star::uno::Reference< ::com::sun::star::io::XStream>& _xStream); + StreamHelper(const css::uno::Reference< css::io::XStream>& _xStream); ~StreamHelper(); - ::com::sun::star::uno::Reference< ::com::sun::star::io::XInputStream> getInputStream(); - ::com::sun::star::uno::Reference< ::com::sun::star::io::XOutputStream> getOutputStream(); - ::com::sun::star::uno::Reference< ::com::sun::star::io::XSeekable> getSeek(); + css::uno::Reference< css::io::XInputStream> getInputStream(); + css::uno::Reference< css::io::XOutputStream> getOutputStream(); + css::uno::Reference< css::io::XSeekable> getSeek(); }; @@ -71,10 +71,10 @@ namespace connectivity class StorageContainer { public: - static OUString registerStorage(const ::com::sun::star::uno::Reference< ::com::sun::star::embed::XStorage>& _xStorage,const OUString& _sURL); + static OUString registerStorage(const css::uno::Reference< css::embed::XStorage>& _xStorage,const OUString& _sURL); static TStorages::mapped_type getRegisteredStorage(const OUString& _sKey); - static OUString getRegisteredKey(const ::com::sun::star::uno::Reference< ::com::sun::star::embed::XStorage>& _xStorage); - static void revokeStorage(const OUString& _sKey,const ::com::sun::star::uno::Reference< ::com::sun::star::embed::XTransactionListener>& _xListener); + static OUString getRegisteredKey(const css::uno::Reference< css::embed::XStorage>& _xStorage); + static void revokeStorage(const OUString& _sKey,const css::uno::Reference< css::embed::XTransactionListener>& _xListener); static TStreamMap::mapped_type registerStream(JNIEnv * env,jstring name, jstring key,sal_Int32 _nMode); static void revokeStream(JNIEnv * env,jstring name, jstring key); @@ -83,7 +83,7 @@ namespace connectivity static OUString jstring2ustring(JNIEnv * env, jstring jstr); static OUString removeURLPrefix(const OUString& _sURL,const OUString& _sFileURL); static OUString removeOldURLPrefix(const OUString& _sURL); - static void throwJavaException(const ::com::sun::star::uno::Exception& _aException,JNIEnv * env); + static void throwJavaException(const css::uno::Exception& _aException,JNIEnv * env); }; } // namespace hsqldb diff --git a/connectivity/source/inc/hsqldb/HTable.hxx b/connectivity/source/inc/hsqldb/HTable.hxx index fdd11ff9562c..4673e410ba4a 100644 --- a/connectivity/source/inc/hsqldb/HTable.hxx +++ b/connectivity/source/inc/hsqldb/HTable.hxx @@ -75,9 +75,9 @@ namespace connectivity public: OHSQLTable( sdbcx::OCollection* _pTables, - const ::com::sun::star::uno::Reference< ::com::sun::star::sdbc::XConnection >& _xConnection); + const css::uno::Reference< css::sdbc::XConnection >& _xConnection); OHSQLTable( sdbcx::OCollection* _pTables, - const ::com::sun::star::uno::Reference< ::com::sun::star::sdbc::XConnection >& _xConnection, + const css::uno::Reference< css::sdbc::XConnection >& _xConnection, const OUString& Name, const OUString& Type, const OUString& Description = OUString(), @@ -88,18 +88,18 @@ namespace connectivity // ODescriptor virtual void construct() override; - // com::sun::star::lang::XUnoTunnel - virtual sal_Int64 SAL_CALL getSomething( const ::com::sun::star::uno::Sequence< sal_Int8 >& aIdentifier ) throw(::com::sun::star::uno::RuntimeException, std::exception) override; - static ::com::sun::star::uno::Sequence< sal_Int8 > getUnoTunnelImplementationId(); + // css::lang::XUnoTunnel + virtual sal_Int64 SAL_CALL getSomething( const css::uno::Sequence< sal_Int8 >& aIdentifier ) throw(css::uno::RuntimeException, std::exception) override; + static css::uno::Sequence< sal_Int8 > getUnoTunnelImplementationId(); - virtual ::com::sun::star::uno::Any SAL_CALL queryInterface( const ::com::sun::star::uno::Type & rType ) throw(::com::sun::star::uno::RuntimeException, std::exception) override; + virtual css::uno::Any SAL_CALL queryInterface( const css::uno::Type & rType ) throw(css::uno::RuntimeException, std::exception) override; //XTypeProvider - virtual ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Type > SAL_CALL getTypes( ) throw(::com::sun::star::uno::RuntimeException, std::exception) override; + virtual css::uno::Sequence< css::uno::Type > SAL_CALL getTypes( ) throw(css::uno::RuntimeException, std::exception) override; // XAlterTable - virtual void SAL_CALL alterColumnByName( const OUString& colName, const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySet >& descriptor ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::container::NoSuchElementException, ::com::sun::star::uno::RuntimeException, std::exception) override; + virtual void SAL_CALL alterColumnByName( const OUString& colName, const css::uno::Reference< css::beans::XPropertySet >& descriptor ) throw(css::sdbc::SQLException, css::container::NoSuchElementException, css::uno::RuntimeException, std::exception) override; // XRename - virtual void SAL_CALL rename( const OUString& newName ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::container::ElementExistException, ::com::sun::star::uno::RuntimeException, std::exception) override; + virtual void SAL_CALL rename( const OUString& newName ) throw(css::sdbc::SQLException, css::container::ElementExistException, css::uno::RuntimeException, std::exception) override; /** returns the ALTER TABLE XXX COLUMN statement @@ -107,7 +107,7 @@ namespace connectivity OUString getAlterTableColumnPart(); // some methods to alter table structures - void alterColumnType(sal_Int32 nNewType,const OUString& _rColName,const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySet >& _xDescriptor); + void alterColumnType(sal_Int32 nNewType,const OUString& _rColName,const css::uno::Reference< css::beans::XPropertySet >& _xDescriptor); void alterDefaultValue(const OUString& _sNewDefault,const OUString& _rColName); void dropDefaultValue(const OUString& _sNewDefault); diff --git a/connectivity/source/inc/hsqldb/HTables.hxx b/connectivity/source/inc/hsqldb/HTables.hxx index 3a510217a199..ff8837359c19 100644 --- a/connectivity/source/inc/hsqldb/HTables.hxx +++ b/connectivity/source/inc/hsqldb/HTables.hxx @@ -27,19 +27,19 @@ namespace connectivity { class OTables : public sdbcx::OCollection { - ::com::sun::star::uno::Reference< ::com::sun::star::sdbc::XDatabaseMetaData > m_xMetaData; + css::uno::Reference< css::sdbc::XDatabaseMetaData > m_xMetaData; protected: virtual sdbcx::ObjectType createObject(const OUString& _rName) override; - virtual void impl_refresh() throw(::com::sun::star::uno::RuntimeException) override; - virtual ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySet > createDescriptor() override; - virtual sdbcx::ObjectType appendObject( const OUString& _rForName, const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySet >& descriptor ) override; + virtual void impl_refresh() throw(css::uno::RuntimeException) override; + virtual css::uno::Reference< css::beans::XPropertySet > createDescriptor() override; + virtual sdbcx::ObjectType appendObject( const OUString& _rForName, const css::uno::Reference< css::beans::XPropertySet >& descriptor ) override; virtual void dropObject(sal_Int32 _nPos, const OUString& _sElementName) override; - void createTable( const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySet >& descriptor ); + void createTable( const css::uno::Reference< css::beans::XPropertySet >& descriptor ); virtual OUString getNameForObject(const sdbcx::ObjectType& _xObject) override; public: - OTables(const ::com::sun::star::uno::Reference< ::com::sun::star::sdbc::XDatabaseMetaData >& _rMetaData,::cppu::OWeakObject& _rParent, ::osl::Mutex& _rMutex, + OTables(const css::uno::Reference< css::sdbc::XDatabaseMetaData >& _rMetaData,::cppu::OWeakObject& _rParent, ::osl::Mutex& _rMutex, const TStringVector &_rVector) : sdbcx::OCollection(_rParent, true, _rMutex, _rVector) ,m_xMetaData(_rMetaData) {} diff --git a/connectivity/source/inc/hsqldb/HUser.hxx b/connectivity/source/inc/hsqldb/HUser.hxx index 3f56b6b55b9c..051112e78e71 100644 --- a/connectivity/source/inc/hsqldb/HUser.hxx +++ b/connectivity/source/inc/hsqldb/HUser.hxx @@ -31,24 +31,24 @@ namespace connectivity class OHSQLUser : public OUser_TYPEDEF { - ::com::sun::star::uno::Reference< ::com::sun::star::sdbc::XConnection > m_xConnection; + css::uno::Reference< css::sdbc::XConnection > m_xConnection; static OUString getPrivilegeString(sal_Int32 nRights); // return the privileges and additional the grant rights - void findPrivilegesAndGrantPrivileges(const OUString& objName, sal_Int32 objType,sal_Int32& nRights,sal_Int32& nRightsWithGrant) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException); + void findPrivilegesAndGrantPrivileges(const OUString& objName, sal_Int32 objType,sal_Int32& nRights,sal_Int32& nRightsWithGrant) throw(css::sdbc::SQLException, css::uno::RuntimeException); public: virtual void refreshGroups() override; public: - OHSQLUser( const ::com::sun::star::uno::Reference< ::com::sun::star::sdbc::XConnection >& _xConnection); - OHSQLUser( const ::com::sun::star::uno::Reference< ::com::sun::star::sdbc::XConnection >& _xConnection,const OUString& Name); + OHSQLUser( const css::uno::Reference< css::sdbc::XConnection >& _xConnection); + OHSQLUser( const css::uno::Reference< css::sdbc::XConnection >& _xConnection,const OUString& Name); // XUser - virtual void SAL_CALL changePassword( const OUString& objPassword, const OUString& newPassword ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException, std::exception) override; + virtual void SAL_CALL changePassword( const OUString& objPassword, const OUString& newPassword ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override; // XAuthorizable - virtual sal_Int32 SAL_CALL getPrivileges( const OUString& objName, sal_Int32 objType ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException, std::exception) override; - virtual sal_Int32 SAL_CALL getGrantablePrivileges( const OUString& objName, sal_Int32 objType ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException, std::exception) override; - virtual void SAL_CALL grantPrivileges( const OUString& objName, sal_Int32 objType, sal_Int32 objPrivileges ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException, std::exception) override; - virtual void SAL_CALL revokePrivileges( const OUString& objName, sal_Int32 objType, sal_Int32 objPrivileges ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException, std::exception) override; + virtual sal_Int32 SAL_CALL getPrivileges( const OUString& objName, sal_Int32 objType ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override; + virtual sal_Int32 SAL_CALL getGrantablePrivileges( const OUString& objName, sal_Int32 objType ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override; + virtual void SAL_CALL grantPrivileges( const OUString& objName, sal_Int32 objType, sal_Int32 objPrivileges ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override; + virtual void SAL_CALL revokePrivileges( const OUString& objName, sal_Int32 objType, sal_Int32 objPrivileges ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override; }; class OUserExtend; @@ -64,7 +64,7 @@ namespace connectivity // OPropertySetHelper virtual ::cppu::IPropertyArrayHelper & SAL_CALL getInfoHelper() override; public: - OUserExtend(const ::com::sun::star::uno::Reference< ::com::sun::star::sdbc::XConnection >& _xConnection); + OUserExtend(const css::uno::Reference< css::sdbc::XConnection >& _xConnection); virtual void construct() override; }; diff --git a/connectivity/source/inc/hsqldb/HUsers.hxx b/connectivity/source/inc/hsqldb/HUsers.hxx index c1f11ff7bcc6..1fa314c127af 100644 --- a/connectivity/source/inc/hsqldb/HUsers.hxx +++ b/connectivity/source/inc/hsqldb/HUsers.hxx @@ -32,19 +32,19 @@ namespace connectivity { class OUsers : public sdbcx::OCollection { - ::com::sun::star::uno::Reference< ::com::sun::star::sdbc::XConnection > m_xConnection; + css::uno::Reference< css::sdbc::XConnection > m_xConnection; connectivity::sdbcx::IRefreshableUsers* m_pParent; public: virtual sdbcx::ObjectType createObject(const OUString& _rName) override; - virtual ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySet > createDescriptor() override; - virtual void impl_refresh() throw(::com::sun::star::uno::RuntimeException) override; - virtual sdbcx::ObjectType appendObject( const OUString& _rForName, const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySet >& descriptor ) override; + virtual css::uno::Reference< css::beans::XPropertySet > createDescriptor() override; + virtual void impl_refresh() throw(css::uno::RuntimeException) override; + virtual sdbcx::ObjectType appendObject( const OUString& _rForName, const css::uno::Reference< css::beans::XPropertySet >& descriptor ) override; virtual void dropObject(sal_Int32 _nPos, const OUString& _sElementName) override; public: OUsers( ::cppu::OWeakObject& _rParent, ::osl::Mutex& _rMutex, const TStringVector &_rVector, - const ::com::sun::star::uno::Reference< ::com::sun::star::sdbc::XConnection >& _xConnection, + const css::uno::Reference< css::sdbc::XConnection >& _xConnection, connectivity::sdbcx::IRefreshableUsers* _pParent); }; } diff --git a/connectivity/source/inc/hsqldb/HView.hxx b/connectivity/source/inc/hsqldb/HView.hxx index 23355a6a0661..09fc95e4dbde 100644 --- a/connectivity/source/inc/hsqldb/HView.hxx +++ b/connectivity/source/inc/hsqldb/HView.hxx @@ -31,14 +31,14 @@ namespace connectivity { namespace hsqldb { - typedef ::connectivity::sdbcx::OView HView_Base; - typedef ::cppu::ImplHelper1< ::com::sun::star::sdbcx::XAlterView > HView_IBASE; + typedef ::connectivity::sdbcx::OView HView_Base; + typedef ::cppu::ImplHelper1< css::sdbcx::XAlterView > HView_IBASE; class HView :public HView_Base ,public HView_IBASE { public: HView( - const ::com::sun::star::uno::Reference< ::com::sun::star::sdbc::XConnection >& _rxConnection, + const css::uno::Reference< css::sdbc::XConnection >& _rxConnection, bool _bCaseSensitive, const OUString& _rSchemaName, const OUString& _rName @@ -49,14 +49,14 @@ namespace connectivity { namespace hsqldb DECLARE_XTYPEPROVIDER() // XAlterView - virtual void SAL_CALL alterCommand( const OUString& NewCommand ) throw (::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException, std::exception) override; + virtual void SAL_CALL alterCommand( const OUString& NewCommand ) throw (css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override; protected: virtual ~HView(); protected: // OPropertyContainer - virtual void SAL_CALL getFastPropertyValue( ::com::sun::star::uno::Any& _rValue, sal_Int32 _nHandle ) const override; + virtual void SAL_CALL getFastPropertyValue( css::uno::Any& _rValue, sal_Int32 _nHandle ) const override; private: /** retrieves the current command of the View */ @@ -64,19 +64,19 @@ namespace connectivity { namespace hsqldb /** retrieves the current command of the View - @throws ::com::sun::star::lang::WrappedTargetException + @throws css::lang::WrappedTargetException if an error occurs while retrieving the command from the database. */ OUString impl_getCommand_wrapSQLException() const; /** retrieves the current command of the View - @throws ::com::sun::star::sdbc::SQLException + @throws css::sdbc::SQLException if an error occurs while retrieving the command from the database. */ OUString impl_getCommand_throwSQLException() const; private: - ::com::sun::star::uno::Reference< ::com::sun::star::sdbc::XConnection > m_xConnection; + css::uno::Reference< css::sdbc::XConnection > m_xConnection; private: using HView_Base::getFastPropertyValue; }; diff --git a/connectivity/source/inc/hsqldb/HViews.hxx b/connectivity/source/inc/hsqldb/HViews.hxx index ea4dd2f3df95..1a2bde239df3 100644 --- a/connectivity/source/inc/hsqldb/HViews.hxx +++ b/connectivity/source/inc/hsqldb/HViews.hxx @@ -27,21 +27,21 @@ namespace connectivity { class HViews : public sdbcx::OCollection { - ::com::sun::star::uno::Reference< ::com::sun::star::sdbc::XConnection > m_xConnection; - ::com::sun::star::uno::Reference< ::com::sun::star::sdbc::XDatabaseMetaData > m_xMetaData; + css::uno::Reference< css::sdbc::XConnection > m_xConnection; + css::uno::Reference< css::sdbc::XDatabaseMetaData > m_xMetaData; bool m_bInDrop; protected: virtual sdbcx::ObjectType createObject(const OUString& _rName) override; - virtual void impl_refresh() throw(::com::sun::star::uno::RuntimeException) override; - virtual ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySet > createDescriptor() override; - virtual sdbcx::ObjectType appendObject( const OUString& _rForName, const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySet >& descriptor ) override; + virtual void impl_refresh() throw(css::uno::RuntimeException) override; + virtual css::uno::Reference< css::beans::XPropertySet > createDescriptor() override; + virtual sdbcx::ObjectType appendObject( const OUString& _rForName, const css::uno::Reference< css::beans::XPropertySet >& descriptor ) override; virtual void dropObject(sal_Int32 _nPos, const OUString& _sElementName) override; - void createView( const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySet >& descriptor ); + void createView( const css::uno::Reference< css::beans::XPropertySet >& descriptor ); public: HViews( - const ::com::sun::star::uno::Reference< ::com::sun::star::sdbc::XConnection >& _rxConnection, + const css::uno::Reference< css::sdbc::XConnection >& _rxConnection, ::cppu::OWeakObject& _rParent, ::osl::Mutex& _rMutex, const TStringVector &_rVector ); // only the name is identical to ::cppu::OComponentHelper -- cgit