compilerplugins/clang/dynexcspec.cxx | 14 desktop/test/deployment/active/active_native.cxx | 34 -- desktop/test/deployment/passive/passive_native.cxx | 34 -- include/cppuhelper/compbase1.hxx | 26 - include/cppuhelper/compbase10.hxx | 26 - include/cppuhelper/compbase11.hxx | 26 - include/cppuhelper/implbase11.hxx | 34 +- include/cppuhelper/implbase_ex_post.hxx | 34 +- mysqlc/source/mysqlc_connection.cxx | 27 - mysqlc/source/mysqlc_connection.hxx | 79 ++--- mysqlc/source/mysqlc_databasemetadata.cxx | 149 ---------- mysqlc/source/mysqlc_databasemetadata.hxx | 301 ++++++++++----------- mysqlc/source/mysqlc_driver.cxx | 12 mysqlc/source/mysqlc_driver.hxx | 27 - mysqlc/source/mysqlc_general.cxx | 2 mysqlc/source/mysqlc_general.hxx | 8 mysqlc/source/mysqlc_preparedstatement.cxx | 38 -- mysqlc/source/mysqlc_preparedstatement.hxx | 92 ++---- mysqlc/source/mysqlc_resultset.cxx | 86 ------ mysqlc/source/mysqlc_resultset.hxx | 218 ++++++--------- mysqlc/source/mysqlc_resultsetmetadata.cxx | 22 - mysqlc/source/mysqlc_resultsetmetadata.hxx | 46 +-- mysqlc/source/mysqlc_statement.cxx | 24 - mysqlc/source/mysqlc_statement.hxx | 60 +--- mysqlc/source/mysqlc_subcomponent.hxx | 3 ure/source/uretest/cppmain.cc | 7 ure/source/uretest/cppserver.cc | 4 ure/source/uretest/cpptest.cc | 4 28 files changed, 486 insertions(+), 951 deletions(-)
New commits: commit b61214c91d926ea56f2cae309469da588b3304b1 Author: Stephan Bergmann <[email protected]> Date: Fri Jan 27 10:37:08 2017 +0100 Remove dynamic exception specifications from !LIBO_INTERNAL_ONLY ...only odk/examples/ remains to be clean up Change-Id: I875a1e8d6750b6b007bd75126b8010273e1f32d5 diff --git a/compilerplugins/clang/dynexcspec.cxx b/compilerplugins/clang/dynexcspec.cxx index 7ca7ba0..b06245e 100644 --- a/compilerplugins/clang/dynexcspec.cxx +++ b/compilerplugins/clang/dynexcspec.cxx @@ -21,7 +21,12 @@ namespace { bool isOverriding(FunctionDecl const * decl) { - return decl->hasAttr<OverrideAttr>(); + if (decl->hasAttr<OverrideAttr>()) { + return true; + } + auto m = dyn_cast<CXXMethodDecl>(decl); + return m != nullptr + && m->begin_overridden_methods() != m->end_overridden_methods(); } class DynExcSpec: @@ -31,13 +36,6 @@ public: explicit DynExcSpec(InstantiationData const & data): RewritePlugin(data) {} void run() override { - // See the mail thread mentioned above for why !LIBO_INTERNAL_ONLY is - // excluded for now: - if (!compiler.getPreprocessor().getIdentifierInfo("LIBO_INTERNAL_ONLY") - ->hasMacroDefinition()) - { - return; - } if (compiler.getLangOpts().CPlusPlus) { TraverseDecl(compiler.getASTContext().getTranslationUnitDecl()); } diff --git a/desktop/test/deployment/active/active_native.cxx b/desktop/test/deployment/active/active_native.cxx index 82325ec..0c1154b 100644 --- a/desktop/test/deployment/active/active_native.cxx +++ b/desktop/test/deployment/active/active_native.cxx @@ -81,26 +81,22 @@ private: virtual ~Provider() {} - virtual rtl::OUString SAL_CALL getImplementationName() - throw (css::uno::RuntimeException) SAL_OVERRIDE + virtual rtl::OUString SAL_CALL getImplementationName() SAL_OVERRIDE { return static_getImplementationName(); } - virtual sal_Bool SAL_CALL supportsService(rtl::OUString const & ServiceName) - throw (css::uno::RuntimeException) SAL_OVERRIDE + virtual sal_Bool SAL_CALL supportsService(rtl::OUString const & ServiceName) SAL_OVERRIDE { return cppu::supportsService(this, ServiceName); } virtual css::uno::Sequence< rtl::OUString > SAL_CALL - getSupportedServiceNames() throw (css::uno::RuntimeException) SAL_OVERRIDE + getSupportedServiceNames() SAL_OVERRIDE { return static_getSupportedServiceNames(); } virtual css::uno::Reference< css::frame::XDispatch > SAL_CALL queryDispatch( - css::util::URL const &, rtl::OUString const &, sal_Int32) - throw (css::uno::RuntimeException) SAL_OVERRIDE; + css::util::URL const &, rtl::OUString const &, sal_Int32) SAL_OVERRIDE; virtual css::uno::Sequence< css::uno::Reference< css::frame::XDispatch > > SAL_CALL queryDispatches( - css::uno::Sequence< css::frame::DispatchDescriptor > const & Requests) - throw (css::uno::RuntimeException) SAL_OVERRIDE; + css::uno::Sequence< css::frame::DispatchDescriptor > const & Requests) SAL_OVERRIDE; css::uno::Reference< css::uno::XComponentContext > context_; }; @@ -117,7 +113,6 @@ css::uno::Sequence< rtl::OUString > Provider::static_getSupportedServiceNames() css::uno::Reference< css::frame::XDispatch > Provider::queryDispatch( css::util::URL const &, rtl::OUString const &, sal_Int32) - throw (css::uno::RuntimeException) { css::uno::Reference< css::frame::XDispatch > dispatch; if (!(context_->getValueByName( @@ -138,7 +133,6 @@ css::uno::Reference< css::frame::XDispatch > Provider::queryDispatch( css::uno::Sequence< css::uno::Reference< css::frame::XDispatch > > Provider::queryDispatches( css::uno::Sequence< css::frame::DispatchDescriptor > const & Requests) - throw (css::uno::RuntimeException) { css::uno::Sequence< css::uno::Reference< css::frame::XDispatch > > s( Requests.getLength()); @@ -175,33 +169,28 @@ private: virtual ~Dispatch() {} - virtual rtl::OUString SAL_CALL getImplementationName() - throw (css::uno::RuntimeException) SAL_OVERRIDE + virtual rtl::OUString SAL_CALL getImplementationName() SAL_OVERRIDE { return static_getImplementationName(); } - virtual sal_Bool SAL_CALL supportsService(rtl::OUString const & ServiceName) - throw (css::uno::RuntimeException) SAL_OVERRIDE + virtual sal_Bool SAL_CALL supportsService(rtl::OUString const & ServiceName) SAL_OVERRIDE { return cppu::supportsService(this, ServiceName); } virtual css::uno::Sequence< rtl::OUString > SAL_CALL - getSupportedServiceNames() throw (css::uno::RuntimeException) SAL_OVERRIDE + getSupportedServiceNames() SAL_OVERRIDE { return static_getSupportedServiceNames(); } virtual void SAL_CALL dispatch( css::util::URL const &, - css::uno::Sequence< css::beans::PropertyValue > const &) - throw (css::uno::RuntimeException) SAL_OVERRIDE; + css::uno::Sequence< css::beans::PropertyValue > const &) SAL_OVERRIDE; virtual void SAL_CALL addStatusListener( css::uno::Reference< css::frame::XStatusListener > const &, - css::util::URL const &) - throw (css::uno::RuntimeException) SAL_OVERRIDE + css::util::URL const &) SAL_OVERRIDE {} virtual void SAL_CALL removeStatusListener( css::uno::Reference< css::frame::XStatusListener > const &, - css::util::URL const &) - throw (css::uno::RuntimeException) SAL_OVERRIDE + css::util::URL const &) SAL_OVERRIDE {} css::uno::Reference< css::uno::XComponentContext > context_; @@ -215,7 +204,6 @@ rtl::OUString Dispatch::static_getImplementationName() { void Dispatch::dispatch( css::util::URL const &, css::uno::Sequence< css::beans::PropertyValue > const &) - throw (css::uno::RuntimeException) { css::uno::Reference< css::frame::XDesktop2 > xDesktop = css::frame::Desktop::create(context_); css::uno::Reference< css::frame::XFrame > xFrame = xDesktop->getCurrentFrame(); diff --git a/desktop/test/deployment/passive/passive_native.cxx b/desktop/test/deployment/passive/passive_native.cxx index fac8c7b..272d5cf 100644 --- a/desktop/test/deployment/passive/passive_native.cxx +++ b/desktop/test/deployment/passive/passive_native.cxx @@ -78,26 +78,22 @@ private: virtual ~Provider() {} - virtual rtl::OUString SAL_CALL getImplementationName() - throw (css::uno::RuntimeException) SAL_OVERRIDE + virtual rtl::OUString SAL_CALL getImplementationName() SAL_OVERRIDE { return static_getImplementationName(); } - virtual sal_Bool SAL_CALL supportsService(rtl::OUString const & ServiceName) - throw (css::uno::RuntimeException) SAL_OVERRIDE + virtual sal_Bool SAL_CALL supportsService(rtl::OUString const & ServiceName) SAL_OVERRIDE { return cppu::supportsService(this, ServiceName); } virtual css::uno::Sequence< rtl::OUString > SAL_CALL - getSupportedServiceNames() throw (css::uno::RuntimeException) SAL_OVERRIDE + getSupportedServiceNames() SAL_OVERRIDE { return static_getSupportedServiceNames(); } virtual css::uno::Reference< css::frame::XDispatch > SAL_CALL queryDispatch( - css::util::URL const &, rtl::OUString const &, sal_Int32) - throw (css::uno::RuntimeException) SAL_OVERRIDE; + css::util::URL const &, rtl::OUString const &, sal_Int32) SAL_OVERRIDE; virtual css::uno::Sequence< css::uno::Reference< css::frame::XDispatch > > SAL_CALL queryDispatches( - css::uno::Sequence< css::frame::DispatchDescriptor > const & Requests) - throw (css::uno::RuntimeException) SAL_OVERRIDE; + css::uno::Sequence< css::frame::DispatchDescriptor > const & Requests) SAL_OVERRIDE; css::uno::Reference< css::uno::XComponentContext > context_; }; @@ -114,7 +110,6 @@ css::uno::Sequence< rtl::OUString > Provider::static_getSupportedServiceNames() css::uno::Reference< css::frame::XDispatch > Provider::queryDispatch( css::util::URL const &, rtl::OUString const &, sal_Int32) - throw (css::uno::RuntimeException) { css::uno::Reference< css::frame::XDispatch > dispatch; if (!(context_->getValueByName( @@ -135,7 +130,6 @@ css::uno::Reference< css::frame::XDispatch > Provider::queryDispatch( css::uno::Sequence< css::uno::Reference< css::frame::XDispatch > > Provider::queryDispatches( css::uno::Sequence< css::frame::DispatchDescriptor > const & Requests) - throw (css::uno::RuntimeException) { css::uno::Sequence< css::uno::Reference< css::frame::XDispatch > > s( Requests.getLength()); @@ -172,33 +166,28 @@ private: virtual ~Dispatch() {} - virtual rtl::OUString SAL_CALL getImplementationName() - throw (css::uno::RuntimeException) SAL_OVERRIDE + virtual rtl::OUString SAL_CALL getImplementationName() SAL_OVERRIDE { return static_getImplementationName(); } - virtual sal_Bool SAL_CALL supportsService(rtl::OUString const & ServiceName) - throw (css::uno::RuntimeException) SAL_OVERRIDE + virtual sal_Bool SAL_CALL supportsService(rtl::OUString const & ServiceName) SAL_OVERRIDE { return cppu::supportsService(this, ServiceName); } virtual css::uno::Sequence< rtl::OUString > SAL_CALL - getSupportedServiceNames() throw (css::uno::RuntimeException) SAL_OVERRIDE + getSupportedServiceNames() SAL_OVERRIDE { return static_getSupportedServiceNames(); } virtual void SAL_CALL dispatch( css::util::URL const &, - css::uno::Sequence< css::beans::PropertyValue > const &) - throw (css::uno::RuntimeException) SAL_OVERRIDE; + css::uno::Sequence< css::beans::PropertyValue > const &) SAL_OVERRIDE; virtual void SAL_CALL addStatusListener( css::uno::Reference< css::frame::XStatusListener > const &, - css::util::URL const &) - throw (css::uno::RuntimeException) SAL_OVERRIDE + css::util::URL const &) SAL_OVERRIDE {} virtual void SAL_CALL removeStatusListener( css::uno::Reference< css::frame::XStatusListener > const &, - css::util::URL const &) - throw (css::uno::RuntimeException) SAL_OVERRIDE + css::util::URL const &) SAL_OVERRIDE {} css::uno::Reference< css::uno::XComponentContext > context_; @@ -212,7 +201,6 @@ rtl::OUString Dispatch::static_getImplementationName() { void Dispatch::dispatch( css::util::URL const &, css::uno::Sequence< css::beans::PropertyValue > const &) - throw (css::uno::RuntimeException) { css::uno::Reference< css::frame::XDesktop2 > xDesktop = css::frame::Desktop::create(context_); css::uno::Reference< css::frame::XFrame > xFrame = xDesktop->getCurrentFrame(); diff --git a/include/cppuhelper/compbase1.hxx b/include/cppuhelper/compbase1.hxx index 998613d..45ad3f0 100644 --- a/include/cppuhelper/compbase1.hxx +++ b/include/cppuhelper/compbase1.hxx @@ -50,21 +50,21 @@ namespace cppu inline WeakComponentImplHelper1( ::osl::Mutex & rMutex ) throw () : WeakComponentImplHelperBase( rMutex ) {} - virtual css::uno::Any SAL_CALL queryInterface( css::uno::Type const & rType ) throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE + virtual css::uno::Any SAL_CALL queryInterface( css::uno::Type const & rType ) SAL_OVERRIDE { return WeakComponentImplHelper_query( rType, cd::get(), this, static_cast<WeakComponentImplHelperBase *>(this) ); } virtual void SAL_CALL acquire() throw () SAL_OVERRIDE { WeakComponentImplHelperBase::acquire(); } virtual void SAL_CALL release() throw () SAL_OVERRIDE { WeakComponentImplHelperBase::release(); } - virtual void SAL_CALL dispose()throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE + virtual void SAL_CALL dispose() SAL_OVERRIDE { WeakComponentImplHelperBase::dispose(); } - virtual void SAL_CALL addEventListener(const css::uno::Reference< css::lang::XEventListener > & xListener)throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE + virtual void SAL_CALL addEventListener(const css::uno::Reference< css::lang::XEventListener > & xListener) SAL_OVERRIDE { WeakComponentImplHelperBase::addEventListener(xListener); } - virtual void SAL_CALL removeEventListener(const css::uno::Reference< css::lang::XEventListener > & xListener)throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE + virtual void SAL_CALL removeEventListener(const css::uno::Reference< css::lang::XEventListener > & xListener) SAL_OVERRIDE { WeakComponentImplHelperBase::removeEventListener(xListener); } - virtual css::uno::Sequence< css::uno::Type > SAL_CALL getTypes() throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE + virtual css::uno::Sequence< css::uno::Type > SAL_CALL getTypes() SAL_OVERRIDE { return WeakComponentImplHelper_getTypes( cd::get() ); } - virtual css::uno::Sequence< sal_Int8 > SAL_CALL getImplementationId() throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE + virtual css::uno::Sequence< sal_Int8 > SAL_CALL getImplementationId() SAL_OVERRIDE { return ImplHelper_getImplementationId( cd::get() ); } }; @@ -88,15 +88,15 @@ namespace cppu inline PartialWeakComponentImplHelper1( ::osl::Mutex & rMutex ) throw () : WeakComponentImplHelperBase( rMutex ) {} - virtual css::uno::Any SAL_CALL queryInterface( css::uno::Type const & rType ) throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE + virtual css::uno::Any SAL_CALL queryInterface( css::uno::Type const & rType ) SAL_OVERRIDE { return WeakComponentImplHelper_query( rType, cd::get(), this, static_cast<WeakComponentImplHelperBase *>(this) ); } virtual void SAL_CALL acquire() throw () SAL_OVERRIDE { WeakComponentImplHelperBase::acquire(); } virtual void SAL_CALL release() throw () SAL_OVERRIDE { WeakComponentImplHelperBase::release(); } - virtual css::uno::Sequence< css::uno::Type > SAL_CALL getTypes() throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE + virtual css::uno::Sequence< css::uno::Type > SAL_CALL getTypes() SAL_OVERRIDE { return WeakComponentImplHelper_getTypes( cd::get() ); } - virtual css::uno::Sequence< sal_Int8 > SAL_CALL getImplementationId() throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE + virtual css::uno::Sequence< sal_Int8 > SAL_CALL getImplementationId() SAL_OVERRIDE { return ImplHelper_getImplementationId( cd::get() ); } }; @@ -128,17 +128,17 @@ namespace cppu inline WeakAggComponentImplHelper1( ::osl::Mutex & rMutex ) throw () : WeakAggComponentImplHelperBase( rMutex ) {} - virtual css::uno::Any SAL_CALL queryInterface( css::uno::Type const & rType ) throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE + virtual css::uno::Any SAL_CALL queryInterface( css::uno::Type const & rType ) SAL_OVERRIDE { return WeakAggComponentImplHelperBase::queryInterface( rType ); } - virtual css::uno::Any SAL_CALL queryAggregation( css::uno::Type const & rType ) throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE + virtual css::uno::Any SAL_CALL queryAggregation( css::uno::Type const & rType ) SAL_OVERRIDE { return WeakAggComponentImplHelper_queryAgg( rType, cd::get(), this, static_cast<WeakAggComponentImplHelperBase *>(this) ); } virtual void SAL_CALL acquire() throw () SAL_OVERRIDE { WeakAggComponentImplHelperBase::acquire(); } virtual void SAL_CALL release() throw () SAL_OVERRIDE { WeakAggComponentImplHelperBase::release(); } - virtual css::uno::Sequence< css::uno::Type > SAL_CALL getTypes() throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE + virtual css::uno::Sequence< css::uno::Type > SAL_CALL getTypes() SAL_OVERRIDE { return WeakAggComponentImplHelper_getTypes( cd::get() ); } - virtual css::uno::Sequence< sal_Int8 > SAL_CALL getImplementationId() throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE + virtual css::uno::Sequence< sal_Int8 > SAL_CALL getImplementationId() SAL_OVERRIDE { return ImplHelper_getImplementationId( cd::get() ); } }; } diff --git a/include/cppuhelper/compbase10.hxx b/include/cppuhelper/compbase10.hxx index 66a624b..7d499c1 100644 --- a/include/cppuhelper/compbase10.hxx +++ b/include/cppuhelper/compbase10.hxx @@ -50,21 +50,21 @@ namespace cppu inline WeakComponentImplHelper10( ::osl::Mutex & rMutex ) throw () : WeakComponentImplHelperBase( rMutex ) {} - virtual css::uno::Any SAL_CALL queryInterface( css::uno::Type const & rType ) throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE + virtual css::uno::Any SAL_CALL queryInterface( css::uno::Type const & rType ) SAL_OVERRIDE { return WeakComponentImplHelper_query( rType, cd::get(), this, static_cast<WeakComponentImplHelperBase *>(this) ); } virtual void SAL_CALL acquire() throw () SAL_OVERRIDE { WeakComponentImplHelperBase::acquire(); } virtual void SAL_CALL release() throw () SAL_OVERRIDE { WeakComponentImplHelperBase::release(); } - virtual void SAL_CALL dispose()throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE + virtual void SAL_CALL dispose() SAL_OVERRIDE { WeakComponentImplHelperBase::dispose(); } - virtual void SAL_CALL addEventListener(const css::uno::Reference< css::lang::XEventListener > & xListener)throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE + virtual void SAL_CALL addEventListener(const css::uno::Reference< css::lang::XEventListener > & xListener) SAL_OVERRIDE { WeakComponentImplHelperBase::addEventListener(xListener); } - virtual void SAL_CALL removeEventListener(const css::uno::Reference< css::lang::XEventListener > & xListener)throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE + virtual void SAL_CALL removeEventListener(const css::uno::Reference< css::lang::XEventListener > & xListener) SAL_OVERRIDE { WeakComponentImplHelperBase::removeEventListener(xListener); } - virtual css::uno::Sequence< css::uno::Type > SAL_CALL getTypes() throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE + virtual css::uno::Sequence< css::uno::Type > SAL_CALL getTypes() SAL_OVERRIDE { return WeakComponentImplHelper_getTypes( cd::get() ); } - virtual css::uno::Sequence< sal_Int8 > SAL_CALL getImplementationId() throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE + virtual css::uno::Sequence< sal_Int8 > SAL_CALL getImplementationId() SAL_OVERRIDE { return ImplHelper_getImplementationId( cd::get() ); } }; @@ -88,15 +88,15 @@ namespace cppu inline PartialWeakComponentImplHelper10( ::osl::Mutex & rMutex ) throw () : WeakComponentImplHelperBase( rMutex ) {} - virtual css::uno::Any SAL_CALL queryInterface( css::uno::Type const & rType ) throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE + virtual css::uno::Any SAL_CALL queryInterface( css::uno::Type const & rType ) SAL_OVERRIDE { return WeakComponentImplHelper_query( rType, cd::get(), this, static_cast<WeakComponentImplHelperBase *>(this) ); } virtual void SAL_CALL acquire() throw () SAL_OVERRIDE { WeakComponentImplHelperBase::acquire(); } virtual void SAL_CALL release() throw () SAL_OVERRIDE { WeakComponentImplHelperBase::release(); } - virtual css::uno::Sequence< css::uno::Type > SAL_CALL getTypes() throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE + virtual css::uno::Sequence< css::uno::Type > SAL_CALL getTypes() SAL_OVERRIDE { return WeakComponentImplHelper_getTypes( cd::get() ); } - virtual css::uno::Sequence< sal_Int8 > SAL_CALL getImplementationId() throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE + virtual css::uno::Sequence< sal_Int8 > SAL_CALL getImplementationId() SAL_OVERRIDE { return ImplHelper_getImplementationId( cd::get() ); } }; @@ -128,17 +128,17 @@ namespace cppu inline WeakAggComponentImplHelper10( ::osl::Mutex & rMutex ) throw () : WeakAggComponentImplHelperBase( rMutex ) {} - virtual css::uno::Any SAL_CALL queryInterface( css::uno::Type const & rType ) throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE + virtual css::uno::Any SAL_CALL queryInterface( css::uno::Type const & rType ) SAL_OVERRIDE { return WeakAggComponentImplHelperBase::queryInterface( rType ); } - virtual css::uno::Any SAL_CALL queryAggregation( css::uno::Type const & rType ) throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE + virtual css::uno::Any SAL_CALL queryAggregation( css::uno::Type const & rType ) SAL_OVERRIDE { return WeakAggComponentImplHelper_queryAgg( rType, cd::get(), this, static_cast<WeakAggComponentImplHelperBase *>(this) ); } virtual void SAL_CALL acquire() throw () SAL_OVERRIDE { WeakAggComponentImplHelperBase::acquire(); } virtual void SAL_CALL release() throw () SAL_OVERRIDE { WeakAggComponentImplHelperBase::release(); } - virtual css::uno::Sequence< css::uno::Type > SAL_CALL getTypes() throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE + virtual css::uno::Sequence< css::uno::Type > SAL_CALL getTypes() SAL_OVERRIDE { return WeakAggComponentImplHelper_getTypes( cd::get() ); } - virtual css::uno::Sequence< sal_Int8 > SAL_CALL getImplementationId() throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE + virtual css::uno::Sequence< sal_Int8 > SAL_CALL getImplementationId() SAL_OVERRIDE { return ImplHelper_getImplementationId( cd::get() ); } }; } diff --git a/include/cppuhelper/compbase11.hxx b/include/cppuhelper/compbase11.hxx index 0b528a1..ec55cf0 100644 --- a/include/cppuhelper/compbase11.hxx +++ b/include/cppuhelper/compbase11.hxx @@ -50,21 +50,21 @@ namespace cppu inline WeakComponentImplHelper11( ::osl::Mutex & rMutex ) throw () : WeakComponentImplHelperBase( rMutex ) {} - virtual css::uno::Any SAL_CALL queryInterface( css::uno::Type const & rType ) throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE + virtual css::uno::Any SAL_CALL queryInterface( css::uno::Type const & rType ) SAL_OVERRIDE { return WeakComponentImplHelper_query( rType, cd::get(), this, static_cast<WeakComponentImplHelperBase *>(this) ); } virtual void SAL_CALL acquire() throw () SAL_OVERRIDE { WeakComponentImplHelperBase::acquire(); } virtual void SAL_CALL release() throw () SAL_OVERRIDE { WeakComponentImplHelperBase::release(); } - virtual void SAL_CALL dispose()throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE + virtual void SAL_CALL dispose() SAL_OVERRIDE { WeakComponentImplHelperBase::dispose(); } - virtual void SAL_CALL addEventListener(const css::uno::Reference< css::lang::XEventListener > & xListener)throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE + virtual void SAL_CALL addEventListener(const css::uno::Reference< css::lang::XEventListener > & xListener) SAL_OVERRIDE { WeakComponentImplHelperBase::addEventListener(xListener); } - virtual void SAL_CALL removeEventListener(const css::uno::Reference< css::lang::XEventListener > & xListener)throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE + virtual void SAL_CALL removeEventListener(const css::uno::Reference< css::lang::XEventListener > & xListener) SAL_OVERRIDE { WeakComponentImplHelperBase::removeEventListener(xListener); } - virtual css::uno::Sequence< css::uno::Type > SAL_CALL getTypes() throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE + virtual css::uno::Sequence< css::uno::Type > SAL_CALL getTypes() SAL_OVERRIDE { return WeakComponentImplHelper_getTypes( cd::get() ); } - virtual css::uno::Sequence< sal_Int8 > SAL_CALL getImplementationId() throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE + virtual css::uno::Sequence< sal_Int8 > SAL_CALL getImplementationId() SAL_OVERRIDE { return ImplHelper_getImplementationId( cd::get() ); } }; @@ -88,15 +88,15 @@ namespace cppu inline PartialWeakComponentImplHelper11( ::osl::Mutex & rMutex ) throw () : WeakComponentImplHelperBase( rMutex ) {} - virtual css::uno::Any SAL_CALL queryInterface( css::uno::Type const & rType ) throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE + virtual css::uno::Any SAL_CALL queryInterface( css::uno::Type const & rType ) SAL_OVERRIDE { return WeakComponentImplHelper_query( rType, cd::get(), this, static_cast<WeakComponentImplHelperBase *>(this) ); } virtual void SAL_CALL acquire() throw () SAL_OVERRIDE { WeakComponentImplHelperBase::acquire(); } virtual void SAL_CALL release() throw () SAL_OVERRIDE { WeakComponentImplHelperBase::release(); } - virtual css::uno::Sequence< css::uno::Type > SAL_CALL getTypes() throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE + virtual css::uno::Sequence< css::uno::Type > SAL_CALL getTypes() SAL_OVERRIDE { return WeakComponentImplHelper_getTypes( cd::get() ); } - virtual css::uno::Sequence< sal_Int8 > SAL_CALL getImplementationId() throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE + virtual css::uno::Sequence< sal_Int8 > SAL_CALL getImplementationId() SAL_OVERRIDE { return ImplHelper_getImplementationId( cd::get() ); } }; @@ -128,17 +128,17 @@ namespace cppu inline WeakAggComponentImplHelper11( ::osl::Mutex & rMutex ) throw () : WeakAggComponentImplHelperBase( rMutex ) {} - virtual css::uno::Any SAL_CALL queryInterface( css::uno::Type const & rType ) throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE + virtual css::uno::Any SAL_CALL queryInterface( css::uno::Type const & rType ) SAL_OVERRIDE { return WeakAggComponentImplHelperBase::queryInterface( rType ); } - virtual css::uno::Any SAL_CALL queryAggregation( css::uno::Type const & rType ) throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE + virtual css::uno::Any SAL_CALL queryAggregation( css::uno::Type const & rType ) SAL_OVERRIDE { return WeakAggComponentImplHelper_queryAgg( rType, cd::get(), this, static_cast<WeakAggComponentImplHelperBase *>(this) ); } virtual void SAL_CALL acquire() throw () SAL_OVERRIDE { WeakAggComponentImplHelperBase::acquire(); } virtual void SAL_CALL release() throw () SAL_OVERRIDE { WeakAggComponentImplHelperBase::release(); } - virtual css::uno::Sequence< css::uno::Type > SAL_CALL getTypes() throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE + virtual css::uno::Sequence< css::uno::Type > SAL_CALL getTypes() SAL_OVERRIDE { return WeakAggComponentImplHelper_getTypes( cd::get() ); } - virtual css::uno::Sequence< sal_Int8 > SAL_CALL getImplementationId() throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE + virtual css::uno::Sequence< sal_Int8 > SAL_CALL getImplementationId() SAL_OVERRIDE { return ImplHelper_getImplementationId( cd::get() ); } }; } diff --git a/include/cppuhelper/implbase11.hxx b/include/cppuhelper/implbase11.hxx index 37bddc9..9cd24a8 100644 --- a/include/cppuhelper/implbase11.hxx +++ b/include/cppuhelper/implbase11.hxx @@ -80,11 +80,11 @@ namespace cppu { struct cd : public rtl::StaticAggregate< class_data, ImplClassData11< Ifc1, Ifc2, Ifc3, Ifc4, Ifc5, Ifc6, Ifc7, Ifc8, Ifc9, Ifc10, Ifc11, ImplHelper11<Ifc1, Ifc2, Ifc3, Ifc4, Ifc5, Ifc6, Ifc7, Ifc8, Ifc9, Ifc10, Ifc11> > > {}; public: - virtual css::uno::Any SAL_CALL queryInterface( css::uno::Type const & rType ) throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE + virtual css::uno::Any SAL_CALL queryInterface( css::uno::Type const & rType ) SAL_OVERRIDE { return ImplHelper_query( rType, cd::get(), this ); } - virtual css::uno::Sequence< css::uno::Type > SAL_CALL getTypes() throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE + virtual css::uno::Sequence< css::uno::Type > SAL_CALL getTypes() SAL_OVERRIDE { return ImplHelper_getTypes( cd::get() ); } - virtual css::uno::Sequence< sal_Int8 > SAL_CALL getImplementationId() throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE + virtual css::uno::Sequence< sal_Int8 > SAL_CALL getImplementationId() SAL_OVERRIDE { return ImplHelper_getImplementationId( cd::get() ); } #if !defined _MSC_VER // public -> protected changes mangled names there @@ -114,15 +114,15 @@ namespace cppu { struct cd : public rtl::StaticAggregate< class_data, ImplClassData11< Ifc1, Ifc2, Ifc3, Ifc4, Ifc5, Ifc6, Ifc7, Ifc8, Ifc9, Ifc10, Ifc11, WeakImplHelper11<Ifc1, Ifc2, Ifc3, Ifc4, Ifc5, Ifc6, Ifc7, Ifc8, Ifc9, Ifc10, Ifc11> > > {}; public: - virtual css::uno::Any SAL_CALL queryInterface( css::uno::Type const & rType ) throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE + virtual css::uno::Any SAL_CALL queryInterface( css::uno::Type const & rType ) SAL_OVERRIDE { return WeakImplHelper_query( rType, cd::get(), this, static_cast<OWeakObject *>(this) ); } virtual void SAL_CALL acquire() throw () SAL_OVERRIDE { OWeakObject::acquire(); } virtual void SAL_CALL release() throw () SAL_OVERRIDE { OWeakObject::release(); } - virtual css::uno::Sequence< css::uno::Type > SAL_CALL getTypes() throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE + virtual css::uno::Sequence< css::uno::Type > SAL_CALL getTypes() SAL_OVERRIDE { return WeakImplHelper_getTypes( cd::get() ); } - virtual css::uno::Sequence< sal_Int8 > SAL_CALL getImplementationId() throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE + virtual css::uno::Sequence< sal_Int8 > SAL_CALL getImplementationId() SAL_OVERRIDE { return ImplHelper_getImplementationId( cd::get() ); } }; /** Implementation helper implementing interfaces css::lang::XTypeProvider and @@ -146,17 +146,17 @@ namespace cppu { struct cd : public rtl::StaticAggregate< class_data, ImplClassData11< Ifc1, Ifc2, Ifc3, Ifc4, Ifc5, Ifc6, Ifc7, Ifc8, Ifc9, Ifc10, Ifc11, WeakAggImplHelper11<Ifc1, Ifc2, Ifc3, Ifc4, Ifc5, Ifc6, Ifc7, Ifc8, Ifc9, Ifc10, Ifc11> > > {}; public: - virtual css::uno::Any SAL_CALL queryInterface( css::uno::Type const & rType ) throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE + virtual css::uno::Any SAL_CALL queryInterface( css::uno::Type const & rType ) SAL_OVERRIDE { return OWeakAggObject::queryInterface( rType ); } - virtual css::uno::Any SAL_CALL queryAggregation( css::uno::Type const & rType ) throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE + virtual css::uno::Any SAL_CALL queryAggregation( css::uno::Type const & rType ) SAL_OVERRIDE { return WeakAggImplHelper_queryAgg( rType, cd::get(), this, static_cast<OWeakAggObject *>(this) ); } virtual void SAL_CALL acquire() throw () SAL_OVERRIDE { OWeakAggObject::acquire(); } virtual void SAL_CALL release() throw () SAL_OVERRIDE { OWeakAggObject::release(); } - virtual css::uno::Sequence< css::uno::Type > SAL_CALL getTypes() throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE + virtual css::uno::Sequence< css::uno::Type > SAL_CALL getTypes() SAL_OVERRIDE { return WeakAggImplHelper_getTypes( cd::get() ); } - virtual css::uno::Sequence< sal_Int8 > SAL_CALL getImplementationId() throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE + virtual css::uno::Sequence< sal_Int8 > SAL_CALL getImplementationId() SAL_OVERRIDE { return ImplHelper_getImplementationId( cd::get() ); } }; /** Implementation helper implementing interfaces css::lang::XTypeProvider and @@ -210,7 +210,7 @@ namespace cppu BaseClass(arg1, arg2, arg3, arg4, arg5, arg6) {} public: ImplInheritanceHelper11() {} - virtual css::uno::Any SAL_CALL queryInterface( css::uno::Type const & rType ) throw (css::uno::RuntimeException) SAL_OVERRIDE + virtual css::uno::Any SAL_CALL queryInterface( css::uno::Type const & rType ) SAL_OVERRIDE { css::uno::Any aRet( ImplHelper_queryNoXInterface( rType, cd::get(), this ) ); if (aRet.hasValue()) @@ -221,9 +221,9 @@ namespace cppu { BaseClass::acquire(); } virtual void SAL_CALL release() throw () SAL_OVERRIDE { BaseClass::release(); } - virtual css::uno::Sequence< css::uno::Type > SAL_CALL getTypes() throw (css::uno::RuntimeException) SAL_OVERRIDE + virtual css::uno::Sequence< css::uno::Type > SAL_CALL getTypes() SAL_OVERRIDE { return ImplInhHelper_getTypes( cd::get(), BaseClass::getTypes() ); } - virtual css::uno::Sequence< sal_Int8 > SAL_CALL getImplementationId() throw (css::uno::RuntimeException) SAL_OVERRIDE + virtual css::uno::Sequence< sal_Int8 > SAL_CALL getImplementationId() SAL_OVERRIDE { return ImplHelper_getImplementationId( cd::get() ); } }; /** Implementation helper implementing interfaces css::lang::XTypeProvider and @@ -278,9 +278,9 @@ namespace cppu BaseClass(arg1, arg2, arg3, arg4, arg5, arg6) {} public: AggImplInheritanceHelper11() {} - virtual css::uno::Any SAL_CALL queryInterface( css::uno::Type const & rType ) throw (css::uno::RuntimeException) SAL_OVERRIDE + virtual css::uno::Any SAL_CALL queryInterface( css::uno::Type const & rType ) SAL_OVERRIDE { return BaseClass::queryInterface( rType ); } - virtual css::uno::Any SAL_CALL queryAggregation( css::uno::Type const & rType ) throw (css::uno::RuntimeException) SAL_OVERRIDE + virtual css::uno::Any SAL_CALL queryAggregation( css::uno::Type const & rType ) SAL_OVERRIDE { css::uno::Any aRet( ImplHelper_queryNoXInterface( rType, cd::get(), this ) ); if (aRet.hasValue()) @@ -291,9 +291,9 @@ namespace cppu { BaseClass::acquire(); } virtual void SAL_CALL release() throw () SAL_OVERRIDE { BaseClass::release(); } - virtual css::uno::Sequence< css::uno::Type > SAL_CALL getTypes() throw (css::uno::RuntimeException) SAL_OVERRIDE + virtual css::uno::Sequence< css::uno::Type > SAL_CALL getTypes() SAL_OVERRIDE { return ImplInhHelper_getTypes( cd::get(), BaseClass::getTypes() ); } - virtual css::uno::Sequence< sal_Int8 > SAL_CALL getImplementationId() throw (css::uno::RuntimeException) SAL_OVERRIDE + virtual css::uno::Sequence< sal_Int8 > SAL_CALL getImplementationId() SAL_OVERRIDE { return ImplHelper_getImplementationId( cd::get() ); } }; } diff --git a/include/cppuhelper/implbase_ex_post.hxx b/include/cppuhelper/implbase_ex_post.hxx index f244f3a..4ed8ee9 100644 --- a/include/cppuhelper/implbase_ex_post.hxx +++ b/include/cppuhelper/implbase_ex_post.hxx @@ -49,11 +49,11 @@ class SAL_NO_VTABLE SAL_DLLPUBLIC_TEMPLATE ImplHelper##N \ { \ static class_data##N s_cd; \ public: \ - virtual css::uno::Any SAL_CALL queryInterface( css::uno::Type const & rType ) throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE \ + virtual css::uno::Any SAL_CALL queryInterface( css::uno::Type const & rType ) SAL_OVERRIDE \ { return ImplHelper_query( rType, (class_data *)&s_cd, this ); } \ - virtual css::uno::Sequence< css::uno::Type > SAL_CALL getTypes() throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE \ + virtual css::uno::Sequence< css::uno::Type > SAL_CALL getTypes() SAL_OVERRIDE \ { return ImplHelper_getTypes( (class_data *)&s_cd ); } \ - virtual css::uno::Sequence< sal_Int8 > SAL_CALL getImplementationId() throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE \ + virtual css::uno::Sequence< sal_Int8 > SAL_CALL getImplementationId() SAL_OVERRIDE \ { return ImplHelper_getImplementationId( (class_data *)&s_cd ); } \ }; \ template< __CLASS_IFC##N > \ @@ -67,15 +67,15 @@ class SAL_NO_VTABLE SAL_DLLPUBLIC_TEMPLATE WeakImplHelper##N \ { \ static class_data##N s_cd; \ public: \ - virtual css::uno::Any SAL_CALL queryInterface( css::uno::Type const & rType ) throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE \ + virtual css::uno::Any SAL_CALL queryInterface( css::uno::Type const & rType ) SAL_OVERRIDE \ { return WeakImplHelper_query( rType, (class_data *)&s_cd, this, static_cast<OWeakObject *>(this) ); } \ virtual void SAL_CALL acquire() throw () SAL_OVERRIDE \ { OWeakObject::acquire(); } \ virtual void SAL_CALL release() throw () SAL_OVERRIDE \ { OWeakObject::release(); } \ - virtual css::uno::Sequence< css::uno::Type > SAL_CALL getTypes() throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE \ + virtual css::uno::Sequence< css::uno::Type > SAL_CALL getTypes() SAL_OVERRIDE \ { return WeakImplHelper_getTypes( (class_data *)&s_cd ); } \ - virtual css::uno::Sequence< sal_Int8 > SAL_CALL getImplementationId() throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE \ + virtual css::uno::Sequence< sal_Int8 > SAL_CALL getImplementationId() SAL_OVERRIDE \ { return ImplHelper_getImplementationId( (class_data *)&s_cd ); } \ }; \ template< __CLASS_IFC##N > \ @@ -89,17 +89,17 @@ class SAL_NO_VTABLE SAL_DLLPUBLIC_TEMPLATE WeakAggImplHelper##N \ { \ static class_data##N s_cd; \ public: \ - virtual css::uno::Any SAL_CALL queryInterface( css::uno::Type const & rType ) throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE \ + virtual css::uno::Any SAL_CALL queryInterface( css::uno::Type const & rType ) SAL_OVERRIDE \ { return OWeakAggObject::queryInterface( rType ); } \ - virtual css::uno::Any SAL_CALL queryAggregation( css::uno::Type const & rType ) throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE \ + virtual css::uno::Any SAL_CALL queryAggregation( css::uno::Type const & rType ) SAL_OVERRIDE \ { return WeakAggImplHelper_queryAgg( rType, (class_data *)&s_cd, this, static_cast<OWeakAggObject *>(this) ); } \ virtual void SAL_CALL acquire() throw () SAL_OVERRIDE \ { OWeakAggObject::acquire(); } \ virtual void SAL_CALL release() throw () SAL_OVERRIDE \ { OWeakAggObject::release(); } \ - virtual css::uno::Sequence< css::uno::Type > SAL_CALL getTypes() throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE \ + virtual css::uno::Sequence< css::uno::Type > SAL_CALL getTypes() SAL_OVERRIDE \ { return WeakAggImplHelper_getTypes( (class_data *)&s_cd ); } \ - virtual css::uno::Sequence< sal_Int8 > SAL_CALL getImplementationId() throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE \ + virtual css::uno::Sequence< sal_Int8 > SAL_CALL getImplementationId() SAL_OVERRIDE \ { return ImplHelper_getImplementationId( (class_data *)&s_cd ); } \ }; \ template< __CLASS_IFC##N > \ @@ -112,7 +112,7 @@ class SAL_NO_VTABLE SAL_DLLPUBLIC_TEMPLATE ImplInheritanceHelper##N \ { \ static class_data##N s_cd; \ public: \ - virtual css::uno::Any SAL_CALL queryInterface( css::uno::Type const & rType ) throw (css::uno::RuntimeException) \ + virtual css::uno::Any SAL_CALL queryInterface( css::uno::Type const & rType ) \ { \ css::uno::Any aRet( ImplHelper_queryNoXInterface( rType, (class_data *)&s_cd, this ) ); \ if (aRet.hasValue()) \ @@ -123,9 +123,9 @@ public: \ { BaseClass::acquire(); } \ virtual void SAL_CALL release() throw () \ { BaseClass::release(); } \ - virtual css::uno::Sequence< css::uno::Type > SAL_CALL getTypes() throw (css::uno::RuntimeException) \ + virtual css::uno::Sequence< css::uno::Type > SAL_CALL getTypes() \ { return ImplInhHelper_getTypes( (class_data *)&s_cd, BaseClass::getTypes() ); } \ - virtual css::uno::Sequence< sal_Int8 > SAL_CALL getImplementationId() throw (css::uno::RuntimeException) \ + virtual css::uno::Sequence< sal_Int8 > SAL_CALL getImplementationId() \ { return ImplHelper_getImplementationId( (class_data *)&s_cd ); } \ }; \ template< class BaseClass, __CLASS_IFC##N > \ @@ -138,9 +138,9 @@ class SAL_NO_VTABLE SAL_DLLPUBLIC_TEMPLATE AggImplInheritanceHelper##N \ { \ static class_data##N s_cd; \ public: \ - virtual css::uno::Any SAL_CALL queryInterface( css::uno::Type const & rType ) throw (css::uno::RuntimeException) \ + virtual css::uno::Any SAL_CALL queryInterface( css::uno::Type const & rType ) \ { return BaseClass::queryInterface( rType ); } \ - virtual css::uno::Any SAL_CALL queryAggregation( css::uno::Type const & rType ) throw (css::uno::RuntimeException) \ + virtual css::uno::Any SAL_CALL queryAggregation( css::uno::Type const & rType ) \ { \ css::uno::Any aRet( ImplHelper_queryNoXInterface( rType, (class_data *)&s_cd, this ) ); \ if (aRet.hasValue()) \ @@ -151,9 +151,9 @@ public: \ { BaseClass::acquire(); } \ virtual void SAL_CALL release() throw () \ { BaseClass::release(); } \ - virtual css::uno::Sequence< css::uno::Type > SAL_CALL getTypes() throw (css::uno::RuntimeException) \ + virtual css::uno::Sequence< css::uno::Type > SAL_CALL getTypes() \ { return ImplInhHelper_getTypes( (class_data *)&s_cd, BaseClass::getTypes() ); } \ - virtual css::uno::Sequence< sal_Int8 > SAL_CALL getImplementationId() throw (css::uno::RuntimeException) \ + virtual css::uno::Sequence< sal_Int8 > SAL_CALL getImplementationId() \ { return ImplHelper_getImplementationId( (class_data *)&s_cd ); } \ }; \ template< class BaseClass, __CLASS_IFC##N > \ diff --git a/mysqlc/source/mysqlc_connection.cxx b/mysqlc/source/mysqlc_connection.cxx index 98b6d7b..8732d9d 100644 --- a/mysqlc/source/mysqlc_connection.cxx +++ b/mysqlc/source/mysqlc_connection.cxx @@ -86,7 +86,6 @@ void SAL_CALL OConnection::release() } void OConnection::construct(const rtl::OUString& url, const Sequence< PropertyValue >& info) - throw(SQLException) { MutexGuard aGuard(m_aMutex); @@ -198,13 +197,12 @@ void OConnection::construct(const rtl::OUString& url, const Sequence< PropertyVa stmt->executeUpdate("SET NAMES utf8"); } -rtl::OUString OConnection::getImplementationName() throw (css::uno::RuntimeException, std::exception) +rtl::OUString OConnection::getImplementationName() { return rtl::OUString("com.sun.star.sdbc.drivers.mysqlc.OConnection"); } css::uno::Sequence<rtl::OUString> OConnection::getSupportedServiceNames() - throw (css::uno::RuntimeException, std::exception) { css::uno::Sequence<rtl::OUString> s(1); s[0] = "com.sun.star.sdbc.Connection"; @@ -212,13 +210,11 @@ css::uno::Sequence<rtl::OUString> OConnection::getSupportedServiceNames() } sal_Bool OConnection::supportsService(rtl::OUString const & ServiceName) - throw (css::uno::RuntimeException, std::exception) { return cppu::supportsService(this, ServiceName); } Reference< XStatement > SAL_CALL OConnection::createStatement() - throw(SQLException, RuntimeException, std::exception) { MutexGuard aGuard(m_aMutex); checkDisposed(OConnection_BASE::rBHelper.bDisposed); @@ -237,7 +233,6 @@ Reference< XStatement > SAL_CALL OConnection::createStatement() } Reference< XPreparedStatement > SAL_CALL OConnection::prepareStatement(const rtl::OUString& _sSql) - throw(SQLException, RuntimeException, std::exception) { MutexGuard aGuard(m_aMutex); checkDisposed(OConnection_BASE::rBHelper.bDisposed); @@ -257,7 +252,6 @@ Reference< XPreparedStatement > SAL_CALL OConnection::prepareStatement(const rtl } Reference< XPreparedStatement > SAL_CALL OConnection::prepareCall(const rtl::OUString& /*_sSql*/ ) - throw(SQLException, RuntimeException, std::exception) { MutexGuard aGuard(m_aMutex); checkDisposed(OConnection_BASE::rBHelper.bDisposed); @@ -267,7 +261,6 @@ Reference< XPreparedStatement > SAL_CALL OConnection::prepareCall(const rtl::OUS } rtl::OUString SAL_CALL OConnection::nativeSQL(const rtl::OUString& _sSql) - throw(SQLException, RuntimeException, std::exception) { MutexGuard aGuard(m_aMutex); @@ -283,7 +276,6 @@ rtl::OUString SAL_CALL OConnection::nativeSQL(const rtl::OUString& _sSql) } void SAL_CALL OConnection::setAutoCommit(sal_Bool autoCommit) - throw(SQLException, RuntimeException, std::exception) { MutexGuard aGuard(m_aMutex); checkDisposed(OConnection_BASE::rBHelper.bDisposed); @@ -295,7 +287,6 @@ void SAL_CALL OConnection::setAutoCommit(sal_Bool autoCommit) } sal_Bool SAL_CALL OConnection::getAutoCommit() - throw(SQLException, RuntimeException, std::exception) { // you have to distinguish which if you are in autocommit mode or not // at normal case true should be fine here @@ -313,7 +304,6 @@ sal_Bool SAL_CALL OConnection::getAutoCommit() } void SAL_CALL OConnection::commit() - throw(SQLException, RuntimeException, std::exception) { MutexGuard aGuard(m_aMutex); checkDisposed(OConnection_BASE::rBHelper.bDisposed); @@ -325,7 +315,6 @@ void SAL_CALL OConnection::commit() } void SAL_CALL OConnection::rollback() - throw(SQLException, RuntimeException, std::exception) { MutexGuard aGuard(m_aMutex); checkDisposed(OConnection_BASE::rBHelper.bDisposed); @@ -337,7 +326,6 @@ void SAL_CALL OConnection::rollback() } sal_Bool SAL_CALL OConnection::isClosed() - throw(SQLException, RuntimeException, std::exception) { MutexGuard aGuard(m_aMutex); @@ -346,7 +334,6 @@ sal_Bool SAL_CALL OConnection::isClosed() } Reference< XDatabaseMetaData > SAL_CALL OConnection::getMetaData() - throw(SQLException, RuntimeException, std::exception) { MutexGuard aGuard(m_aMutex); checkDisposed(OConnection_BASE::rBHelper.bDisposed); @@ -365,7 +352,6 @@ Reference< XDatabaseMetaData > SAL_CALL OConnection::getMetaData() } void SAL_CALL OConnection::setReadOnly(sal_Bool readOnly) - throw(SQLException, RuntimeException, std::exception) { MutexGuard aGuard(m_aMutex); checkDisposed(OConnection_BASE::rBHelper.bDisposed); @@ -374,7 +360,6 @@ void SAL_CALL OConnection::setReadOnly(sal_Bool readOnly) } sal_Bool SAL_CALL OConnection::isReadOnly() - throw(SQLException, RuntimeException, std::exception) { MutexGuard aGuard(m_aMutex); checkDisposed(OConnection_BASE::rBHelper.bDisposed); @@ -384,7 +369,6 @@ sal_Bool SAL_CALL OConnection::isReadOnly() } void SAL_CALL OConnection::setCatalog(const rtl::OUString& catalog) - throw(SQLException, RuntimeException, std::exception) { MutexGuard aGuard(m_aMutex); checkDisposed(OConnection_BASE::rBHelper.bDisposed); @@ -398,7 +382,6 @@ void SAL_CALL OConnection::setCatalog(const rtl::OUString& catalog) } rtl::OUString SAL_CALL OConnection::getCatalog() - throw(SQLException, RuntimeException, std::exception) { MutexGuard aGuard(m_aMutex); checkDisposed(OConnection_BASE::rBHelper.bDisposed); @@ -413,7 +396,6 @@ rtl::OUString SAL_CALL OConnection::getCatalog() } void SAL_CALL OConnection::setTransactionIsolation(sal_Int32 level) - throw(SQLException, RuntimeException, std::exception) { MutexGuard aGuard(m_aMutex); checkDisposed(OConnection_BASE::rBHelper.bDisposed); @@ -447,7 +429,6 @@ void SAL_CALL OConnection::setTransactionIsolation(sal_Int32 level) } sal_Int32 SAL_CALL OConnection::getTransactionIsolation() - throw(SQLException, RuntimeException, std::exception) { MutexGuard aGuard(m_aMutex); checkDisposed(OConnection_BASE::rBHelper.bDisposed); @@ -468,7 +449,6 @@ sal_Int32 SAL_CALL OConnection::getTransactionIsolation() } Reference<XNameAccess> SAL_CALL OConnection::getTypeMap() - throw(SQLException, RuntimeException, std::exception) { MutexGuard aGuard(m_aMutex); checkDisposed(OConnection_BASE::rBHelper.bDisposed); @@ -478,7 +458,6 @@ Reference<XNameAccess> SAL_CALL OConnection::getTypeMap() } void SAL_CALL OConnection::setTypeMap(const Reference<XNameAccess >& typeMap) - throw(SQLException, RuntimeException, std::exception) { MutexGuard aGuard(m_aMutex); checkDisposed(OConnection_BASE::rBHelper.bDisposed); @@ -488,7 +467,6 @@ void SAL_CALL OConnection::setTypeMap(const Reference<XNameAccess >& typeMap) // XCloseable void SAL_CALL OConnection::close() - throw(SQLException, RuntimeException, std::exception) { /* we need block, because the mutex is a local variable, @@ -504,7 +482,6 @@ void SAL_CALL OConnection::close() // XWarningsSupplier Any SAL_CALL OConnection::getWarnings() - throw(SQLException, RuntimeException, std::exception) { Any x = Any(); // when you collected some warnings -> return it @@ -512,7 +489,6 @@ Any SAL_CALL OConnection::getWarnings() } void SAL_CALL OConnection::clearWarnings() - throw(SQLException, RuntimeException, std::exception) { // you should clear your collected warnings here# } @@ -538,7 +514,6 @@ void OConnection::disposing() } sal_Int32 OConnection::getMysqlVersion() - throw(SQLException, RuntimeException) { MutexGuard aGuard(m_aMutex); checkDisposed(OConnection_BASE::rBHelper.bDisposed); diff --git a/mysqlc/source/mysqlc_connection.hxx b/mysqlc/source/mysqlc_connection.hxx index 5f1a6a3..4d2d74f 100644 --- a/mysqlc/source/mysqlc_connection.hxx +++ b/mysqlc/source/mysqlc_connection.hxx @@ -110,11 +110,12 @@ namespace connectivity bool m_bClosed; public: - sal_Int32 getMysqlVersion() - throw(SQLException, RuntimeException); + /// @throws SQLException + /// @throws RuntimeException + sal_Int32 getMysqlVersion(); - void construct(const rtl::OUString& url,const css::uno::Sequence< css::beans::PropertyValue >& info) - throw(SQLException); + /// @throws SQLException + void construct(const rtl::OUString& url,const css::uno::Sequence< css::beans::PropertyValue >& info); OConnection(MysqlCDriver& _rDriver, sql::Driver * cppDriver); virtual ~OConnection(); @@ -129,79 +130,57 @@ namespace connectivity virtual void SAL_CALL release() throw() SAL_OVERRIDE; // XServiceInfo - virtual rtl::OUString SAL_CALL getImplementationName() - throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual rtl::OUString SAL_CALL getImplementationName() SAL_OVERRIDE; virtual sal_Bool SAL_CALL supportsService( - rtl::OUString const & ServiceName) throw (css::uno::RuntimeException, std::exception) + rtl::OUString const & ServiceName) SAL_OVERRIDE; virtual css::uno::Sequence<rtl::OUString> SAL_CALL - getSupportedServiceNames() throw (css::uno::RuntimeException, std::exception) + getSupportedServiceNames() SAL_OVERRIDE; // XConnection - css::uno::Reference< css::sdbc::XStatement > SAL_CALL createStatement() - throw(SQLException, RuntimeException, std::exception) SAL_OVERRIDE; + css::uno::Reference< css::sdbc::XStatement > SAL_CALL createStatement() SAL_OVERRIDE; - css::uno::Reference< css::sdbc::XPreparedStatement > SAL_CALL prepareStatement(const rtl::OUString& sql) - throw(SQLException, RuntimeException, std::exception) SAL_OVERRIDE; + css::uno::Reference< css::sdbc::XPreparedStatement > SAL_CALL prepareStatement(const rtl::OUString& sql) SAL_OVERRIDE; - css::uno::Reference< css::sdbc::XPreparedStatement > SAL_CALL prepareCall(const rtl::OUString& sql) - throw(SQLException, RuntimeException, std::exception) SAL_OVERRIDE; + css::uno::Reference< css::sdbc::XPreparedStatement > SAL_CALL prepareCall(const rtl::OUString& sql) SAL_OVERRIDE; - rtl::OUString SAL_CALL nativeSQL(const rtl::OUString& sql) - throw(SQLException, RuntimeException, std::exception) SAL_OVERRIDE; + rtl::OUString SAL_CALL nativeSQL(const rtl::OUString& sql) SAL_OVERRIDE; - void SAL_CALL setAutoCommit(sal_Bool autoCommit) - throw(SQLException, RuntimeException, std::exception) SAL_OVERRIDE; + void SAL_CALL setAutoCommit(sal_Bool autoCommit) SAL_OVERRIDE; - sal_Bool SAL_CALL getAutoCommit() - throw(SQLException, RuntimeException, std::exception) SAL_OVERRIDE; + sal_Bool SAL_CALL getAutoCommit() SAL_OVERRIDE; - void SAL_CALL commit() - throw(SQLException, RuntimeException, std::exception) SAL_OVERRIDE; + void SAL_CALL commit() SAL_OVERRIDE; - void SAL_CALL rollback() - throw(SQLException, RuntimeException, std::exception) SAL_OVERRIDE; + void SAL_CALL rollback() SAL_OVERRIDE; - sal_Bool SAL_CALL isClosed() - throw(SQLException, RuntimeException, std::exception) SAL_OVERRIDE; + sal_Bool SAL_CALL isClosed() SAL_OVERRIDE; - css::uno::Reference< css::sdbc::XDatabaseMetaData > SAL_CALL getMetaData() - throw(SQLException, RuntimeException, std::exception) SAL_OVERRIDE; + css::uno::Reference< css::sdbc::XDatabaseMetaData > SAL_CALL getMetaData() SAL_OVERRIDE; - void SAL_CALL setReadOnly(sal_Bool readOnly) - throw(SQLException, RuntimeException, std::exception) SAL_OVERRIDE; + void SAL_CALL setReadOnly(sal_Bool readOnly) SAL_OVERRIDE; - sal_Bool SAL_CALL isReadOnly() - throw(SQLException, RuntimeException, std::exception) SAL_OVERRIDE; + sal_Bool SAL_CALL isReadOnly() SAL_OVERRIDE; - void SAL_CALL setCatalog(const rtl::OUString& catalog) - throw(SQLException, RuntimeException, std::exception) SAL_OVERRIDE; + void SAL_CALL setCatalog(const rtl::OUString& catalog) SAL_OVERRIDE; - rtl::OUString SAL_CALL getCatalog() - throw(SQLException, RuntimeException, std::exception) SAL_OVERRIDE; + rtl::OUString SAL_CALL getCatalog() SAL_OVERRIDE; - void SAL_CALL setTransactionIsolation(sal_Int32 level) - throw(SQLException, RuntimeException, std::exception) SAL_OVERRIDE; + void SAL_CALL setTransactionIsolation(sal_Int32 level) SAL_OVERRIDE; - sal_Int32 SAL_CALL getTransactionIsolation() - throw(SQLException, RuntimeException, std::exception) SAL_OVERRIDE; + sal_Int32 SAL_CALL getTransactionIsolation() SAL_OVERRIDE; - my_XNameAccessRef SAL_CALL getTypeMap() - throw(SQLException, RuntimeException, std::exception) SAL_OVERRIDE; + my_XNameAccessRef SAL_CALL getTypeMap() SAL_OVERRIDE; - void SAL_CALL setTypeMap(const my_XNameAccessRef& typeMap) - throw(SQLException, RuntimeException, std::exception) SAL_OVERRIDE; + void SAL_CALL setTypeMap(const my_XNameAccessRef& typeMap) SAL_OVERRIDE; // XCloseable - void SAL_CALL close() - throw(SQLException, RuntimeException, std::exception) SAL_OVERRIDE; + void SAL_CALL close() SAL_OVERRIDE; // XWarningsSupplier - css::uno::Any SAL_CALL getWarnings() - throw(SQLException, RuntimeException, std::exception) SAL_OVERRIDE; - void SAL_CALL clearWarnings() - throw(SQLException, RuntimeException, std::exception) SAL_OVERRIDE; + css::uno::Any SAL_CALL getWarnings() SAL_OVERRIDE; + void SAL_CALL clearWarnings() SAL_OVERRIDE; // TODO: Not used //sal_Int32 sdbcColumnType(rtl::OUString typeName); diff --git a/mysqlc/source/mysqlc_databasemetadata.cxx b/mysqlc/source/mysqlc_databasemetadata.cxx index bc07e9a..b5bb7dd 100644 --- a/mysqlc/source/mysqlc_databasemetadata.cxx +++ b/mysqlc/source/mysqlc_databasemetadata.cxx @@ -178,157 +178,131 @@ bool ODatabaseMetaData::impl_getRSTypeMetaData(const sal_Char* _methodName, bool } rtl::OUString SAL_CALL ODatabaseMetaData::getCatalogSeparator() - throw(SQLException, RuntimeException, std::exception) { return impl_getStringMetaData("getCatalogSeparator", &sql::DatabaseMetaData::getCatalogSeparator); } sal_Int32 SAL_CALL ODatabaseMetaData::getMaxBinaryLiteralLength() - throw(SQLException, RuntimeException, std::exception) { return impl_getInt32MetaData("getMaxBinaryLiteralLength", &sql::DatabaseMetaData::getMaxBinaryLiteralLength); } sal_Int32 SAL_CALL ODatabaseMetaData::getMaxRowSize() - throw(SQLException, RuntimeException, std::exception) { return impl_getInt32MetaData("getMaxRowSize", &sql::DatabaseMetaData::getMaxRowSize); } sal_Int32 SAL_CALL ODatabaseMetaData::getMaxCatalogNameLength() - throw(SQLException, RuntimeException, std::exception) { return impl_getInt32MetaData("getMaxCatalogNameLength", &sql::DatabaseMetaData::getMaxCatalogNameLength); } sal_Int32 SAL_CALL ODatabaseMetaData::getMaxCharLiteralLength() - throw(SQLException, RuntimeException, std::exception) { return impl_getInt32MetaData("getMaxCharLiteralLength", &sql::DatabaseMetaData::getMaxCharLiteralLength); } sal_Int32 SAL_CALL ODatabaseMetaData::getMaxColumnNameLength() - throw(SQLException, RuntimeException, std::exception) { return impl_getInt32MetaData("getMaxColumnNameLength", &sql::DatabaseMetaData::getMaxColumnNameLength); } sal_Int32 SAL_CALL ODatabaseMetaData::getMaxColumnsInIndex() - throw(SQLException, RuntimeException, std::exception) { return impl_getInt32MetaData("getMaxColumnsInIndex", &sql::DatabaseMetaData::getMaxColumnsInIndex); } sal_Int32 SAL_CALL ODatabaseMetaData::getMaxCursorNameLength() - throw(SQLException, RuntimeException, std::exception) { return impl_getInt32MetaData("getMaxCursorNameLength", &sql::DatabaseMetaData::getMaxCursorNameLength); } sal_Int32 SAL_CALL ODatabaseMetaData::getMaxConnections() - throw(SQLException, RuntimeException, std::exception) { return impl_getInt32MetaData("getMaxConnections", &sql::DatabaseMetaData::getMaxConnections); } sal_Int32 SAL_CALL ODatabaseMetaData::getMaxColumnsInTable() - throw(SQLException, RuntimeException, std::exception) { return impl_getInt32MetaData("getMaxColumnsInTable", &sql::DatabaseMetaData::getMaxColumnsInTable); } sal_Int32 SAL_CALL ODatabaseMetaData::getMaxStatementLength() - throw(SQLException, RuntimeException, std::exception) { return impl_getInt32MetaData("getMaxStatementLength", &sql::DatabaseMetaData::getMaxStatementLength); } sal_Int32 SAL_CALL ODatabaseMetaData::getMaxTableNameLength() - throw(SQLException, RuntimeException, std::exception) { return impl_getInt32MetaData("getMaxTableNameLength", &sql::DatabaseMetaData::getMaxTableNameLength); } sal_Int32 SAL_CALL ODatabaseMetaData::getMaxTablesInSelect() - throw(SQLException, RuntimeException, std::exception) { return impl_getInt32MetaData("getMaxTablesInSelect", &sql::DatabaseMetaData::getMaxTablesInSelect); } sal_Bool SAL_CALL ODatabaseMetaData::doesMaxRowSizeIncludeBlobs() - throw(SQLException, RuntimeException, std::exception) { return impl_getBoolMetaData("doesMaxRowSizeIncludeBlobs", &sql::DatabaseMetaData::doesMaxRowSizeIncludeBlobs); } sal_Bool SAL_CALL ODatabaseMetaData::storesLowerCaseQuotedIdentifiers() - throw(SQLException, RuntimeException, std::exception) { return impl_getBoolMetaData("storesLowerCaseQuotedIdentifiers", &sql::DatabaseMetaData::storesLowerCaseQuotedIdentifiers); } sal_Bool SAL_CALL ODatabaseMetaData::storesLowerCaseIdentifiers() - throw(SQLException, RuntimeException, std::exception) { return impl_getBoolMetaData("storesLowerCaseIdentifiers", &sql::DatabaseMetaData::storesLowerCaseIdentifiers); } sal_Bool SAL_CALL ODatabaseMetaData::storesMixedCaseQuotedIdentifiers() - throw(SQLException, RuntimeException, std::exception) { return impl_getBoolMetaData("storesMixedCaseQuotedIdentifiers", &sql::DatabaseMetaData::storesMixedCaseQuotedIdentifiers); } sal_Bool SAL_CALL ODatabaseMetaData::storesMixedCaseIdentifiers() - throw(SQLException, RuntimeException, std::exception) { return impl_getBoolMetaData("storesMixedCaseIdentifiers", &sql::DatabaseMetaData::storesMixedCaseIdentifiers); } sal_Bool SAL_CALL ODatabaseMetaData::storesUpperCaseQuotedIdentifiers() - throw(SQLException, RuntimeException, std::exception) { return impl_getBoolMetaData("storesUpperCaseQuotedIdentifiers", &sql::DatabaseMetaData::storesUpperCaseQuotedIdentifiers); } sal_Bool SAL_CALL ODatabaseMetaData::storesUpperCaseIdentifiers() - throw(SQLException, RuntimeException, std::exception) { return impl_getBoolMetaData("storesUpperCaseIdentifiers", &sql::DatabaseMetaData::storesUpperCaseIdentifiers); } sal_Bool SAL_CALL ODatabaseMetaData::supportsAlterTableWithAddColumn() - throw(SQLException, RuntimeException, std::exception) { return impl_getBoolMetaData("supportsAlterTableWithAddColumn", &sql::DatabaseMetaData::supportsAlterTableWithAddColumn); } sal_Bool SAL_CALL ODatabaseMetaData::supportsAlterTableWithDropColumn() - throw(SQLException, RuntimeException, std::exception) { return impl_getBoolMetaData("supportsAlterTableWithDropColumn", &sql::DatabaseMetaData::supportsAlterTableWithDropColumn); } sal_Int32 SAL_CALL ODatabaseMetaData::getMaxIndexLength() - throw(SQLException, RuntimeException, std::exception) { return impl_getInt32MetaData("getMaxIndexLength", &sql::DatabaseMetaData::getMaxIndexLength); } sal_Bool SAL_CALL ODatabaseMetaData::supportsNonNullableColumns() - throw(SQLException, RuntimeException, std::exception) { return impl_getBoolMetaData("supportsNonNullableColumns", &sql::DatabaseMetaData::supportsNonNullableColumns); } rtl::OUString SAL_CALL ODatabaseMetaData::getCatalogTerm() - throw(SQLException, RuntimeException, std::exception) { return impl_getStringMetaData("getCatalogTerm", &sql::DatabaseMetaData::getCatalogTerm); } rtl::OUString SAL_CALL ODatabaseMetaData::getIdentifierQuoteString() - throw(SQLException, RuntimeException, std::exception) { if (!identifier_quote_string_set) { identifier_quote_string = impl_getStringMetaData("getIdentifierQuoteString", &sql::DatabaseMetaData::getIdentifierQuoteString); @@ -338,241 +312,201 @@ rtl::OUString SAL_CALL ODatabaseMetaData::getIdentifierQuoteString() } rtl::OUString SAL_CALL ODatabaseMetaData::getExtraNameCharacters() - throw(SQLException, RuntimeException, std::exception) { return impl_getStringMetaData("getExtraNameCharacters", &sql::DatabaseMetaData::getExtraNameCharacters); } sal_Bool SAL_CALL ODatabaseMetaData::supportsDifferentTableCorrelationNames() - throw(SQLException, RuntimeException, std::exception) { return impl_getBoolMetaData("supportsDifferentTableCorrelationNames", &sql::DatabaseMetaData::supportsDifferentTableCorrelationNames); } sal_Bool SAL_CALL ODatabaseMetaData::isCatalogAtStart() - throw(SQLException, RuntimeException, std::exception) { return impl_getBoolMetaData("isCatalogAtStart", &sql::DatabaseMetaData::isCatalogAtStart); } sal_Bool SAL_CALL ODatabaseMetaData::dataDefinitionIgnoredInTransactions() - throw(SQLException, RuntimeException, std::exception) { return impl_getBoolMetaData("dataDefinitionIgnoredInTransactions", &sql::DatabaseMetaData::dataDefinitionIgnoredInTransactions); } sal_Bool SAL_CALL ODatabaseMetaData::dataDefinitionCausesTransactionCommit() - throw(SQLException, RuntimeException, std::exception) { return impl_getBoolMetaData("dataDefinitionCausesTransactionCommit", &sql::DatabaseMetaData::dataDefinitionCausesTransactionCommit); } sal_Bool SAL_CALL ODatabaseMetaData::supportsDataManipulationTransactionsOnly() - throw(SQLException, RuntimeException, std::exception) { return impl_getBoolMetaData("supportsDataManipulationTransactionsOnly", &sql::DatabaseMetaData::supportsDataManipulationTransactionsOnly); } sal_Bool SAL_CALL ODatabaseMetaData::supportsDataDefinitionAndDataManipulationTransactions() - throw(SQLException, RuntimeException, std::exception) { return impl_getBoolMetaData("supportsDataDefinitionAndDataManipulationTransactions", &sql::DatabaseMetaData::supportsDataDefinitionAndDataManipulationTransactions); } sal_Bool SAL_CALL ODatabaseMetaData::supportsPositionedDelete() - throw(SQLException, RuntimeException, std::exception) { return impl_getBoolMetaData("supportsPositionedDelete", &sql::DatabaseMetaData::supportsPositionedDelete); } sal_Bool SAL_CALL ODatabaseMetaData::supportsPositionedUpdate() - throw(SQLException, RuntimeException, std::exception) { return impl_getBoolMetaData("supportsPositionedUpdate", &sql::DatabaseMetaData::supportsPositionedUpdate); } sal_Bool SAL_CALL ODatabaseMetaData::supportsOpenStatementsAcrossRollback() - throw(SQLException, RuntimeException, std::exception) { return impl_getBoolMetaData("supportsOpenStatementsAcrossRollback", &sql::DatabaseMetaData::supportsOpenStatementsAcrossRollback); } sal_Bool SAL_CALL ODatabaseMetaData::supportsOpenStatementsAcrossCommit() - throw(SQLException, RuntimeException, std::exception) { return impl_getBoolMetaData("supportsOpenStatementsAcrossCommit", &sql::DatabaseMetaData::supportsOpenStatementsAcrossCommit); } sal_Bool SAL_CALL ODatabaseMetaData::supportsOpenCursorsAcrossCommit() - throw(SQLException, RuntimeException, std::exception) { return impl_getBoolMetaData("supportsOpenCursorsAcrossCommit", &sql::DatabaseMetaData::supportsOpenCursorsAcrossCommit); } sal_Bool SAL_CALL ODatabaseMetaData::supportsOpenCursorsAcrossRollback() - throw(SQLException, RuntimeException, std::exception) { return impl_getBoolMetaData("supportsOpenCursorsAcrossRollback", &sql::DatabaseMetaData::supportsOpenCursorsAcrossRollback); } sal_Bool SAL_CALL ODatabaseMetaData::supportsTransactionIsolationLevel(sal_Int32 level) - throw(SQLException, RuntimeException, std::exception) { return impl_getBoolMetaData("supportsTransactionIsolationLevel", &sql::DatabaseMetaData::supportsTransactionIsolationLevel, level); } sal_Bool SAL_CALL ODatabaseMetaData::supportsSchemasInDataManipulation() - throw(SQLException, RuntimeException, std::exception) { return impl_getBoolMetaData("supportsSchemasInDataManipulation", &sql::DatabaseMetaData::supportsSchemasInDataManipulation); } sal_Bool SAL_CALL ODatabaseMetaData::supportsANSI92FullSQL() - throw(SQLException, RuntimeException, std::exception) { return impl_getBoolMetaData("supportsANSI92FullSQL", &sql::DatabaseMetaData::supportsANSI92FullSQL); } sal_Bool SAL_CALL ODatabaseMetaData::supportsANSI92EntryLevelSQL() - throw(SQLException, RuntimeException, std::exception) { return impl_getBoolMetaData("supportsANSI92EntryLevelSQL", &sql::DatabaseMetaData::supportsANSI92EntryLevelSQL); } sal_Bool SAL_CALL ODatabaseMetaData::supportsIntegrityEnhancementFacility() - throw(SQLException, RuntimeException, std::exception) { return impl_getBoolMetaData("supportsIntegrityEnhancementFacility", &sql::DatabaseMetaData::supportsIntegrityEnhancementFacility); } sal_Bool SAL_CALL ODatabaseMetaData::supportsSchemasInIndexDefinitions() - throw(SQLException, RuntimeException, std::exception) { return impl_getBoolMetaData("supportsSchemasInIndexDefinitions", &sql::DatabaseMetaData::supportsSchemasInIndexDefinitions); } sal_Bool SAL_CALL ODatabaseMetaData::supportsSchemasInTableDefinitions() - throw(SQLException, RuntimeException, std::exception) { return impl_getBoolMetaData("supportsSchemasInTableDefinitions", &sql::DatabaseMetaData::supportsSchemasInTableDefinitions); } sal_Bool SAL_CALL ODatabaseMetaData::supportsCatalogsInTableDefinitions() - throw(SQLException, RuntimeException, std::exception) { return impl_getBoolMetaData("supportsCatalogsInTableDefinitions", &sql::DatabaseMetaData::supportsCatalogsInTableDefinitions); } sal_Bool SAL_CALL ODatabaseMetaData::supportsCatalogsInIndexDefinitions() - throw(SQLException, RuntimeException, std::exception) { return impl_getBoolMetaData("supportsCatalogsInIndexDefinitions", &sql::DatabaseMetaData::supportsCatalogsInIndexDefinitions); } sal_Bool SAL_CALL ODatabaseMetaData::supportsCatalogsInDataManipulation() - throw(SQLException, RuntimeException, std::exception) { return impl_getBoolMetaData("supportsCatalogsInDataManipulation", &sql::DatabaseMetaData::supportsCatalogsInDataManipulation); } sal_Bool SAL_CALL ODatabaseMetaData::supportsOuterJoins() - throw(SQLException, RuntimeException, std::exception) { return impl_getBoolMetaData("supportsOuterJoins", &sql::DatabaseMetaData::supportsOuterJoins); } sal_Int32 SAL_CALL ODatabaseMetaData::getMaxStatements() - throw(SQLException, RuntimeException, std::exception) { return impl_getInt32MetaData("getMaxStatements", &sql::DatabaseMetaData::getMaxStatements); } sal_Int32 SAL_CALL ODatabaseMetaData::getMaxProcedureNameLength() - throw(SQLException, RuntimeException, std::exception) { return impl_getInt32MetaData("getMaxProcedureNameLength", &sql::DatabaseMetaData::getMaxProcedureNameLength); } sal_Int32 SAL_CALL ODatabaseMetaData::getMaxSchemaNameLength() - throw(SQLException, RuntimeException, std::exception) { return impl_getInt32MetaData("getMaxSchemaNameLength", &sql::DatabaseMetaData::getMaxSchemaNameLength); } sal_Bool SAL_CALL ODatabaseMetaData::supportsTransactions() - throw(SQLException, RuntimeException, std::exception) { return impl_getBoolMetaData("supportsTransactions", &sql::DatabaseMetaData::supportsTransactions); } sal_Bool SAL_CALL ODatabaseMetaData::allProceduresAreCallable() - throw(SQLException, RuntimeException, std::exception) { return impl_getBoolMetaData("allProceduresAreCallable", &sql::DatabaseMetaData::allProceduresAreCallable); } sal_Bool SAL_CALL ODatabaseMetaData::supportsStoredProcedures() - throw(SQLException, RuntimeException, std::exception) { return impl_getBoolMetaData("supportsStoredProcedures", &sql::DatabaseMetaData::supportsStoredProcedures); } sal_Bool SAL_CALL ODatabaseMetaData::supportsSelectForUpdate() - throw(SQLException, RuntimeException, std::exception) { return impl_getBoolMetaData("supportsSelectForUpdate", &sql::DatabaseMetaData::supportsSelectForUpdate); } sal_Bool SAL_CALL ODatabaseMetaData::allTablesAreSelectable() - throw(SQLException, RuntimeException, std::exception) { return impl_getBoolMetaData("allTablesAreSelectable", &sql::DatabaseMetaData::allTablesAreSelectable); } sal_Bool SAL_CALL ODatabaseMetaData::isReadOnly() - throw(SQLException, RuntimeException, std::exception) { return impl_getBoolMetaData("isReadOnly", &sql::DatabaseMetaData::isReadOnly); } sal_Bool SAL_CALL ODatabaseMetaData::usesLocalFiles() - throw(SQLException, RuntimeException, std::exception) { return impl_getBoolMetaData("usesLocalFiles", &sql::DatabaseMetaData::usesLocalFiles); } sal_Bool SAL_CALL ODatabaseMetaData::usesLocalFilePerTable() - throw(SQLException, RuntimeException, std::exception) { return impl_getBoolMetaData("usesLocalFilePerTable", &sql::DatabaseMetaData::usesLocalFilePerTable); } sal_Bool SAL_CALL ODatabaseMetaData::supportsTypeConversion() - throw(SQLException, RuntimeException, std::exception) { return impl_getBoolMetaData("supportsTypeConversion", &sql::DatabaseMetaData::supportsTypeConversion); } sal_Bool SAL_CALL ODatabaseMetaData::nullPlusNonNullIsNull() - throw(SQLException, RuntimeException, std::exception) { return impl_getBoolMetaData("nullPlusNonNullIsNull", &sql::DatabaseMetaData::nullPlusNonNullIsNull); } sal_Bool SAL_CALL ODatabaseMetaData::supportsColumnAliasing() - throw(SQLException, RuntimeException, std::exception) { return impl_getBoolMetaData("supportsColumnAliasing", &sql::DatabaseMetaData::supportsColumnAliasing); } sal_Bool SAL_CALL ODatabaseMetaData::supportsTableCorrelationNames() - throw(SQLException, RuntimeException, std::exception) { return impl_getBoolMetaData("supportsTableCorrelationNames", &sql::DatabaseMetaData::supportsTableCorrelationNames); } sal_Bool SAL_CALL ODatabaseMetaData::supportsConvert(sal_Int32 /* fromType */, sal_Int32 /* toType */) - throw(SQLException, RuntimeException, std::exception) { try { /* ToDo -> use supportsConvert( fromType, toType) */ @@ -588,218 +522,182 @@ sal_Bool SAL_CALL ODatabaseMetaData::supportsConvert(sal_Int32 /* fromType */, s } sal_Bool SAL_CALL ODatabaseMetaData::supportsExpressionsInOrderBy() - throw(SQLException, RuntimeException, std::exception) { return impl_getBoolMetaData("supportsExpressionsInOrderBy", &sql::DatabaseMetaData::supportsExpressionsInOrderBy); } sal_Bool SAL_CALL ODatabaseMetaData::supportsGroupBy() - throw(SQLException, RuntimeException, std::exception) { return impl_getBoolMetaData("supportsGroupBy", &sql::DatabaseMetaData::supportsGroupBy); } sal_Bool SAL_CALL ODatabaseMetaData::supportsGroupByBeyondSelect() - throw(SQLException, RuntimeException, std::exception) { return impl_getBoolMetaData("supportsGroupByBeyondSelect", &sql::DatabaseMetaData::supportsGroupByBeyondSelect); } sal_Bool SAL_CALL ODatabaseMetaData::supportsGroupByUnrelated() - throw(SQLException, RuntimeException, std::exception) { return impl_getBoolMetaData("supportsGroupByUnrelated", &sql::DatabaseMetaData::supportsGroupByUnrelated); } sal_Bool SAL_CALL ODatabaseMetaData::supportsMultipleTransactions() - throw(SQLException, RuntimeException, std::exception) { return impl_getBoolMetaData("supportsMultipleTransactions", &sql::DatabaseMetaData::supportsMultipleTransactions); } sal_Bool SAL_CALL ODatabaseMetaData::supportsMultipleResultSets() - throw(SQLException, RuntimeException, std::exception) { return impl_getBoolMetaData("supportsMultipleResultSets", &sql::DatabaseMetaData::supportsMultipleResultSets); } sal_Bool SAL_CALL ODatabaseMetaData::supportsLikeEscapeClause() - throw(SQLException, RuntimeException, std::exception) { return impl_getBoolMetaData("supportsLikeEscapeClause", &sql::DatabaseMetaData::supportsLikeEscapeClause); } sal_Bool SAL_CALL ODatabaseMetaData::supportsOrderByUnrelated() - throw(SQLException, RuntimeException, std::exception) { return impl_getBoolMetaData("supportsOrderByUnrelated", &sql::DatabaseMetaData::supportsOrderByUnrelated); } sal_Bool SAL_CALL ODatabaseMetaData::supportsUnion() - throw(SQLException, RuntimeException, std::exception) { return impl_getBoolMetaData("supportsUnion", &sql::DatabaseMetaData::supportsUnion); } sal_Bool SAL_CALL ODatabaseMetaData::supportsUnionAll() - throw(SQLException, RuntimeException, std::exception) { return impl_getBoolMetaData("supportsUnionAll", &sql::DatabaseMetaData::supportsUnionAll); } sal_Bool SAL_CALL ODatabaseMetaData::supportsMixedCaseIdentifiers() - throw(SQLException, RuntimeException, std::exception) { return impl_getBoolMetaData("supportsMixedCaseIdentifiers", &sql::DatabaseMetaData::supportsMixedCaseIdentifiers); } sal_Bool SAL_CALL ODatabaseMetaData::supportsMixedCaseQuotedIdentifiers() - throw(SQLException, RuntimeException, std::exception) { return impl_getBoolMetaData("supportsMixedCaseQuotedIdentifiers", &sql::DatabaseMetaData::supportsMixedCaseQuotedIdentifiers); } sal_Bool SAL_CALL ODatabaseMetaData::nullsAreSortedAtEnd() - throw(SQLException, RuntimeException, std::exception) { return impl_getBoolMetaData("nullsAreSortedAtEnd", &sql::DatabaseMetaData::nullsAreSortedAtEnd); } sal_Bool SAL_CALL ODatabaseMetaData::nullsAreSortedAtStart() - throw(SQLException, RuntimeException, std::exception) { return impl_getBoolMetaData("nullsAreSortedAtStart", &sql::DatabaseMetaData::nullsAreSortedAtStart); } sal_Bool SAL_CALL ODatabaseMetaData::nullsAreSortedHigh() - throw(SQLException, RuntimeException, std::exception) { return impl_getBoolMetaData("nullsAreSortedHigh", &sql::DatabaseMetaData::nullsAreSortedHigh); } sal_Bool SAL_CALL ODatabaseMetaData::nullsAreSortedLow() - throw(SQLException, RuntimeException, std::exception) { return impl_getBoolMetaData("nullsAreSortedLow", &sql::DatabaseMetaData::nullsAreSortedLow); } sal_Bool SAL_CALL ODatabaseMetaData::supportsSchemasInProcedureCalls() - throw(SQLException, RuntimeException, std::exception) { return impl_getBoolMetaData("supportsSchemasInProcedureCalls", &sql::DatabaseMetaData::supportsSchemasInProcedureCalls); } sal_Bool SAL_CALL ODatabaseMetaData::supportsSchemasInPrivilegeDefinitions() - throw(SQLException, RuntimeException, std::exception) { return impl_getBoolMetaData("supportsSchemasInPrivilegeDefinitions", &sql::DatabaseMetaData::supportsSchemasInPrivilegeDefinitions); } sal_Bool SAL_CALL ODatabaseMetaData::supportsCatalogsInProcedureCalls() - throw(SQLException, RuntimeException, std::exception) { return impl_getBoolMetaData("supportsCatalogsInProcedureCalls", &sql::DatabaseMetaData::supportsCatalogsInProcedureCalls); } sal_Bool SAL_CALL ODatabaseMetaData::supportsCatalogsInPrivilegeDefinitions() - throw(SQLException, RuntimeException, std::exception) { return impl_getBoolMetaData("supportsCatalogsInPrivilegeDefinitions", &sql::DatabaseMetaData::supportsCatalogsInPrivilegeDefinitions); } sal_Bool SAL_CALL ODatabaseMetaData::supportsCorrelatedSubqueries() - throw(SQLException, RuntimeException, std::exception) { return impl_getBoolMetaData("supportsCorrelatedSubqueries", &sql::DatabaseMetaData::supportsCorrelatedSubqueries); } sal_Bool SAL_CALL ODatabaseMetaData::supportsSubqueriesInComparisons() - throw(SQLException, RuntimeException, std::exception) { return impl_getBoolMetaData("supportsSubqueriesInComparisons", &sql::DatabaseMetaData::supportsSubqueriesInComparisons); } sal_Bool SAL_CALL ODatabaseMetaData::supportsSubqueriesInExists() - throw(SQLException, RuntimeException, std::exception) { return impl_getBoolMetaData("supportsSubqueriesInExists", &sql::DatabaseMetaData::supportsSubqueriesInExists); } sal_Bool SAL_CALL ODatabaseMetaData::supportsSubqueriesInIns() - throw(SQLException, RuntimeException, std::exception) { return impl_getBoolMetaData("supportsSubqueriesInIns", &sql::DatabaseMetaData::supportsSubqueriesInIns); } sal_Bool SAL_CALL ODatabaseMetaData::supportsSubqueriesInQuantifieds() - throw(SQLException, RuntimeException, std::exception) { return impl_getBoolMetaData("supportsSubqueriesInQuantifieds", &sql::DatabaseMetaData::supportsSubqueriesInQuantifieds); } sal_Bool SAL_CALL ODatabaseMetaData::supportsANSI92IntermediateSQL() - throw(SQLException, RuntimeException, std::exception) { return impl_getBoolMetaData("supportsANSI92IntermediateSQL", &sql::DatabaseMetaData::supportsANSI92IntermediateSQL); } rtl::OUString SAL_CALL ODatabaseMetaData::getURL() - throw(SQLException, RuntimeException, std::exception) { return m_rConnection.getConnectionSettings().connectionURL; } rtl::OUString SAL_CALL ODatabaseMetaData::getUserName() - throw(SQLException, RuntimeException, std::exception) { return impl_getStringMetaData("getUserName", &sql::DatabaseMetaData::getUserName); } rtl::OUString SAL_CALL ODatabaseMetaData::getDriverName() - throw(SQLException, RuntimeException, std::exception) { rtl::OUString aValue( "MySQL Connector/OO.org" ); return aValue; } rtl::OUString SAL_CALL ODatabaseMetaData::getDriverVersion() - throw(SQLException, RuntimeException, std::exception) { return rtl::OUString( "0.9.2" ); } rtl::OUString SAL_CALL ODatabaseMetaData::getDatabaseProductVersion() - throw(SQLException, RuntimeException, std::exception) { return impl_getStringMetaData("getDatabaseProductVersion", &sql::DatabaseMetaData::getDatabaseProductVersion); } rtl::OUString SAL_CALL ODatabaseMetaData::getDatabaseProductName() - throw(SQLException, RuntimeException, std::exception) { return impl_getStringMetaData("getDatabaseProductName", &sql::DatabaseMetaData::getDatabaseProductName); } rtl::OUString SAL_CALL ODatabaseMetaData::getProcedureTerm() - throw(SQLException, RuntimeException, std::exception) { return impl_getStringMetaData("getProcedureTerm", &sql::DatabaseMetaData::getProcedureTerm); } rtl::OUString SAL_CALL ODatabaseMetaData::getSchemaTerm() - throw(SQLException, RuntimeException, std::exception) { return impl_getStringMetaData("getSchemaTerm", &sql::DatabaseMetaData::getSchemaTerm); } sal_Int32 SAL_CALL ODatabaseMetaData::getDriverMajorVersion() - throw(RuntimeException, std::exception) { return MARIADBC_VERSION_MAJOR; } sal_Int32 SAL_CALL ODatabaseMetaData::getDefaultTransactionIsolation() - throw(SQLException, RuntimeException, std::exception) { try { switch (meta->getDefaultTransactionIsolation()) { @@ -819,109 +717,91 @@ sal_Int32 SAL_CALL ODatabaseMetaData::getDefaultTransactionIsolation() } sal_Int32 SAL_CALL ODatabaseMetaData::getDriverMinorVersion() - throw(RuntimeException, std::exception) { return MARIADBC_VERSION_MINOR; } rtl::OUString SAL_CALL ODatabaseMetaData::getSQLKeywords() - throw(SQLException, RuntimeException, std::exception) { return impl_getStringMetaData("getSQLKeywords", &sql::DatabaseMetaData::getSQLKeywords); } rtl::OUString SAL_CALL ODatabaseMetaData::getSearchStringEscape() - throw(SQLException, RuntimeException, std::exception) { return impl_getStringMetaData("getSearchStringEscape", &sql::DatabaseMetaData::getSearchStringEscape); } rtl::OUString SAL_CALL ODatabaseMetaData::getStringFunctions() - throw(SQLException, RuntimeException, std::exception) { return impl_getStringMetaData("getStringFunctions", &sql::DatabaseMetaData::getStringFunctions); } rtl::OUString SAL_CALL ODatabaseMetaData::getTimeDateFunctions() - throw(SQLException, RuntimeException, std::exception) { return impl_getStringMetaData("getTimeDateFunctions", &sql::DatabaseMetaData::getTimeDateFunctions); } rtl::OUString SAL_CALL ODatabaseMetaData::getSystemFunctions() - throw(SQLException, RuntimeException, std::exception) { return impl_getStringMetaData("getSystemFunctions", &sql::DatabaseMetaData::getSystemFunctions); } rtl::OUString SAL_CALL ODatabaseMetaData::getNumericFunctions() - throw(SQLException, RuntimeException, std::exception) { return impl_getStringMetaData("getNumericFunctions", &sql::DatabaseMetaData::getNumericFunctions); } sal_Bool SAL_CALL ODatabaseMetaData::supportsExtendedSQLGrammar() - throw(SQLException, RuntimeException, std::exception) { return impl_getBoolMetaData("supportsExtendedSQLGrammar", &sql::DatabaseMetaData::supportsExtendedSQLGrammar); } sal_Bool SAL_CALL ODatabaseMetaData::supportsCoreSQLGrammar() - throw(SQLException, RuntimeException, std::exception) { return impl_getBoolMetaData("supportsCoreSQLGrammar", &sql::DatabaseMetaData::supportsCoreSQLGrammar); } sal_Bool SAL_CALL ODatabaseMetaData::supportsMinimumSQLGrammar() - throw(SQLException, RuntimeException, std::exception) { return impl_getBoolMetaData("supportsMinimumSQLGrammar", &sql::DatabaseMetaData::supportsMinimumSQLGrammar); } sal_Bool SAL_CALL ODatabaseMetaData::supportsFullOuterJoins() - throw(SQLException, RuntimeException, std::exception) { return impl_getBoolMetaData("supportsFullOuterJoins", &sql::DatabaseMetaData::supportsFullOuterJoins); } sal_Bool SAL_CALL ODatabaseMetaData::supportsLimitedOuterJoins() - throw(SQLException, RuntimeException, std::exception) { return impl_getBoolMetaData("supportsLimitedOuterJoins", &sql::DatabaseMetaData::supportsLimitedOuterJoins); } sal_Int32 SAL_CALL ODatabaseMetaData::getMaxColumnsInGroupBy() - throw(SQLException, RuntimeException, std::exception) { return impl_getInt32MetaData("getMaxColumnsInGroupBy", &sql::DatabaseMetaData::getMaxColumnsInGroupBy); } sal_Int32 SAL_CALL ODatabaseMetaData::getMaxColumnsInOrderBy() - throw(SQLException, RuntimeException, std::exception) { return impl_getInt32MetaData("getMaxColumnsInOrderBy", &sql::DatabaseMetaData::getMaxColumnsInOrderBy); } sal_Int32 SAL_CALL ODatabaseMetaData::getMaxColumnsInSelect() - throw(SQLException, RuntimeException, std::exception) { return impl_getInt32MetaData("getMaxColumnsInSelect", &sql::DatabaseMetaData::getMaxColumnsInSelect); } sal_Int32 SAL_CALL ODatabaseMetaData::getMaxUserNameLength() - throw(SQLException, RuntimeException, std::exception) { return impl_getInt32MetaData("getMaxUserNameLength", &sql::DatabaseMetaData::getMaxUserNameLength); } sal_Bool SAL_CALL ODatabaseMetaData::supportsResultSetType(sal_Int32 setType) - throw(SQLException, RuntimeException, std::exception) { return impl_getRSTypeMetaData("supportsResultSetType", &sql::DatabaseMetaData::supportsResultSetType, setType); } sal_Bool SAL_CALL ODatabaseMetaData::supportsResultSetConcurrency(sal_Int32 setType, sal_Int32 concurrency) - throw(SQLException, RuntimeException, std::exception) { /* TODO: Check this out */ try { @@ -940,67 +820,56 @@ sal_Bool SAL_CALL ODatabaseMetaData::supportsResultSetConcurrency(sal_Int32 setT } sal_Bool SAL_CALL ODatabaseMetaData::ownUpdatesAreVisible(sal_Int32 setType) - throw(SQLException, RuntimeException, std::exception) { return impl_getRSTypeMetaData("ownUpdatesAreVisible", &sql::DatabaseMetaData::ownUpdatesAreVisible, setType); } sal_Bool SAL_CALL ODatabaseMetaData::ownDeletesAreVisible(sal_Int32 setType) - throw(SQLException, RuntimeException, std::exception) { return impl_getRSTypeMetaData("ownDeletesAreVisible", &sql::DatabaseMetaData::ownDeletesAreVisible, setType); } sal_Bool SAL_CALL ODatabaseMetaData::ownInsertsAreVisible(sal_Int32 setType) - throw(SQLException, RuntimeException, std::exception) { return impl_getRSTypeMetaData("ownInsertsAreVisible", &sql::DatabaseMetaData::ownInsertsAreVisible, setType); } sal_Bool SAL_CALL ODatabaseMetaData::othersUpdatesAreVisible(sal_Int32 setType) - throw(SQLException, RuntimeException, std::exception) { return impl_getRSTypeMetaData("othersUpdatesAreVisible", &sql::DatabaseMetaData::othersUpdatesAreVisible, setType); } sal_Bool SAL_CALL ODatabaseMetaData::othersDeletesAreVisible(sal_Int32 setType) - throw(SQLException, RuntimeException, std::exception) { return impl_getRSTypeMetaData("othersDeletesAreVisible", &sql::DatabaseMetaData::othersDeletesAreVisible, setType); } sal_Bool SAL_CALL ODatabaseMetaData::othersInsertsAreVisible(sal_Int32 setType) - throw(SQLException, RuntimeException, std::exception) { return impl_getRSTypeMetaData("othersInsertsAreVisible", &sql::DatabaseMetaData::othersInsertsAreVisible, setType); } sal_Bool SAL_CALL ODatabaseMetaData::updatesAreDetected(sal_Int32 setType) - throw(SQLException, RuntimeException, std::exception) { return impl_getRSTypeMetaData("updatesAreDetected", &sql::DatabaseMetaData::updatesAreDetected, setType); } sal_Bool SAL_CALL ODatabaseMetaData::deletesAreDetected(sal_Int32 setType) - throw(SQLException, RuntimeException, std::exception) { return impl_getRSTypeMetaData("deletesAreDetected", &sql::DatabaseMetaData::deletesAreDetected, setType); } sal_Bool SAL_CALL ODatabaseMetaData::insertsAreDetected(sal_Int32 setType) - throw(SQLException, RuntimeException, std::exception) { return impl_getRSTypeMetaData("insertsAreDetected", &sql::DatabaseMetaData::insertsAreDetected, setType); } sal_Bool SAL_CALL ODatabaseMetaData::supportsBatchUpdates() - throw(SQLException, RuntimeException, std::exception) { return impl_getBoolMetaData("supportsBatchUpdates", &sql::DatabaseMetaData::supportsBatchUpdates); } Reference< XConnection > SAL_CALL ODatabaseMetaData::getConnection() - throw(SQLException, RuntimeException, std::exception) { return &m_rConnection; } @@ -1013,7 +882,6 @@ Reference< XConnection > SAL_CALL ODatabaseMetaData::getConnection() */ Reference< XResultSet > SAL_CALL ODatabaseMetaData::getTableTypes() - throw(SQLException, RuntimeException, std::exception) { const char * table_types[] = {"TABLE", "VIEW"}; sal_Int32 requiredVersion[] = {0, 50000}; @@ -1034,7 +902,6 @@ Reference< XResultSet > SAL_CALL ODatabaseMetaData::getTableTypes() } Reference< XResultSet > SAL_CALL ODatabaseMetaData::getTypeInfo() - throw(SQLException, RuntimeException, std::exception) { Reference< XResultSet > xResultSet(getOwnConnection().getDriver().getFactory()->createInstance("org.openoffice.comp.helper.DatabaseMetaDataResultSet"),UNO_QUERY); @@ -1073,7 +940,6 @@ Reference< XResultSet > SAL_CALL ODatabaseMetaData::getTypeInfo() } Reference< XResultSet > SAL_CALL ODatabaseMetaData::getCatalogs() - throw(SQLException, RuntimeException, std::exception) { Reference< XResultSet > xResultSet(getOwnConnection().getDriver().getFactory()->createInstance("org.openoffice.comp.helper.DatabaseMetaDataResultSet"),UNO_QUERY); std::vector< std::vector< Any > > rRows; @@ -1103,7 +969,6 @@ Reference< XResultSet > SAL_CALL ODatabaseMetaData::getCatalogs() } Reference< XResultSet > SAL_CALL ODatabaseMetaData::getSchemas() - throw(SQLException, RuntimeException, std::exception) { Reference< XResultSet > xResultSet(getOwnConnection().getDriver().getFactory()->createInstance("org.openoffice.comp.helper.DatabaseMetaDataResultSet"),UNO_QUERY); std::vector< std::vector< Any > > rRows; @@ -1144,7 +1009,6 @@ Reference< XResultSet > SAL_CALL ODatabaseMetaData::getColumnPrivileges( const rtl::OUString& schema, const rtl::OUString& table, const rtl::OUString& columnNamePattern) - throw(SQLException, RuntimeException, std::exception) { Reference< XResultSet > xResultSet(getOwnConnection().getDriver().getFactory()->createInstance("org.openoffice.comp.helper.DatabaseMetaDataResultSet"),UNO_QUERY); std::vector< std::vector< Any > > rRows; @@ -1183,7 +1047,6 @@ Reference< XResultSet > SAL_CALL ODatabaseMetaData::getColumns( const rtl::OUString& schemaPattern, const rtl::OUString& tableNamePattern, const rtl::OUString& columnNamePattern) - throw(SQLException, RuntimeException, std::exception) { Reference< XResultSet > xResultSet(getOwnConnection().getDriver().getFactory()->createInstance("org.openoffice.comp.helper.DatabaseMetaDataResultSet"),UNO_QUERY); std::vector< std::vector< Any > > rRows; @@ -1228,7 +1091,6 @@ Reference< XResultSet > SAL_CALL ODatabaseMetaData::getTables( const rtl::OUString& schemaPattern, const rtl::OUString& tableNamePattern, const Sequence< rtl::OUString >& types ) - throw(SQLException, RuntimeException, std::exception) { sal_Int32 nLength = types.getLength(); @@ -1286,7 +1148,6 @@ Reference< XResultSet > SAL_CALL ODatabaseMetaData::getProcedureColumns( const rtl::OUString& /* schemaPattern */, const rtl::OUString& /* procedureNamePattern */, const rtl::OUString& /* columnNamePattern */) - throw(SQLException, RuntimeException, std::exception) { // Currently there is no information available return nullptr; @@ -1296,7 +1157,6 @@ Reference< XResultSet > SAL_CALL ODatabaseMetaData::getProcedures( const Any& catalog, const rtl::OUString& schemaPattern, const rtl::OUString& procedureNamePattern) - throw(SQLException, RuntimeException, std::exception) { Reference< XResultSet > xResultSet(getOwnConnection().getDriver().getFactory()->createInstance("org.openoffice.comp.helper.DatabaseMetaDataResultSet"),UNO_QUERY); std::vector< std::vector< Any > > rRows; @@ -1337,7 +1197,6 @@ Reference< XResultSet > SAL_CALL ODatabaseMetaData::getVersionColumns( const Any& /* catalog */, const rtl::OUString& /* schema */, const rtl::OUString& /* table */) - throw(SQLException, RuntimeException, std::exception) { Reference< XResultSet > xResultSet(getOwnConnection().getDriver().getFactory()->createInstance("org.openoffice.comp.helper.DatabaseMetaDataResultSet"),UNO_QUERY); std::vector< std::vector< Any > > rRows; @@ -1349,7 +1208,6 @@ Reference< XResultSet > SAL_CALL ODatabaseMetaData::getExportedKeys( const Any& catalog , const rtl::OUString& schema , const rtl::OUString& table ) - throw(SQLException, RuntimeException, std::exception) { Reference< XResultSet > xResultSet(getOwnConnection().getDriver().getFactory()->createInstance("org.openoffice.comp.helper.DatabaseMetaDataResultSet"),UNO_QUERY); std::vector< std::vector< Any > > rRows; @@ -1385,7 +1243,6 @@ Reference< XResultSet > SAL_CALL ODatabaseMetaData::getImportedKeys( const Any& catalog, const rtl::OUString& schema, const rtl::OUString& table) - throw(SQLException, RuntimeException, std::exception) { Reference< XResultSet > xResultSet(getOwnConnection().getDriver().getFactory()->createInstance("org.openoffice.comp.helper.DatabaseMetaDataResultSet"),UNO_QUERY); std::vector< std::vector< Any > > rRows; @@ -1422,7 +1279,6 @@ Reference< XResultSet > SAL_CALL ODatabaseMetaData::getPrimaryKeys( const Any& catalog, const rtl::OUString& schema, const rtl::OUString& table) - throw(SQLException, RuntimeException, std::exception) { Reference< XResultSet > xResultSet(getOwnConnection().getDriver().getFactory()->createInstance("org.openoffice.comp.helper.DatabaseMetaDataResultSet"),UNO_QUERY); std::vector< std::vector< Any > > rRows; @@ -1461,7 +1317,6 @@ Reference< XResultSet > SAL_CALL ODatabaseMetaData::getIndexInfo( const rtl::OUString& table, sal_Bool unique, sal_Bool approximate) - throw(SQLException, RuntimeException, std::exception) { Reference< XResultSet > xResultSet(getOwnConnection().getDriver().getFactory()->createInstance("org.openoffice.comp.helper.DatabaseMetaDataResultSet"),UNO_QUERY); std::vector< std::vector< Any > > rRows; @@ -1500,7 +1355,6 @@ Reference< XResultSet > SAL_CALL ODatabaseMetaData::getBestRowIdentifier( const rtl::OUString& table, sal_Int32 scope, sal_Bool nullable) - throw(SQLException, RuntimeException, std::exception) { Reference< XResultSet > xResultSet(getOwnConnection().getDriver().getFactory()->createInstance("org.openoffice.comp.helper.DatabaseMetaDataResultSet"),UNO_QUERY); std::vector< std::vector< Any > > rRows; @@ -1537,7 +1391,6 @@ Reference< XResultSet > SAL_CALL ODatabaseMetaData::getTablePrivileges( const Any& catalog, const rtl::OUString& schemaPattern, const rtl::OUString& tableNamePattern) - throw(SQLException, RuntimeException, std::exception) { Reference< XResultSet > xResultSet(getOwnConnection().getDriver().getFactory()->createInstance("org.openoffice.comp.helper.DatabaseMetaDataResultSet"),UNO_QUERY); std::vector< std::vector< Any > > rRows; @@ -1598,7 +1451,6 @@ Reference< XResultSet > SAL_CALL ODatabaseMetaData::getCrossReference( const Any& foreignCatalog, const rtl::OUString& foreignSchema, const rtl::OUString& foreignTable) - throw(SQLException, RuntimeException, std::exception) { Reference< XResultSet > xResultSet(getOwnConnection().getDriver().getFactory()->createInstance("org.openoffice.comp.helper.DatabaseMetaDataResultSet"),UNO_QUERY); std::vector< std::vector< Any > > rRows; @@ -1639,7 +1491,6 @@ Reference< XResultSet > SAL_CALL ODatabaseMetaData::getUDTs( const rtl::OUString& /* schemaPattern */, const rtl::OUString& /* typeNamePattern */, const Sequence< sal_Int32 >& /* types */) - throw(SQLException, RuntimeException, std::exception) { mysqlc_sdbc_driver::throwFeatureNotImplementedException("ODatabaseMetaData::getUDTs", *this); return nullptr; diff --git a/mysqlc/source/mysqlc_databasemetadata.hxx b/mysqlc/source/mysqlc_databasemetadata.hxx index 0406793..f32a061 100644 --- a/mysqlc/source/mysqlc_databasemetadata.hxx +++ b/mysqlc/source/mysqlc_databasemetadata.hxx @@ -64,158 +64,155 @@ namespace connectivity // as I mentioned before this interface is really BIG // XDatabaseMetaData - sal_Bool SAL_CALL allProceduresAreCallable() throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) SAL_OVERRIDE; ... etc. - the rest is truncated _______________________________________________ Libreoffice-commits mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
