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/cpool/ZConnectionPool.cxx | 6 +- connectivity/source/cpool/ZConnectionPool.hxx | 32 ++++----- connectivity/source/cpool/ZConnectionWrapper.cxx | 22 +++--- connectivity/source/cpool/ZConnectionWrapper.hxx | 49 +++++++------- connectivity/source/cpool/ZDriverWrapper.hxx | 21 +++--- connectivity/source/cpool/ZPoolCollection.cxx | 8 +-- connectivity/source/cpool/ZPoolCollection.hxx | 86 ++++++++++++------------ connectivity/source/cpool/ZPooledConnection.cxx | 2 +- connectivity/source/cpool/ZPooledConnection.hxx | 18 ++--- 9 files changed, 122 insertions(+), 122 deletions(-) (limited to 'connectivity/source/cpool') diff --git a/connectivity/source/cpool/ZConnectionPool.cxx b/connectivity/source/cpool/ZConnectionPool.cxx index edbd2446b24f..68fde8a548dc 100644 --- a/connectivity/source/cpool/ZConnectionPool.cxx +++ b/connectivity/source/cpool/ZConnectionPool.cxx @@ -49,7 +49,7 @@ static const char TIMEOUT_NODENAME[] = "Timeout"; OConnectionPool::OConnectionPool(const Reference< XDriver >& _xDriver, const Reference< XInterface >& _xDriverNode, - const Reference< ::com::sun::star::reflection::XProxyFactory >& _rxProxyFactory) + const Reference< css::reflection::XProxyFactory >& _rxProxyFactory) :m_xDriver(_xDriver) ,m_xDriverNode(_xDriverNode) ,m_xProxyFactory(_rxProxyFactory) @@ -173,7 +173,7 @@ Reference< XConnection > SAL_CALL OConnectionPool::getConnectionWithInfo( const return xConnection; } -void SAL_CALL OConnectionPool::disposing( const ::com::sun::star::lang::EventObject& Source ) throw (RuntimeException, std::exception) +void SAL_CALL OConnectionPool::disposing( const css::lang::EventObject& Source ) throw (RuntimeException, std::exception) { Reference xConnection(Source.Source,UNO_QUERY); if(xConnection.is()) @@ -285,7 +285,7 @@ Reference< XConnection> OConnectionPool::getPooledConnection(TConnectionMap::ite return xConnection; } -void SAL_CALL OConnectionPool::propertyChange( const PropertyChangeEvent& evt ) throw (::com::sun::star::uno::RuntimeException, std::exception) +void SAL_CALL OConnectionPool::propertyChange( const PropertyChangeEvent& evt ) throw (css::uno::RuntimeException, std::exception) { if(TIMEOUT_NODENAME == evt.PropertyName) { diff --git a/connectivity/source/cpool/ZConnectionPool.hxx b/connectivity/source/cpool/ZConnectionPool.hxx index 06a400d8c314..7cb93c28c994 100644 --- a/connectivity/source/cpool/ZConnectionPool.hxx +++ b/connectivity/source/cpool/ZConnectionPool.hxx @@ -59,10 +59,10 @@ namespace connectivity // OConnectionPool - the one-instance service for PooledConnections // manages the active connections and the connections in the pool - typedef ::cppu::WeakImplHelper< ::com::sun::star::beans::XPropertyChangeListener> OConnectionPool_Base; + typedef ::cppu::WeakImplHelper< css::beans::XPropertyChangeListener> OConnectionPool_Base; // typedef for the internal structure - typedef ::std::vector< ::com::sun::star::uno::Reference< ::com::sun::star::sdbc::XPooledConnection> > TPooledConnections; + typedef ::std::vector< css::uno::Reference< css::sdbc::XPooledConnection> > TPooledConnections; // contains the currently pooled connections typedef struct @@ -100,10 +100,10 @@ namespace connectivity typedef struct { TConnectionMap::iterator aPos; - ::com::sun::star::uno::Reference< ::com::sun::star::sdbc::XPooledConnection> xPooledConnection; + css::uno::Reference< css::sdbc::XPooledConnection> xPooledConnection; } TActiveConnectionInfo; - typedef ::std::map< ::com::sun::star::uno::Reference< ::com::sun::star::sdbc::XConnection>, + typedef ::std::map< css::uno::Reference< css::sdbc::XConnection>, TActiveConnectionInfo> TActiveConnectionMap; class OConnectionPool : public OConnectionPool_Base @@ -114,16 +114,16 @@ namespace connectivity ::osl::Mutex m_aMutex; ::rtl::Reference m_xInvalidator; // invalidates the conntection pool when shot - ::com::sun::star::uno::Reference< ::com::sun::star::sdbc::XDriver > m_xDriver; // the one and only driver for this connectionpool - ::com::sun::star::uno::Reference< ::com::sun::star::uno::XInterface > m_xDriverNode; // config node entry - ::com::sun::star::uno::Reference< ::com::sun::star::reflection::XProxyFactory > m_xProxyFactory; + css::uno::Reference< css::sdbc::XDriver > m_xDriver; // the one and only driver for this connectionpool + css::uno::Reference< css::uno::XInterface > m_xDriverNode; // config node entry + css::uno::Reference< css::reflection::XProxyFactory > m_xProxyFactory; sal_Int32 m_nTimeOut; sal_Int32 m_nALiveCount; private: - ::com::sun::star::uno::Reference< ::com::sun::star::sdbc::XConnection> createNewConnection(const OUString& _rURL, - const ::com::sun::star::uno::Sequence< ::com::sun::star::beans::PropertyValue >& _rInfo); - ::com::sun::star::uno::Reference< ::com::sun::star::sdbc::XConnection> getPooledConnection(TConnectionMap::iterator& _rIter); + css::uno::Reference< css::sdbc::XConnection> createNewConnection(const OUString& _rURL, + const css::uno::Sequence< css::beans::PropertyValue >& _rInfo); + css::uno::Reference< css::sdbc::XConnection> getPooledConnection(TConnectionMap::iterator& _rIter); // calculate the timeout and the corresponding ALiveCount void calculateTimeOuts(); @@ -131,17 +131,17 @@ namespace connectivity // the dtor will be called from the last instance (last release call) virtual ~OConnectionPool(); public: - OConnectionPool(const ::com::sun::star::uno::Reference< ::com::sun::star::sdbc::XDriver >& _xDriver, - const ::com::sun::star::uno::Reference< ::com::sun::star::uno::XInterface >& _xDriverNode, - const ::com::sun::star::uno::Reference< ::com::sun::star::reflection::XProxyFactory >& _rxProxyFactory); + OConnectionPool(const css::uno::Reference< css::sdbc::XDriver >& _xDriver, + const css::uno::Reference< css::uno::XInterface >& _xDriverNode, + const css::uno::Reference< css::reflection::XProxyFactory >& _rxProxyFactory); // delete all refs void clear(bool _bDispose); - ::com::sun::star::uno::Reference< ::com::sun::star::sdbc::XConnection > SAL_CALL getConnectionWithInfo( 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); + css::uno::Reference< css::sdbc::XConnection > SAL_CALL getConnectionWithInfo( const OUString& url, const css::uno::Sequence< css::beans::PropertyValue >& info ) throw(css::sdbc::SQLException, css::uno::RuntimeException); // 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; // XPropertyChangeListener - virtual void SAL_CALL propertyChange( const ::com::sun::star::beans::PropertyChangeEvent& evt ) throw (::com::sun::star::uno::RuntimeException, std::exception) override; + virtual void SAL_CALL propertyChange( const css::beans::PropertyChangeEvent& evt ) throw (css::uno::RuntimeException, std::exception) override; void invalidatePooledConnections(); }; diff --git a/connectivity/source/cpool/ZConnectionWrapper.cxx b/connectivity/source/cpool/ZConnectionWrapper.cxx index 359c18903e01..d61c18fbfcd8 100644 --- a/connectivity/source/cpool/ZConnectionWrapper.cxx +++ b/connectivity/source/cpool/ZConnectionWrapper.cxx @@ -193,7 +193,7 @@ sal_Int32 SAL_CALL OConnectionWeakWrapper::getTransactionIsolation( ) throw(SQL return m_xConnection->getTransactionIsolation(); } -Reference< ::com::sun::star::container::XNameAccess > SAL_CALL OConnectionWeakWrapper::getTypeMap( ) throw(SQLException, RuntimeException, std::exception) +Reference< css::container::XNameAccess > SAL_CALL OConnectionWeakWrapper::getTypeMap( ) throw(SQLException, RuntimeException, std::exception) { ::osl::MutexGuard aGuard( m_aMutex ); checkDisposed(OConnectionWeakWrapper_BASE::rBHelper.bDisposed); @@ -202,7 +202,7 @@ Reference< ::com::sun::star::container::XNameAccess > SAL_CALL OConnectionWeakWr return m_xConnection->getTypeMap(); } -void SAL_CALL OConnectionWeakWrapper::setTypeMap( const Reference< ::com::sun::star::container::XNameAccess >& typeMap ) throw(SQLException, RuntimeException, std::exception) +void SAL_CALL OConnectionWeakWrapper::setTypeMap( const Reference< css::container::XNameAccess >& typeMap ) throw(SQLException, RuntimeException, std::exception) { ::osl::MutexGuard aGuard( m_aMutex ); checkDisposed(OConnectionWeakWrapper_BASE::rBHelper.bDisposed); @@ -230,15 +230,17 @@ void OConnectionWeakWrapper::disposing() OConnectionWrapper::disposing(); } -// com::sun::star::lang::XUnoTunnel -IMPLEMENT_FORWARD_REFCOUNT( OConnectionWeakWrapper, OConnectionWeakWrapper_BASE ) \ -::com::sun::star::uno::Any SAL_CALL OConnectionWeakWrapper::queryInterface( const ::com::sun::star::uno::Type& _rType ) throw (::com::sun::star::uno::RuntimeException, std::exception) \ -{ \ - ::com::sun::star::uno::Any aReturn = OConnectionWeakWrapper_BASE::queryInterface( _rType ); \ - if ( !aReturn.hasValue() ) \ - aReturn = OConnectionWrapper::queryInterface( _rType ); \ - return aReturn; \ +// css::lang::XUnoTunnel +IMPLEMENT_FORWARD_REFCOUNT( OConnectionWeakWrapper, OConnectionWeakWrapper_BASE ) + +css::uno::Any SAL_CALL OConnectionWeakWrapper::queryInterface( const css::uno::Type& _rType ) throw (css::uno::RuntimeException, std::exception) +{ + css::uno::Any aReturn = OConnectionWeakWrapper_BASE::queryInterface( _rType ); + if ( !aReturn.hasValue() ) + aReturn = OConnectionWrapper::queryInterface( _rType ); + return aReturn; } + IMPLEMENT_FORWARD_XTYPEPROVIDER2(OConnectionWeakWrapper,OConnectionWeakWrapper_BASE,OConnectionWrapper) diff --git a/connectivity/source/cpool/ZConnectionWrapper.hxx b/connectivity/source/cpool/ZConnectionWrapper.hxx index c59d2bc5994d..668d1fda7706 100644 --- a/connectivity/source/cpool/ZConnectionWrapper.hxx +++ b/connectivity/source/cpool/ZConnectionWrapper.hxx @@ -33,19 +33,18 @@ namespace connectivity // OConnectionWeakWrapper - 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::sdbc::XConnection - > OConnectionWeakWrapper_BASE; + typedef ::cppu::WeakComponentImplHelper< css::sdbc::XConnection > OConnectionWeakWrapper_BASE; - class OConnectionWeakWrapper : public ::comphelper::OBaseMutex - ,public OConnectionWeakWrapper_BASE - , public OConnectionWrapper + class OConnectionWeakWrapper : public ::comphelper::OBaseMutex + , public OConnectionWeakWrapper_BASE + , public OConnectionWrapper { protected: // OComponentHelper virtual void SAL_CALL disposing() override; virtual ~OConnectionWeakWrapper(); public: - explicit OConnectionWeakWrapper(::com::sun::star::uno::Reference< ::com::sun::star::uno::XAggregation >& _xConnection); + explicit OConnectionWeakWrapper(css::uno::Reference< css::uno::XAggregation >& _xConnection); // XServiceInfo DECLARE_SERVICE_INFO(); @@ -53,26 +52,26 @@ namespace connectivity DECLARE_XINTERFACE( ) // 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, std::exception) override; - 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, std::exception) override; - 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, std::exception) override; - virtual OUString SAL_CALL nativeSQL( const OUString& sql ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException, std::exception) override; - virtual void SAL_CALL setAutoCommit( sal_Bool autoCommit ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException, std::exception) override; - virtual sal_Bool SAL_CALL getAutoCommit( ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException, std::exception) override; - virtual void SAL_CALL commit( ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException, std::exception) override; - virtual void SAL_CALL rollback( ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException, std::exception) override; - virtual sal_Bool SAL_CALL isClosed( ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException, std::exception) override; - 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, std::exception) override; - virtual void SAL_CALL setReadOnly( sal_Bool readOnly ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException, std::exception) override; - virtual sal_Bool SAL_CALL isReadOnly( ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException, std::exception) override; - virtual void SAL_CALL setCatalog( const OUString& catalog ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException, std::exception) override; - virtual OUString SAL_CALL getCatalog( ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException, std::exception) override; - virtual void SAL_CALL setTransactionIsolation( sal_Int32 level ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException, std::exception) override; - virtual sal_Int32 SAL_CALL getTransactionIsolation( ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException, std::exception) override; - 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, std::exception) override; - virtual void SAL_CALL setTypeMap( const ::com::sun::star::uno::Reference< ::com::sun::star::container::XNameAccess >& typeMap ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException, std::exception) override; + virtual css::uno::Reference< css::sdbc::XStatement > SAL_CALL createStatement( ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override; + virtual css::uno::Reference< css::sdbc::XPreparedStatement > SAL_CALL prepareStatement( const OUString& sql ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override; + virtual css::uno::Reference< css::sdbc::XPreparedStatement > SAL_CALL prepareCall( const OUString& sql ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override; + virtual OUString SAL_CALL nativeSQL( const OUString& sql ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override; + virtual void SAL_CALL setAutoCommit( sal_Bool autoCommit ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override; + virtual sal_Bool SAL_CALL getAutoCommit( ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override; + virtual void SAL_CALL commit( ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override; + virtual void SAL_CALL rollback( ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override; + virtual sal_Bool SAL_CALL isClosed( ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override; + virtual css::uno::Reference< css::sdbc::XDatabaseMetaData > SAL_CALL getMetaData( ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override; + virtual void SAL_CALL setReadOnly( sal_Bool readOnly ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override; + virtual sal_Bool SAL_CALL isReadOnly( ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override; + virtual void SAL_CALL setCatalog( const OUString& catalog ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override; + virtual OUString SAL_CALL getCatalog( ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override; + virtual void SAL_CALL setTransactionIsolation( sal_Int32 level ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override; + virtual sal_Int32 SAL_CALL getTransactionIsolation( ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override; + virtual css::uno::Reference< css::container::XNameAccess > SAL_CALL getTypeMap( ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override; + virtual void SAL_CALL setTypeMap( const css::uno::Reference< css::container::XNameAccess >& typeMap ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override; // XCloseable - virtual void SAL_CALL close( ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException, std::exception) override; + virtual void SAL_CALL close( ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override; }; } #endif // INCLUDED_CONNECTIVITY_SOURCE_CPOOL_ZCONNECTIONWRAPPER_HXX diff --git a/connectivity/source/cpool/ZDriverWrapper.hxx b/connectivity/source/cpool/ZDriverWrapper.hxx index 92d5b0edbb9f..baac4ceac590 100644 --- a/connectivity/source/cpool/ZDriverWrapper.hxx +++ b/connectivity/source/cpool/ZDriverWrapper.hxx @@ -32,15 +32,14 @@ namespace connectivity class OConnectionPool; - typedef ::cppu::WeakImplHelper< ::com::sun::star::sdbc::XDriver - > ODriverWrapper_BASE; + typedef ::cppu::WeakImplHelper< css::sdbc::XDriver > ODriverWrapper_BASE; class ODriverWrapper : public ODriverWrapper_BASE { protected: - ::com::sun::star::uno::Reference< ::com::sun::star::uno::XAggregation > + css::uno::Reference< css::uno::XAggregation > m_xDriverAggregate; - ::com::sun::star::uno::Reference< ::com::sun::star::sdbc::XDriver > + css::uno::Reference< css::sdbc::XDriver > m_xDriver; OConnectionPool* m_pConnectionPool; @@ -50,23 +49,23 @@ namespace connectivity the driver to aggregate. The object will be reset to when returning from the ctor. */ ODriverWrapper( - ::com::sun::star::uno::Reference< ::com::sun::star::uno::XAggregation >& _rxAggregateDriver, + css::uno::Reference< css::uno::XAggregation >& _rxAggregateDriver, OConnectionPool* _pPool ); // XInterface - virtual ::com::sun::star::uno::Any SAL_CALL queryInterface( const ::com::sun::star::uno::Type& aType ) throw (::com::sun::star::uno::RuntimeException, std::exception) override; + virtual css::uno::Any SAL_CALL queryInterface( const css::uno::Type& aType ) throw (css::uno::RuntimeException, std::exception) override; protected: /// dtor virtual ~ODriverWrapper(); // 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; }; diff --git a/connectivity/source/cpool/ZPoolCollection.cxx b/connectivity/source/cpool/ZPoolCollection.cxx index cf205eef1de8..f14575703e9c 100644 --- a/connectivity/source/cpool/ZPoolCollection.cxx +++ b/connectivity/source/cpool/ZPoolCollection.cxx @@ -83,7 +83,7 @@ OPoolCollection::OPoolCollection(const Reference< XComponentContext >& _rxContex osl_atomic_increment( &m_refCount ); { - m_xDesktop = ::com::sun::star::frame::Desktop::create( m_xContext ); + m_xDesktop = css::frame::Desktop::create( m_xContext ); m_xDesktop->addTerminateListener(this); } @@ -318,7 +318,7 @@ OConnectionPool* OPoolCollection::getConnectionPool(const OUString& _sImplName, Reference< XInterface > OPoolCollection::createWithServiceFactory(const OUString& _rPath) const { return createWithProvider( - com::sun::star::configuration::theDefaultProvider::get(m_xContext), + css::configuration::theDefaultProvider::get(m_xContext), _rPath); } @@ -404,7 +404,7 @@ Any OPoolCollection::getNodeValue(const OUString& _rPath,const Reference OPoolCollection_Base; /// OPoolCollection: control the whole connection pooling for oo @@ -58,84 +58,84 @@ namespace connectivity { - typedef ::comphelper::OInterfaceCompare< ::com::sun::star::sdbc::XDriver > ODriverCompare; + typedef ::comphelper::OInterfaceCompare< css::sdbc::XDriver > ODriverCompare; typedef std::map OConnectionPools; typedef std::map< - ::com::sun::star::uno::Reference< ::com::sun::star::sdbc::XDriver >, - ::com::sun::star::uno::WeakReference< ::com::sun::star::sdbc::XDriver >, + css::uno::Reference< css::sdbc::XDriver >, + css::uno::WeakReference< css::sdbc::XDriver >, ODriverCompare> MapDriver2DriverRef; - MapDriver2DriverRef m_aDriverProxies; - ::osl::Mutex m_aMutex; - OConnectionPools m_aPools; // the driver pools - ::com::sun::star::uno::Reference< ::com::sun::star::uno::XComponentContext > m_xContext; - ::com::sun::star::uno::Reference< ::com::sun::star::sdbc::XDriverManager2 > m_xManager; - ::com::sun::star::uno::Reference< ::com::sun::star::reflection::XProxyFactory > m_xProxyFactory; - ::com::sun::star::uno::Reference< ::com::sun::star::uno::XInterface > m_xConfigNode; // config node for general connection pooling - ::com::sun::star::uno::Reference< ::com::sun::star::frame::XDesktop2> m_xDesktop; + MapDriver2DriverRef m_aDriverProxies; + ::osl::Mutex m_aMutex; + OConnectionPools m_aPools; // the driver pools + css::uno::Reference< css::uno::XComponentContext > m_xContext; + css::uno::Reference< css::sdbc::XDriverManager2 > m_xManager; + css::uno::Reference< css::reflection::XProxyFactory > m_xProxyFactory; + css::uno::Reference< css::uno::XInterface > m_xConfigNode; // config node for general connection pooling + css::uno::Reference< css::frame::XDesktop2> m_xDesktop; private: OPoolCollection(const OPoolCollection&) = delete; int operator= (const OPoolCollection&) = delete; explicit OPoolCollection( - const ::com::sun::star::uno::Reference< ::com::sun::star::uno::XComponentContext >& _rxContext); + const css::uno::Reference< css::uno::XComponentContext >& _rxContext); // some configuration helper methods - ::com::sun::star::uno::Reference< ::com::sun::star::uno::XInterface > createWithServiceFactory(const OUString& _rPath) const; - ::com::sun::star::uno::Reference< ::com::sun::star::uno::XInterface > getConfigPoolRoot(); - static ::com::sun::star::uno::Reference< ::com::sun::star::uno::XInterface > createWithProvider( const ::com::sun::star::uno::Reference< ::com::sun::star::lang::XMultiServiceFactory >& _rxConfProvider, + css::uno::Reference< css::uno::XInterface > createWithServiceFactory(const OUString& _rPath) const; + css::uno::Reference< css::uno::XInterface > getConfigPoolRoot(); + static css::uno::Reference< css::uno::XInterface > createWithProvider( const css::uno::Reference< css::lang::XMultiServiceFactory >& _rxConfProvider, const OUString& _rPath); - static ::com::sun::star::uno::Reference< ::com::sun::star::uno::XInterface > openNode( const OUString& _rPath, - const ::com::sun::star::uno::Reference< ::com::sun::star::uno::XInterface >& _xTreeNode) throw(); + static css::uno::Reference< css::uno::XInterface > openNode( const OUString& _rPath, + const css::uno::Reference< css::uno::XInterface >& _xTreeNode) throw(); bool isPoolingEnabled(); bool isDriverPoolingEnabled(const OUString& _sDriverImplName, - ::com::sun::star::uno::Reference< ::com::sun::star::uno::XInterface >& _rxDriverNode); + css::uno::Reference< css::uno::XInterface >& _rxDriverNode); bool isPoolingEnabledByUrl( const OUString& _sUrl, - ::com::sun::star::uno::Reference< ::com::sun::star::sdbc::XDriver >& _rxDriver, + css::uno::Reference< css::sdbc::XDriver >& _rxDriver, OUString& _rsImplName, - ::com::sun::star::uno::Reference< ::com::sun::star::uno::XInterface >& _rxDriverNode); + css::uno::Reference< css::uno::XInterface >& _rxDriverNode); OConnectionPool* getConnectionPool( const OUString& _sImplName, - const ::com::sun::star::uno::Reference< ::com::sun::star::sdbc::XDriver >& _xDriver, - const ::com::sun::star::uno::Reference< ::com::sun::star::uno::XInterface >& _rxDriverNode); + const css::uno::Reference< css::sdbc::XDriver >& _xDriver, + const css::uno::Reference< css::uno::XInterface >& _rxDriverNode); void clearConnectionPools(bool _bDispose); void clearDesktop(); protected: virtual ~OPoolCollection(); public: - static ::com::sun::star::uno::Any getNodeValue( const OUString& _rPath, - const ::com::sun::star::uno::Reference< ::com::sun::star::uno::XInterface>& _xTreeNode)throw(); + static css::uno::Any getNodeValue( const OUString& _rPath, + const css::uno::Reference< css::uno::XInterface>& _xTreeNode)throw(); // XDriverManager - virtual ::com::sun::star::uno::Reference< ::com::sun::star::sdbc::XConnection > SAL_CALL getConnection( const OUString& url ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException, std::exception) override; - virtual ::com::sun::star::uno::Reference< ::com::sun::star::sdbc::XConnection > SAL_CALL getConnectionWithInfo( 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 void SAL_CALL setLoginTimeout( sal_Int32 seconds ) throw(::com::sun::star::uno::RuntimeException, std::exception) override; - virtual sal_Int32 SAL_CALL getLoginTimeout( ) throw(::com::sun::star::uno::RuntimeException, std::exception) override; + virtual css::uno::Reference< css::sdbc::XConnection > SAL_CALL getConnection( const OUString& url ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override; + virtual css::uno::Reference< css::sdbc::XConnection > SAL_CALL getConnectionWithInfo( const OUString& url, const css::uno::Sequence< css::beans::PropertyValue >& info ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override; + virtual void SAL_CALL setLoginTimeout( sal_Int32 seconds ) throw(css::uno::RuntimeException, std::exception) override; + virtual sal_Int32 SAL_CALL getLoginTimeout( ) throw(css::uno::RuntimeException, std::exception) override; //XDriverAccess - virtual ::com::sun::star::uno::Reference< ::com::sun::star::sdbc::XDriver > SAL_CALL getDriverByURL( const OUString& url ) throw (::com::sun::star::uno::RuntimeException, std::exception) override; + virtual css::uno::Reference< css::sdbc::XDriver > SAL_CALL getDriverByURL( const OUString& url ) throw (css::uno::RuntimeException, std::exception) override; // XServiceInfo - virtual OUString SAL_CALL getImplementationName( ) throw(::com::sun::star::uno::RuntimeException, std::exception) override; - virtual sal_Bool SAL_CALL supportsService( const OUString& ServiceName ) throw(::com::sun::star::uno::RuntimeException, std::exception) override; - virtual ::com::sun::star::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames( ) throw(::com::sun::star::uno::RuntimeException, std::exception) override; + virtual OUString SAL_CALL getImplementationName( ) throw(css::uno::RuntimeException, std::exception) override; + virtual sal_Bool SAL_CALL supportsService( const OUString& ServiceName ) throw(css::uno::RuntimeException, std::exception) override; + virtual css::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames( ) throw(css::uno::RuntimeException, std::exception) override; // XServiceInfo - static methods - static ::com::sun::star::uno::Reference< ::com::sun::star::uno::XInterface > SAL_CALL CreateInstance(const::com::sun::star::uno::Reference< ::com::sun::star::lang::XMultiServiceFactory >&); - static OUString SAL_CALL getImplementationName_Static( ) throw(::com::sun::star::uno::RuntimeException); - static ::com::sun::star::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames_Static( ) throw(::com::sun::star::uno::RuntimeException); + static css::uno::Reference< css::uno::XInterface > SAL_CALL CreateInstance(const css::uno::Reference< css::lang::XMultiServiceFactory >&); + static OUString SAL_CALL getImplementationName_Static( ) throw(css::uno::RuntimeException); + static css::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames_Static( ) throw(css::uno::RuntimeException); // 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; // XPropertyChangeListener - virtual void SAL_CALL propertyChange( const ::com::sun::star::beans::PropertyChangeEvent& evt ) throw (::com::sun::star::uno::RuntimeException, std::exception) override; + virtual void SAL_CALL propertyChange( const css::beans::PropertyChangeEvent& evt ) throw (css::uno::RuntimeException, std::exception) override; // XTerminateListener - virtual void SAL_CALL queryTermination( const ::com::sun::star::lang::EventObject& Event ) throw (::com::sun::star::frame::TerminationVetoException, ::com::sun::star::uno::RuntimeException, std::exception) override; - virtual void SAL_CALL notifyTermination( const ::com::sun::star::lang::EventObject& Event ) throw (::com::sun::star::uno::RuntimeException, std::exception) override; + virtual void SAL_CALL queryTermination( const css::lang::EventObject& Event ) throw (css::frame::TerminationVetoException, css::uno::RuntimeException, std::exception) override; + virtual void SAL_CALL notifyTermination( const css::lang::EventObject& Event ) throw (css::uno::RuntimeException, std::exception) override; }; } #endif // INCLUDED_CONNECTIVITY_SOURCE_CPOOL_ZPOOLCOLLECTION_HXX diff --git a/connectivity/source/cpool/ZPooledConnection.cxx b/connectivity/source/cpool/ZPooledConnection.cxx index 87b76690dff8..dc33e1765b94 100644 --- a/connectivity/source/cpool/ZPooledConnection.cxx +++ b/connectivity/source/cpool/ZPooledConnection.cxx @@ -34,7 +34,7 @@ using namespace connectivity; using namespace ::osl; OPooledConnection::OPooledConnection(const Reference< XConnection >& _xConnection, - const Reference< ::com::sun::star::reflection::XProxyFactory >& _rxProxyFactory) + const Reference< css::reflection::XProxyFactory >& _rxProxyFactory) : OPooledConnection_Base(m_aMutex) ,m_xRealConnection(_xConnection) ,m_xProxyFactory(_rxProxyFactory) diff --git a/connectivity/source/cpool/ZPooledConnection.hxx b/connectivity/source/cpool/ZPooledConnection.hxx index 8784f7398f4a..6b6c7456e182 100644 --- a/connectivity/source/cpool/ZPooledConnection.hxx +++ b/connectivity/source/cpool/ZPooledConnection.hxx @@ -32,27 +32,27 @@ namespace connectivity // OPooledConnection - // allows to pool a real connection - typedef ::cppu::WeakComponentImplHelper< ::com::sun::star::sdbc::XPooledConnection - ,::com::sun::star::lang::XEventListener> OPooledConnection_Base; + typedef ::cppu::WeakComponentImplHelper< css::sdbc::XPooledConnection + ,css::lang::XEventListener> OPooledConnection_Base; class OPooledConnection : public ::comphelper::OBaseMutex ,public OPooledConnection_Base { - ::com::sun::star::uno::Reference< ::com::sun::star::sdbc::XConnection > m_xRealConnection; // the connection fom driver - ::com::sun::star::uno::Reference< ::com::sun::star::lang::XComponent > m_xComponent; // the connection which wraps the real connection - ::com::sun::star::uno::Reference< ::com::sun::star::reflection::XProxyFactory > m_xProxyFactory; + css::uno::Reference< css::sdbc::XConnection > m_xRealConnection; // the connection fom driver + css::uno::Reference< css::lang::XComponent > m_xComponent; // the connection which wraps the real connection + css::uno::Reference< css::reflection::XProxyFactory > m_xProxyFactory; public: // OComponentHelper virtual void SAL_CALL disposing() override; - OPooledConnection(const ::com::sun::star::uno::Reference< ::com::sun::star::sdbc::XConnection >& _xConnection, - const ::com::sun::star::uno::Reference< ::com::sun::star::reflection::XProxyFactory >& _rxProxyFactory); + OPooledConnection(const css::uno::Reference< css::sdbc::XConnection >& _xConnection, + const css::uno::Reference< css::reflection::XProxyFactory >& _rxProxyFactory); //XPooledConnection - 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, std::exception) override; + virtual css::uno::Reference< css::sdbc::XConnection > SAL_CALL getConnection( ) throw (css::sdbc::SQLException, 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; }; } -- cgit