diff options
Diffstat (limited to 'connectivity/source/cpool/ZDriverWrapper.hxx')
| -rw-r--r-- | connectivity/source/cpool/ZDriverWrapper.hxx | 21 |
1 files changed, 10 insertions, 11 deletions
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 <NULL/> 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; }; |