Skip to content

C
core
Kaydet (Commit) b61214c9 authored tarafından Stephan Bergmann's avatar Stephan Bergmann
Dosyalara gözat
Seçenekler

Remove dynamic exception specifications from !LIBO_INTERNAL_ONLY 

...only odk/examples/ remains to be clean up

Change-Id: I875a1e8d6750b6b007bd75126b8010273e1f32d5
üst d1f31681
Expand all Hide whitespace changes
Inline Side-by-side
Showing with 203 additions and 350 deletions
compilerplugins/clang/dynexcspec.cxx
Dosyayı görüntüle @ b61214c9
......@@ -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());
}
......
desktop/test/deployment/active/active_native.cxx
Dosyayı görüntüle @ b61214c9
......@@ -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();
......
desktop/test/deployment/passive/passive_native.cxx
Dosyayı görüntüle @ b61214c9
......@@ -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();
......
include/cppuhelper/compbase1.hxx
Dosyayı görüntüle @ b61214c9
......@@ -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() ); }
};
}
......
include/cppuhelper/compbase10.hxx
Dosyayı görüntüle @ b61214c9
......@@ -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() ); }
};
}
......
include/cppuhelper/compbase11.hxx
Dosyayı görüntüle @ b61214c9
......@@ -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() ); }
};
}
......
include/cppuhelper/implbase11.hxx
Dosyayı görüntüle @ b61214c9
......@@ -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() ); }
};
}
......
include/cppuhelper/implbase_ex_post.hxx
Dosyayı görüntüle @ b61214c9
......@@ -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 > \
......
mysqlc/source/mysqlc_connection.cxx
Dosyayı görüntüle @ b61214c9
......@@ -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);
......
mysqlc/source/mysqlc_connection.hxx
Dosyayı görüntüle @ b61214c9
......@@ -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);
......
mysqlc/source/mysqlc_driver.cxx
Dosyayı görüntüle @ b61214c9
......@@ -71,13 +71,11 @@ void MysqlCDriver::disposing()
// static ServiceInfo
rtl::OUString MysqlCDriver::getImplementationName_Static()
throw(RuntimeException)
{
return rtl::OUString( "com.sun.star.comp.sdbc.mysqlc.MysqlCDriver" );
}
Sequence< rtl::OUString > MysqlCDriver::getSupportedServiceNames_Static()
throw(RuntimeException)
{
// which service is supported
// for more information @see com.sun.star.sdbc.Driver
......@@ -87,19 +85,16 @@ Sequence< rtl::OUString > MysqlCDriver::getSupportedServiceNames_Static()
}
rtl::OUString SAL_CALL MysqlCDriver::getImplementationName()
throw(RuntimeException, std::exception)
{
return getImplementationName_Static();
}
sal_Bool SAL_CALL MysqlCDriver::supportsService(const rtl::OUString& _rServiceName)
throw(RuntimeException, std::exception)
{
return cppu::supportsService(this, _rServiceName);
}
Sequence< rtl::OUString > SAL_CALL MysqlCDriver::getSupportedServiceNames()
throw(RuntimeException, std::exception)
{
return getSupportedServiceNames_Static();
}
......@@ -186,7 +181,6 @@ void MysqlCDriver::impl_initCppConn_lck_throw()
}
Reference< XConnection > SAL_CALL MysqlCDriver::connect(const rtl::OUString& url, const Sequence< PropertyValue >& info)
throw(SQLException, RuntimeException, std::exception)
{
::osl::MutexGuard aGuard( m_aMutex );
......@@ -218,13 +212,11 @@ Reference< XConnection > SAL_CALL MysqlCDriver::connect(const rtl::OUString& url
}
sal_Bool SAL_CALL MysqlCDriver::acceptsURL(const rtl::OUString& url)
throw(SQLException, RuntimeException, std::exception)
{
return url.startsWith("sdbc:mysqlc:");
}
Sequence< DriverPropertyInfo > SAL_CALL MysqlCDriver::getPropertyInfo(const rtl::OUString& url, const Sequence< PropertyValue >& /* info */)
throw(SQLException, RuntimeException, std::exception)
{
if (acceptsURL(url)) {
::std::vector< DriverPropertyInfo > aDriverInfo;
......@@ -250,13 +242,11 @@ Sequence< DriverPropertyInfo > SAL_CALL MysqlCDriver::getPropertyInfo(const rtl:
}
sal_Int32 SAL_CALL MysqlCDriver::getMajorVersion()
throw(RuntimeException, std::exception)
{
return MARIADBC_VERSION_MAJOR;
}
sal_Int32 SAL_CALL MysqlCDriver::getMinorVersion()
throw(RuntimeException, std::exception)
{
return MARIADBC_VERSION_MINOR;
}
......@@ -267,7 +257,6 @@ namespace mysqlc
{
Reference< XInterface > SAL_CALL MysqlCDriver_CreateInstance(const Reference< XMultiServiceFactory >& _rxFactory)
throw(css::uno::Exception)
{
return(*(new MysqlCDriver(_rxFactory)));
}
......@@ -307,7 +296,6 @@ void release(oslInterlockedCount& _refCount,
}
void checkDisposed(bool _bThrow)
throw (DisposedException)
{
if (_bThrow) {
throw DisposedException();
......
mysqlc/source/mysqlc_driver.hxx
Dosyayı görüntüle @ b61214c9
......@@ -48,7 +48,8 @@ namespace connectivity
using ::com::sun::star::uno::Exception;
using ::com::sun::star::uno::Reference;
using ::com::sun::star::uno::Sequence;
Reference< css::uno::XInterface > SAL_CALL MysqlCDriver_CreateInstance(const Reference< css::lang::XMultiServiceFactory >& _rxFactory) throw(Exception);
/// @throws Exception
Reference< css::uno::XInterface > SAL_CALL MysqlCDriver_CreateInstance(const Reference< css::lang::XMultiServiceFactory >& _rxFactory);
typedef ::cppu::WeakComponentImplHelper2< css::sdbc::XDriver,
css::lang::XServiceInfo > ODriver_BASE;
......@@ -81,24 +82,24 @@ namespace connectivity
// OComponentHelper
void SAL_CALL disposing() SAL_OVERRIDE;
// XInterface
static rtl::OUString getImplementationName_Static() throw(RuntimeException);
static Sequence< rtl::OUString > getSupportedServiceNames_Static() throw(RuntimeException);
/// @throws RuntimeException
static rtl::OUString getImplementationName_Static();
/// @throws RuntimeException
static Sequence< rtl::OUString > getSupportedServiceNames_Static();
// XServiceInfo
rtl::OUString SAL_CALL getImplementationName() throw(RuntimeException, std::exception) SAL_OVERRIDE;
sal_Bool SAL_CALL supportsService(const rtl::OUString& ServiceName) throw(RuntimeException, std::exception) SAL_OVERRIDE;
Sequence< rtl::OUString > SAL_CALL getSupportedServiceNames() throw(RuntimeException, std::exception) SAL_OVERRIDE;
rtl::OUString SAL_CALL getImplementationName() SAL_OVERRIDE;
sal_Bool SAL_CALL supportsService(const rtl::OUString& ServiceName) SAL_OVERRIDE;
Sequence< rtl::OUString > SAL_CALL getSupportedServiceNames() SAL_OVERRIDE;
// XDriver
Reference< css::sdbc::XConnection > SAL_CALL connect(const rtl::OUString& url, const Sequence< css::beans::PropertyValue >& info)
throw(SQLException, RuntimeException, std::exception) SAL_OVERRIDE;
Reference< css::sdbc::XConnection > SAL_CALL connect(const rtl::OUString& url, const Sequence< css::beans::PropertyValue >& info) SAL_OVERRIDE;
sal_Bool SAL_CALL acceptsURL(const rtl::OUString& url) throw(SQLException, RuntimeException, std::exception) SAL_OVERRIDE;
Sequence< css::sdbc::DriverPropertyInfo > SAL_CALL getPropertyInfo(const rtl::OUString& url, const Sequence< css::beans::PropertyValue >& info)
throw(SQLException, RuntimeException, std::exception) SAL_OVERRIDE;
sal_Bool SAL_CALL acceptsURL(const rtl::OUString& url) SAL_OVERRIDE;
Sequence< css::sdbc::DriverPropertyInfo > SAL_CALL getPropertyInfo(const rtl::OUString& url, const Sequence< css::beans::PropertyValue >& info) SAL_OVERRIDE;
sal_Int32 SAL_CALL getMajorVersion() throw(RuntimeException, std::exception) SAL_OVERRIDE;
sal_Int32 SAL_CALL getMinorVersion() throw(RuntimeException, std::exception) SAL_OVERRIDE;
sal_Int32 SAL_CALL getMajorVersion() SAL_OVERRIDE;
sal_Int32 SAL_CALL getMinorVersion() SAL_OVERRIDE;
const Reference< css::lang::XMultiServiceFactory >& getFactory() const { return m_xFactory; }
......
mysqlc/source/mysqlc_general.cxx
Dosyayı görüntüle @ b61214c9
......@@ -32,7 +32,6 @@ namespace mysqlc_sdbc_driver
{
void throwFeatureNotImplementedException( const sal_Char* _pAsciiFeatureName, const Reference< XInterface >& _rxContext )
throw (SQLException)
{
const rtl::OUString sMessage = rtl::OUString::createFromAscii( _pAsciiFeatureName ) + ": feature not implemented.";
throw SQLException(
......@@ -45,7 +44,6 @@ void throwFeatureNotImplementedException( const sal_Char* _pAsciiFeatureName, co
}
void throwInvalidArgumentException( const sal_Char* _pAsciiFeatureName, const Reference< XInterface >& _rxContext )
throw (SQLException)
{
const rtl::OUString sMessage = rtl::OUString::createFromAscii( _pAsciiFeatureName ) + ": invalid arguments.";
throw SQLException(
......
mysqlc/source/mysqlc_general.hxx
Dosyayı görüntüle @ b61214c9
......@@ -31,17 +31,17 @@ namespace mysqlc_sdbc_driver
{
rtl::OUString getStringFromAny(const css::uno::Any& _rAny);
/// @throws css::sdbc::SQLException
void throwFeatureNotImplementedException(
const sal_Char* _pAsciiFeatureName,
const css::uno::Reference< css::uno::XInterface >& _rxContext
)
throw (css::sdbc::SQLException);
);
/// @throws css::sdbc::SQLException
void throwInvalidArgumentException(
const sal_Char* _pAsciiFeatureName,
const css::uno::Reference< css::uno::XInterface >& _rxContext
)
throw (css::sdbc::SQLException);
);
void translateAndThrow(const ::sql::SQLException& _error, const css::uno::Reference< css::uno::XInterface >& _context, const rtl_TextEncoding encoding);
......
mysqlc/source/mysqlc_resultsetmetadata.cxx
Dosyayı görüntüle @ b61214c9
......@@ -34,7 +34,6 @@ OResultSetMetaData::~OResultSetMetaData()
}
sal_Int32 SAL_CALL OResultSetMetaData::getColumnDisplaySize(sal_Int32 column)
throw(SQLException, RuntimeException, std::exception)
{
try {
meta->getColumnDisplaySize(column);
......@@ -47,7 +46,6 @@ sal_Int32 SAL_CALL OResultSetMetaData::getColumnDisplaySize(sal_Int32 column)
}
sal_Int32 SAL_CALL OResultSetMetaData::getColumnType(sal_Int32 column)
throw(SQLException, RuntimeException, std::exception)
{
checkColumnIndex(column);
......@@ -67,7 +65,6 @@ sal_Int32 SAL_CALL OResultSetMetaData::getColumnType(sal_Int32 column)
Does it change the API, the open-close principle?
*/
sal_Int32 SAL_CALL OResultSetMetaData::getColumnCount()
throw(SQLException, RuntimeException, std::exception)
{
try {
return meta->getColumnCount();
......@@ -80,7 +77,6 @@ sal_Int32 SAL_CALL OResultSetMetaData::getColumnCount()
}
sal_Bool SAL_CALL OResultSetMetaData::isCaseSensitive(sal_Int32 column)
throw(SQLException, RuntimeException, std::exception)
{
checkColumnIndex(column);
......@@ -95,7 +91,6 @@ sal_Bool SAL_CALL OResultSetMetaData::isCaseSensitive(sal_Int32 column)
}
rtl::OUString SAL_CALL OResultSetMetaData::getSchemaName(sal_Int32 column)
throw(SQLException, RuntimeException, std::exception)
{
checkColumnIndex(column);
......@@ -110,7 +105,6 @@ rtl::OUString SAL_CALL OResultSetMetaData::getSchemaName(sal_Int32 column)
}
rtl::OUString SAL_CALL OResultSetMetaData::getColumnName(sal_Int32 column)
throw(SQLException, RuntimeException, std::exception)
{
checkColumnIndex(column);
......@@ -125,7 +119,6 @@ rtl::OUString SAL_CALL OResultSetMetaData::getColumnName(sal_Int32 column)
}
rtl::OUString SAL_CALL OResultSetMetaData::getTableName(sal_Int32 column)
throw(SQLException, RuntimeException, std::exception)
{
checkColumnIndex(column);
......@@ -140,7 +133,6 @@ rtl::OUString SAL_CALL OResultSetMetaData::getTableName(sal_Int32 column)
}
rtl::OUString SAL_CALL OResultSetMetaData::getCatalogName(sal_Int32 column)
throw(SQLException, RuntimeException, std::exception)
{
checkColumnIndex(column);
......@@ -155,7 +147,6 @@ rtl::OUString SAL_CALL OResultSetMetaData::getCatalogName(sal_Int32 column)
}
rtl::OUString SAL_CALL OResultSetMetaData::getColumnTypeName(sal_Int32 column)
throw(SQLException, RuntimeException, std::exception)
{
checkColumnIndex(column);
......@@ -170,7 +161,6 @@ rtl::OUString SAL_CALL OResultSetMetaData::getColumnTypeName(sal_Int32 column)
}
rtl::OUString SAL_CALL OResultSetMetaData::getColumnLabel(sal_Int32 column)
throw(SQLException, RuntimeException, std::exception)
{
checkColumnIndex(column);
......@@ -185,7 +175,6 @@ rtl::OUString SAL_CALL OResultSetMetaData::getColumnLabel(sal_Int32 column)
}
rtl::OUString SAL_CALL OResultSetMetaData::getColumnServiceName(sal_Int32 column)
throw(SQLException, RuntimeException, std::exception)
{
checkColumnIndex(column);
......@@ -194,7 +183,6 @@ rtl::OUString SAL_CALL OResultSetMetaData::getColumnServiceName(sal_Int32 column
}
sal_Bool SAL_CALL OResultSetMetaData::isCurrency(sal_Int32 column)
throw(SQLException, RuntimeException, std::exception)
{
checkColumnIndex(column);
......@@ -209,7 +197,6 @@ sal_Bool SAL_CALL OResultSetMetaData::isCurrency(sal_Int32 column)
}
sal_Bool SAL_CALL OResultSetMetaData::isAutoIncrement(sal_Int32 column)
throw(SQLException, RuntimeException, std::exception)
{
checkColumnIndex(column);
......@@ -224,7 +211,6 @@ sal_Bool SAL_CALL OResultSetMetaData::isAutoIncrement(sal_Int32 column)
}
sal_Bool SAL_CALL OResultSetMetaData::isSigned(sal_Int32 column)
throw(SQLException, RuntimeException, std::exception)
{
checkColumnIndex(column);
......@@ -239,7 +225,6 @@ sal_Bool SAL_CALL OResultSetMetaData::isSigned(sal_Int32 column)
}
sal_Int32 SAL_CALL OResultSetMetaData::getPrecision(sal_Int32 column)
throw(SQLException, RuntimeException, std::exception)
{
checkColumnIndex(column);
......@@ -254,7 +239,6 @@ sal_Int32 SAL_CALL OResultSetMetaData::getPrecision(sal_Int32 column)
}
sal_Int32 SAL_CALL OResultSetMetaData::getScale(sal_Int32 column)
throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception)
{
checkColumnIndex(column);
try {
......@@ -268,7 +252,6 @@ sal_Int32 SAL_CALL OResultSetMetaData::getScale(sal_Int32 column)
}
sal_Int32 SAL_CALL OResultSetMetaData::isNullable(sal_Int32 column)
throw(SQLException, RuntimeException, std::exception)
{
checkColumnIndex(column);
......@@ -283,7 +266,6 @@ sal_Int32 SAL_CALL OResultSetMetaData::isNullable(sal_Int32 column)
}
sal_Bool SAL_CALL OResultSetMetaData::isSearchable(sal_Int32 column)
throw(SQLException, RuntimeException, std::exception)
{
checkColumnIndex(column);
......@@ -298,7 +280,6 @@ sal_Bool SAL_CALL OResultSetMetaData::isSearchable(sal_Int32 column)
}
sal_Bool SAL_CALL OResultSetMetaData::isReadOnly(sal_Int32 column)
throw(SQLException, RuntimeException, std::exception)
{
checkColumnIndex(column);
......@@ -313,7 +294,6 @@ sal_Bool SAL_CALL OResultSetMetaData::isReadOnly(sal_Int32 column)
}
sal_Bool SAL_CALL OResultSetMetaData::isDefinitelyWritable(sal_Int32 column)
throw(SQLException, RuntimeException, std::exception)
{
checkColumnIndex(column);
......@@ -328,7 +308,6 @@ sal_Bool SAL_CALL OResultSetMetaData::isDefinitelyWritable(sal_Int32 column)
}
sal_Bool SAL_CALL OResultSetMetaData::isWritable(sal_Int32 column)
throw(SQLException, RuntimeException, std::exception)
{
checkColumnIndex(column);
......@@ -343,7 +322,6 @@ sal_Bool SAL_CALL OResultSetMetaData::isWritable(sal_Int32 column)
}
void OResultSetMetaData::checkColumnIndex(sal_Int32 columnIndex)
throw (SQLException, RuntimeException)
{
if (columnIndex < 1 || columnIndex > (sal_Int32) meta->getColumnCount()) {
......
mysqlc/source/mysqlc_resultsetmetadata.hxx
Dosyayı görüntüle @ b61214c9
......@@ -56,40 +56,42 @@ namespace connectivity
return rtl::OUString( _string.c_str(), _string.size(), m_encoding );
}
sal_Int32 SAL_CALL getColumnCount() throw(SQLException, RuntimeException, std::exception) SAL_OVERRIDE;
sal_Int32 SAL_CALL getColumnCount() SAL_OVERRIDE;
sal_Bool SAL_CALL isAutoIncrement(sal_Int32 column) throw(SQLException, RuntimeException, std::exception) SAL_OVERRIDE;
sal_Bool SAL_CALL isCaseSensitive(sal_Int32 column) throw(SQLException, RuntimeException, std::exception) SAL_OVERRIDE;
sal_Bool SAL_CALL isSearchable(sal_Int32 column) throw(SQLException, RuntimeException, std::exception) SAL_OVERRIDE;
sal_Bool SAL_CALL isCurrency(sal_Int32 column) throw(SQLException, RuntimeException, std::exception) SAL_OVERRIDE;
sal_Bool SAL_CALL isAutoIncrement(sal_Int32 column) SAL_OVERRIDE;
sal_Bool SAL_CALL isCaseSensitive(sal_Int32 column) SAL_OVERRIDE;
sal_Bool SAL_CALL isSearchable(sal_Int32 column) SAL_OVERRIDE;
sal_Bool SAL_CALL isCurrency(sal_Int32 column) SAL_OVERRIDE;
sal_Int32 SAL_CALL isNullable(sal_Int32 column) throw(SQLException, RuntimeException, std::exception) SAL_OVERRIDE;
sal_Int32 SAL_CALL isNullable(sal_Int32 column) SAL_OVERRIDE;
sal_Bool SAL_CALL isSigned(sal_Int32 column) throw(SQLException, RuntimeException, std::exception) SAL_OVERRIDE;
sal_Bool SAL_CALL isSigned(sal_Int32 column) SAL_OVERRIDE;
sal_Int32 SAL_CALL getColumnDisplaySize(sal_Int32 column)throw(SQLException, RuntimeException, std::exception) SAL_OVERRIDE;
sal_Int32 SAL_CALL getColumnDisplaySize(sal_Int32 column) SAL_OVERRIDE;
rtl::OUString SAL_CALL getColumnLabel(sal_Int32 column) throw(SQLException, RuntimeException, std::exception) SAL_OVERRIDE;
rtl::OUString SAL_CALL getColumnName(sal_Int32 column) throw(SQLException, RuntimeException, std::exception) SAL_OVERRIDE;
rtl::OUString SAL_CALL getSchemaName(sal_Int32 column) throw(SQLException, RuntimeException, std::exception) SAL_OVERRIDE;
rtl::OUString SAL_CALL getColumnLabel(sal_Int32 column) SAL_OVERRIDE;
rtl::OUString SAL_CALL getColumnName(sal_Int32 column) SAL_OVERRIDE;
rtl::OUString SAL_CALL getSchemaName(sal_Int32 column) SAL_OVERRIDE;
sal_Int32 SAL_CALL getPrecision(sal_Int32 column) throw(SQLException, RuntimeException, std::exception) SAL_OVERRIDE;
sal_Int32 SAL_CALL getScale(sal_Int32 column) throw(SQLException, RuntimeException, std::exception) SAL_OVERRIDE;
sal_Int32 SAL_CALL getPrecision(sal_Int32 column) SAL_OVERRIDE;
sal_Int32 SAL_CALL getScale(sal_Int32 column) SAL_OVERRIDE;
rtl::OUString SAL_CALL getTableName(sal_Int32 column) throw(SQLException, RuntimeException, std::exception) SAL_OVERRIDE;
rtl::OUString SAL_CALL getCatalogName(sal_Int32 column) throw(SQLException, RuntimeException, std::exception) SAL_OVERRIDE;
rtl::OUString SAL_CALL getTableName(sal_Int32 column) SAL_OVERRIDE;
rtl::OUString SAL_CALL getCatalogName(sal_Int32 column) SAL_OVERRIDE;
sal_Int32 SAL_CALL getColumnType(sal_Int32 column) throw(SQLException, RuntimeException, std::exception) SAL_OVERRIDE;
sal_Int32 SAL_CALL getColumnType(sal_Int32 column) SAL_OVERRIDE;
rtl::OUString SAL_CALL getColumnTypeName(sal_Int32 column) throw(SQLException, RuntimeException, std::exception) SAL_OVERRIDE;
rtl::OUString SAL_CALL getColumnTypeName(sal_Int32 column) SAL_OVERRIDE;
sal_Bool SAL_CALL isReadOnly(sal_Int32 column) throw(SQLException, RuntimeException, std::exception) SAL_OVERRIDE;
sal_Bool SAL_CALL isWritable(sal_Int32 column) throw(SQLException, RuntimeException, std::exception) SAL_OVERRIDE;
sal_Bool SAL_CALL isDefinitelyWritable(sal_Int32 column)throw(SQLException, RuntimeException, std::exception) SAL_OVERRIDE;
sal_Bool SAL_CALL isReadOnly(sal_Int32 column) SAL_OVERRIDE;
sal_Bool SAL_CALL isWritable(sal_Int32 column) SAL_OVERRIDE;
sal_Bool SAL_CALL isDefinitelyWritable(sal_Int32 column) SAL_OVERRIDE;
rtl::OUString SAL_CALL getColumnServiceName(sal_Int32 column)throw(SQLException, RuntimeException, std::exception) SAL_OVERRIDE;
rtl::OUString SAL_CALL getColumnServiceName(sal_Int32 column) SAL_OVERRIDE;
void checkColumnIndex(sal_Int32 columnIndex) throw (SQLException, RuntimeException);
/// @throws SQLException
/// @throws RuntimeException
void checkColumnIndex(sal_Int32 columnIndex);
};
}
}
......
mysqlc/source/mysqlc_statement.cxx
Dosyayı görüntüle @ b61214c9
......@@ -91,7 +91,6 @@ void OCommonStatement::disposing()
}
Any SAL_CALL OCommonStatement::queryInterface(const Type & rType)
throw(RuntimeException, std::exception)
{
Any aRet = OCommonStatement_IBase::queryInterface(rType);
if (!aRet.hasValue()) {
......@@ -101,7 +100,6 @@ Any SAL_CALL OCommonStatement::queryInterface(const Type & rType)
}
Sequence< Type > SAL_CALL OCommonStatement::getTypes()
throw(RuntimeException, std::exception)
{
::cppu::OTypeCollection aTypes( cppu::UnoType<XMultiPropertySet>::get(),
cppu::UnoType<XFastPropertySet>::get(),
......@@ -111,7 +109,6 @@ Sequence< Type > SAL_CALL OCommonStatement::getTypes()
}
void SAL_CALL OCommonStatement::cancel()
throw(RuntimeException, std::exception)
{
MutexGuard aGuard(m_aMutex);
checkDisposed(rBHelper.bDisposed);
......@@ -119,7 +116,6 @@ void SAL_CALL OCommonStatement::cancel()
}
void SAL_CALL OCommonStatement::close()
throw(SQLException, RuntimeException, std::exception)
{
/*
We need a block for the checkDisposed call.
......@@ -133,13 +129,11 @@ void SAL_CALL OCommonStatement::close()
}
void SAL_CALL OStatement::clearBatch()
throw(SQLException, RuntimeException, std::exception)
{
// if you support batches clear it here
}
sal_Bool SAL_CALL OCommonStatement::execute(const rtl::OUString& sql)
throw(SQLException, RuntimeException, std::exception)
{
MutexGuard aGuard(m_aMutex);
checkDisposed(rBHelper.bDisposed);
......@@ -155,7 +149,6 @@ sal_Bool SAL_CALL OCommonStatement::execute(const rtl::OUString& sql)
}
Reference< XResultSet > SAL_CALL OCommonStatement::executeQuery(const rtl::OUString& sql)
throw(SQLException, RuntimeException, std::exception)
{
MutexGuard aGuard(m_aMutex);
checkDisposed(rBHelper.bDisposed);
......@@ -173,7 +166,6 @@ Reference< XResultSet > SAL_CALL OCommonStatement::executeQuery(const rtl::OUStr
}
Reference< XConnection > SAL_CALL OCommonStatement::getConnection()
throw(SQLException, RuntimeException, std::exception)
{
MutexGuard aGuard(m_aMutex);
checkDisposed(rBHelper.bDisposed);
......@@ -183,13 +175,11 @@ Reference< XConnection > SAL_CALL OCommonStatement::getConnection()
}
sal_Int32 SAL_CALL OCommonStatement::getUpdateCount()
throw(SQLException, RuntimeException, std::exception)
{
return 0;
}
Any SAL_CALL OStatement::queryInterface(const Type & rType)
throw(RuntimeException, std::exception)
{
Any aRet = ::cppu::queryInterface(rType,static_cast< XBatchExecution*> (this));
if (!aRet.hasValue()) {
......@@ -199,7 +189,6 @@ Any SAL_CALL OStatement::queryInterface(const Type & rType)
}
void SAL_CALL OStatement::addBatch(const rtl::OUString& sql)
throw(SQLException, RuntimeException, std::exception)
{
MutexGuard aGuard(m_aMutex);
checkDisposed(rBHelper.bDisposed);
......@@ -208,7 +197,6 @@ void SAL_CALL OStatement::addBatch(const rtl::OUString& sql)
}
Sequence< sal_Int32 > SAL_CALL OStatement::executeBatch()
throw(SQLException, RuntimeException, std::exception)
{
MutexGuard aGuard(m_aMutex);
checkDisposed(rBHelper.bDisposed);
......@@ -218,7 +206,6 @@ Sequence< sal_Int32 > SAL_CALL OStatement::executeBatch()
}
sal_Int32 SAL_CALL OCommonStatement::executeUpdate(const rtl::OUString& sql)
throw(SQLException, RuntimeException, std::exception)
{
MutexGuard aGuard(m_aMutex);
checkDisposed(rBHelper.bDisposed);
......@@ -234,7 +221,6 @@ sal_Int32 SAL_CALL OCommonStatement::executeUpdate(const rtl::OUString& sql)
}
Reference< XResultSet > SAL_CALL OCommonStatement::getResultSet()
throw(SQLException, RuntimeException, std::exception)
{
MutexGuard aGuard(m_aMutex);
checkDisposed(rBHelper.bDisposed);
......@@ -251,7 +237,6 @@ Reference< XResultSet > SAL_CALL OCommonStatement::getResultSet()
}
sal_Bool SAL_CALL OCommonStatement::getMoreResults()
throw(SQLException, RuntimeException, std::exception)
{
MutexGuard aGuard(m_aMutex);
checkDisposed(rBHelper.bDisposed);
......@@ -262,7 +247,6 @@ sal_Bool SAL_CALL OCommonStatement::getMoreResults()
}
Any SAL_CALL OCommonStatement::getWarnings()
throw(SQLException, RuntimeException, std::exception)
{
MutexGuard aGuard(m_aMutex);
checkDisposed(rBHelper.bDisposed);
......@@ -271,7 +255,6 @@ Any SAL_CALL OCommonStatement::getWarnings()
}
void SAL_CALL OCommonStatement::clearWarnings()
throw(SQLException, RuntimeException, std::exception)
{
MutexGuard aGuard(m_aMutex);
checkDisposed(rBHelper.bDisposed);
......@@ -308,7 +291,6 @@ void SAL_CALL OCommonStatement::clearWarnings()
sal_Bool OCommonStatement::convertFastPropertyValue(
Any & /* rConvertedValue */, Any & /* rOldValue */,
sal_Int32 /* nHandle */, const Any& /* rValue */)
throw (IllegalArgumentException)
{
bool bConverted = false;
// here we have to try to convert
......@@ -316,7 +298,6 @@ sal_Bool OCommonStatement::convertFastPropertyValue(
}
void OCommonStatement::setFastPropertyValue_NoBroadcast(sal_Int32 nHandle, const Any& /* rValue */)
throw (Exception, std::exception)
{
// set the value to what ever is necessary
switch (nHandle) {
......@@ -356,13 +337,12 @@ void OCommonStatement::getFastPropertyValue(Any& _rValue, sal_Int32 nHandle) con
}
}
rtl::OUString OStatement::getImplementationName() throw (css::uno::RuntimeException, std::exception)
rtl::OUString OStatement::getImplementationName()
{
return rtl::OUString("com.sun.star.sdbcx.OStatement");
}
css::uno::Sequence<rtl::OUString> OStatement::getSupportedServiceNames()
throw (css::uno::RuntimeException, std::exception)
{
css::uno::Sequence<rtl::OUString> s(1);
s[0] = "com.sun.star.sdbc.Statement";
......@@ -370,7 +350,6 @@ css::uno::Sequence<rtl::OUString> OStatement::getSupportedServiceNames()
}
sal_Bool OStatement::supportsService(rtl::OUString const & ServiceName)
throw (css::uno::RuntimeException, std::exception)
{
return cppu::supportsService(this, ServiceName);
}
......@@ -400,7 +379,6 @@ void SAL_CALL OStatement::release()
}
Reference< css::beans::XPropertySetInfo > SAL_CALL OCommonStatement::getPropertySetInfo()
throw(RuntimeException, std::exception)
{
return ::cppu::OPropertySetHelper::createPropertySetInfo(getInfoHelper());
}
......
mysqlc/source/mysqlc_statement.hxx
Dosyayı görüntüle @ b61214c9
......@@ -86,11 +86,9 @@ namespace connectivity
// OPropertySetHelper
::cppu::IPropertyArrayHelper & SAL_CALL getInfoHelper() SAL_OVERRIDE;
sal_Bool SAL_CALL convertFastPropertyValue(Any & rConvertedValue, Any & rOldValue,
sal_Int32 nHandle, const Any& rValue)
throw (css::lang::IllegalArgumentException) SAL_OVERRIDE;
sal_Int32 nHandle, const Any& rValue) SAL_OVERRIDE;
void SAL_CALL setFastPropertyValue_NoBroadcast(sal_Int32 nHandle, const Any& rValue)
throw(css::uno::Exception, std::exception) SAL_OVERRIDE;
void SAL_CALL setFastPropertyValue_NoBroadcast(sal_Int32 nHandle, const Any& rValue) SAL_OVERRIDE;
void SAL_CALL getFastPropertyValue(Any& rValue, sal_Int32 nHandle) const SAL_OVERRIDE;
virtual ~OCommonStatement();
......@@ -111,48 +109,40 @@ namespace connectivity
void SAL_CALL acquire() throw() SAL_OVERRIDE;
// XInterface
Any SAL_CALL queryInterface(const css::uno::Type & rType)
throw(RuntimeException, std::exception) SAL_OVERRIDE;
Any SAL_CALL queryInterface(const css::uno::Type & rType) SAL_OVERRIDE;
//XTypeProvider
css::uno::Sequence< css::uno::Type > SAL_CALL getTypes()
throw(RuntimeException, std::exception) SAL_OVERRIDE;
css::uno::Sequence< css::uno::Type > SAL_CALL getTypes() SAL_OVERRIDE;
// XPropertySet
css::uno::Reference< css::beans::XPropertySetInfo > SAL_CALL getPropertySetInfo()
throw(RuntimeException, std::exception) SAL_OVERRIDE;
css::uno::Reference< css::beans::XPropertySetInfo > SAL_CALL getPropertySetInfo() SAL_OVERRIDE;
// XStatement
css::uno::Reference< css::sdbc::XResultSet > SAL_CALL executeQuery(const rtl::OUString& sql)
throw(SQLException, RuntimeException, std::exception) SAL_OVERRIDE;
css::uno::Reference< css::sdbc::XResultSet > SAL_CALL executeQuery(const rtl::OUString& sql) SAL_OVERRIDE;
sal_Int32 SAL_CALL executeUpdate(const rtl::OUString& sql)
throw(SQLException, RuntimeException, std::exception) SAL_OVERRIDE;
sal_Int32 SAL_CALL executeUpdate(const rtl::OUString& sql) SAL_OVERRIDE;
sal_Bool SAL_CALL execute( const rtl::OUString& sql )
throw(SQLException, RuntimeException, std::exception) SAL_OVERRIDE;
sal_Bool SAL_CALL execute( const rtl::OUString& sql ) SAL_OVERRIDE;
css::uno::Reference< css::sdbc::XConnection > SAL_CALL getConnection()
throw(SQLException, RuntimeException, std::exception) SAL_OVERRIDE;
css::uno::Reference< css::sdbc::XConnection > SAL_CALL getConnection() SAL_OVERRIDE;
// XWarningsSupplier
Any SAL_CALL getWarnings() throw(SQLException, RuntimeException, std::exception) SAL_OVERRIDE;
Any SAL_CALL getWarnings() SAL_OVERRIDE;
void SAL_CALL clearWarnings() throw(SQLException, RuntimeException, std::exception) SAL_OVERRIDE;
void SAL_CALL clearWarnings() SAL_OVERRIDE;
// XCancellable
void SAL_CALL cancel() throw(RuntimeException, std::exception) SAL_OVERRIDE;
void SAL_CALL cancel() SAL_OVERRIDE;
// XCloseable
void SAL_CALL close() throw(SQLException, RuntimeException, std::exception) SAL_OVERRIDE;
void SAL_CALL close() SAL_OVERRIDE;
// XMultipleResults
css::uno::Reference< css::sdbc::XResultSet > SAL_CALL getResultSet()
throw(SQLException, RuntimeException, std::exception) SAL_OVERRIDE;
css::uno::Reference< css::sdbc::XResultSet > SAL_CALL getResultSet() SAL_OVERRIDE;
sal_Int32 SAL_CALL getUpdateCount() throw(SQLException, RuntimeException, std::exception) SAL_OVERRIDE;
sal_Int32 SAL_CALL getUpdateCount() SAL_OVERRIDE;
sal_Bool SAL_CALL getMoreResults() throw(SQLException, RuntimeException, std::exception) SAL_OVERRIDE;
sal_Bool SAL_CALL getMoreResults() SAL_OVERRIDE;
// other methods
OConnection* getOwnConnection() const { return m_pConnection;}
......@@ -175,31 +165,27 @@ namespace connectivity
OStatement(OConnection* _pConnection, sql::Statement *_cppStatement) :
OCommonStatement(_pConnection, _cppStatement) {}
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;
Any SAL_CALL queryInterface( const css::uno::Type & rType )
throw(RuntimeException, std::exception) SAL_OVERRIDE;
Any SAL_CALL queryInterface( const css::uno::Type & rType ) SAL_OVERRIDE;
void SAL_CALL acquire() throw() SAL_OVERRIDE;
void SAL_CALL release() throw() SAL_OVERRIDE;
// XBatchExecution
void SAL_CALL addBatch(const rtl::OUString& sql)
throw(SQLException, RuntimeException, std::exception) SAL_OVERRIDE;
void SAL_CALL addBatch(const rtl::OUString& sql) SAL_OVERRIDE;
void SAL_CALL clearBatch() throw(SQLException, RuntimeException, std::exception) SAL_OVERRIDE;
void SAL_CALL clearBatch() SAL_OVERRIDE;
css::uno::Sequence< sal_Int32 > SAL_CALL executeBatch()
throw(SQLException, RuntimeException, std::exception) SAL_OVERRIDE;
css::uno::Sequence< sal_Int32 > SAL_CALL executeBatch() SAL_OVERRIDE;
};
}
......
mysqlc/source/mysqlc_subcomponent.hxx
Dosyayı görüntüle @ b61214c9
......@@ -55,7 +55,8 @@ namespace connectivity
css::uno::Reference< css::uno::XInterface >& _xInterface,
css::lang::XComponent* _pObject);
void checkDisposed(bool _bThrow) throw (css::lang::DisposedException);
/// @throws css::lang::DisposedException
void checkDisposed(bool _bThrow);
template <class SELF, class WEAK> class OSubComponent
{
......
ure/source/uretest/cppmain.cc
Dosyayı görüntüle @ b61214c9
......@@ -84,8 +84,7 @@ public:
context_(context) {}
virtual ::sal_Int32 SAL_CALL run(
css::uno::Sequence< ::rtl::OUString > const &)
throw (css::uno::RuntimeException);
css::uno::Sequence< ::rtl::OUString > const &);
private:
Service(Service &); // not defined
......@@ -100,9 +99,7 @@ private:
css::uno::Reference< css::uno::XComponentContext > context_;
};
::sal_Int32 Service::run(css::uno::Sequence< ::rtl::OUString > const &)
throw (css::uno::RuntimeException)
{
::sal_Int32 Service::run(css::uno::Sequence< ::rtl::OUString > const &) {
osl_getThreadIdentifier(0); // check for sal
(new salhelper::SimpleReferenceObject)->release(); // check for salhelper
css::uno::getCurrentContext(); // check for cppu
......
ure/source/uretest/cppserver.cc
Dosyayı görüntüle @ b61214c9
......@@ -44,9 +44,7 @@ class Service: public ::cppu::WeakImplHelper1< ::test::types::XServer > {
public:
Service() {}
virtual ::test::types::Data SAL_CALL getData()
throw (css::uno::RuntimeException)
{
virtual ::test::types::Data SAL_CALL getData() {
return ::test::types::Data(rtl::OUString("Hello"), 42);
}
......
ure/source/uretest/cpptest.cc
Dosyayı görüntüle @ b61214c9
......@@ -42,9 +42,7 @@ class Service: public cppu::WeakImplHelper1< test::types::XTest > {
public:
Service() {}
virtual void SAL_CALL throwException()
throw (test::types::TestException, css::uno::RuntimeException)
{
virtual void SAL_CALL throwException() {
throw test::types::TestException(
rtl::OUString("test"),
static_cast< cppu::OWeakObject * >(this));
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment