summaryrefslogtreecommitdiff
path: root/cppuhelper
diff options
context:
space:
mode:
Diffstat (limited to 'cppuhelper')
-rw-r--r--cppuhelper/qa/ifcontainer/cppu_ifcontainer.cxx3
-rw-r--r--cppuhelper/qa/weak/test_weak.cxx2
-rw-r--r--cppuhelper/source/component.cxx9
-rw-r--r--cppuhelper/source/component_context.cxx52
-rw-r--r--cppuhelper/source/exc_thrower.cxx12
-rw-r--r--cppuhelper/source/factory.cxx147
-rw-r--r--cppuhelper/source/implbase.cxx9
-rw-r--r--cppuhelper/source/macro_expander.cxx16
-rw-r--r--cppuhelper/source/propertysetmixin.cxx46
-rw-r--r--cppuhelper/source/propshlp.cxx44
-rw-r--r--cppuhelper/source/servicemanager.cxx91
-rw-r--r--cppuhelper/source/servicemanager.hxx93
-rw-r--r--cppuhelper/source/tdmgr.cxx4
-rw-r--r--cppuhelper/source/typemanager.cxx361
-rw-r--r--cppuhelper/source/typemanager.hxx41
-rw-r--r--cppuhelper/source/weak.cxx33
16 files changed, 282 insertions, 681 deletions
diff --git a/cppuhelper/qa/ifcontainer/cppu_ifcontainer.cxx b/cppuhelper/qa/ifcontainer/cppu_ifcontainer.cxx
index 0484eecbce7d..a535d3c7283c 100644
--- a/cppuhelper/qa/ifcontainer/cppu_ifcontainer.cxx
+++ b/cppuhelper/qa/ifcontainer/cppu_ifcontainer.cxx
@@ -49,8 +49,7 @@ public:
explicit ContainerListener(ContainerStats *pStats)
: m_pStats(pStats) { m_pStats->m_nAlive++; }
virtual ~ContainerListener() override { m_pStats->m_nAlive--; }
- virtual void SAL_CALL disposing( const EventObject& )
- throw (RuntimeException, std::exception) override
+ virtual void SAL_CALL disposing( const EventObject& ) override
{
m_pStats->m_nDisposed++;
}
diff --git a/cppuhelper/qa/weak/test_weak.cxx b/cppuhelper/qa/weak/test_weak.cxx
index 2a1d23e1c2a8..e37131c9f543 100644
--- a/cppuhelper/qa/weak/test_weak.cxx
+++ b/cppuhelper/qa/weak/test_weak.cxx
@@ -38,7 +38,7 @@ class Reference: public cppu::WeakImplHelper< css::uno::XReference > {
public:
Reference(): m_disposed(false) {}
- void SAL_CALL dispose() throw (css::uno::RuntimeException) override {
+ void SAL_CALL dispose() override {
m_disposed = true;
handleDispose();
}
diff --git a/cppuhelper/source/component.cxx b/cppuhelper/source/component.cxx
index 17f799fc3c8c..aa8e68c7dfbb 100644
--- a/cppuhelper/source/component.cxx
+++ b/cppuhelper/source/component.cxx
@@ -47,11 +47,11 @@ OComponentHelper::~OComponentHelper()
{
}
-Any OComponentHelper::queryInterface( Type const & rType ) throw (RuntimeException, std::exception)
+Any OComponentHelper::queryInterface( Type const & rType )
{
return OWeakAggObject::queryInterface( rType );
}
-Any OComponentHelper::queryAggregation( Type const & rType ) throw (RuntimeException, std::exception)
+Any OComponentHelper::queryAggregation( Type const & rType )
{
if (rType == cppu::UnoType<lang::XComponent>::get())
{
@@ -112,7 +112,7 @@ void OComponentHelper::release() throw()
OWeakAggObject::release();
}
-Sequence< Type > OComponentHelper::getTypes() throw (RuntimeException, std::exception)
+Sequence< Type > OComponentHelper::getTypes()
{
static OTypeCollection * s_pTypes = nullptr;
if (! s_pTypes)
@@ -138,7 +138,6 @@ void OComponentHelper::disposing()
// XComponent
void OComponentHelper::dispose()
- throw(css::uno::RuntimeException, std::exception)
{
// An frequently programming error is to release the last
// reference to this object in the disposing message.
@@ -211,7 +210,6 @@ void OComponentHelper::dispose()
// XComponent
void OComponentHelper::addEventListener(
const Reference<XEventListener > & rxListener )
- throw(css::uno::RuntimeException, std::exception)
{
ClearableMutexGuard aGuard( rBHelper.rMutex );
if (rBHelper.bDisposed || rBHelper.bInDispose)
@@ -229,7 +227,6 @@ void OComponentHelper::addEventListener(
// XComponent
void OComponentHelper::removeEventListener(
const Reference<XEventListener > & rxListener )
- throw(css::uno::RuntimeException, std::exception)
{
rBHelper.removeListener( cppu::UnoType<decltype(rxListener)>::get(), rxListener );
}
diff --git a/cppuhelper/source/component_context.cxx b/cppuhelper/source/component_context.cxx
index 3fb4b94b6432..8bc46d9281ef 100644
--- a/cppuhelper/source/component_context.cxx
+++ b/cppuhelper/source/component_context.cxx
@@ -93,8 +93,7 @@ public:
Reference< lang::XComponent > const & xSource,
Reference< lang::XComponent > const & xTarget );
- virtual void SAL_CALL disposing( lang::EventObject const & rSource )
- throw (RuntimeException, std::exception) override;
+ virtual void SAL_CALL disposing( lang::EventObject const & rSource ) override;
};
inline void DisposingForwarder::listen(
@@ -108,7 +107,6 @@ inline void DisposingForwarder::listen(
}
void DisposingForwarder::disposing( lang::EventObject const & )
- throw (RuntimeException, std::exception)
{
m_xTarget->dispose();
m_xTarget.clear();
@@ -156,43 +154,29 @@ public:
virtual ~ComponentContext() override;
// XComponentContext
- virtual Any SAL_CALL getValueByName( OUString const & rName )
- throw (RuntimeException, std::exception) override;
- virtual Reference<lang::XMultiComponentFactory> SAL_CALL getServiceManager()
- throw (RuntimeException, std::exception) override;
+ virtual Any SAL_CALL getValueByName( OUString const & rName ) override;
+ virtual Reference<lang::XMultiComponentFactory> SAL_CALL getServiceManager() override;
// XNameContainer
virtual void SAL_CALL insertByName(
- OUString const & name, Any const & element )
- throw (lang::IllegalArgumentException, container::ElementExistException,
- lang::WrappedTargetException, RuntimeException, std::exception) override;
- virtual void SAL_CALL removeByName( OUString const & name )
- throw (container::NoSuchElementException,
- lang::WrappedTargetException, RuntimeException, std::exception) override;
+ OUString const & name, Any const & element ) override;
+ virtual void SAL_CALL removeByName( OUString const & name ) override;
// XNameReplace
virtual void SAL_CALL replaceByName(
- OUString const & name, Any const & element )
- throw (lang::IllegalArgumentException,container::NoSuchElementException,
- lang::WrappedTargetException, RuntimeException, std::exception) override;
+ OUString const & name, Any const & element ) override;
// XNameAccess
- virtual Any SAL_CALL getByName( OUString const & name )
- throw (container::NoSuchElementException,
- lang::WrappedTargetException, RuntimeException, std::exception) override;
- virtual Sequence<OUString> SAL_CALL getElementNames()
- throw (RuntimeException, std::exception) override;
- virtual sal_Bool SAL_CALL hasByName( OUString const & name )
- throw (RuntimeException, std::exception) override;
+ virtual Any SAL_CALL getByName( OUString const & name ) override;
+ virtual Sequence<OUString> SAL_CALL getElementNames() override;
+ virtual sal_Bool SAL_CALL hasByName( OUString const & name ) override;
// XElementAccess
- virtual Type SAL_CALL getElementType() throw (RuntimeException, std::exception) override;
- virtual sal_Bool SAL_CALL hasElements() throw (RuntimeException, std::exception) override;
+ virtual Type SAL_CALL getElementType() override;
+ virtual sal_Bool SAL_CALL hasElements() override;
};
// XNameContainer
void ComponentContext::insertByName(
OUString const & name, Any const & element )
- throw (lang::IllegalArgumentException, container::ElementExistException,
- lang::WrappedTargetException, RuntimeException, std::exception)
{
t_map::mapped_type entry(
new ContextEntry(
@@ -211,8 +195,6 @@ void ComponentContext::insertByName(
void ComponentContext::removeByName( OUString const & name )
- throw (container::NoSuchElementException,
- lang::WrappedTargetException, RuntimeException, std::exception)
{
MutexGuard guard( m_mutex );
t_map::iterator iFind( m_map.find( name ) );
@@ -229,8 +211,6 @@ void ComponentContext::removeByName( OUString const & name )
void ComponentContext::replaceByName(
OUString const & name, Any const & element )
- throw (lang::IllegalArgumentException,container::NoSuchElementException,
- lang::WrappedTargetException, RuntimeException, std::exception)
{
MutexGuard guard( m_mutex );
t_map::const_iterator const iFind( m_map.find( name ) );
@@ -254,15 +234,12 @@ void ComponentContext::replaceByName(
// XNameAccess
Any ComponentContext::getByName( OUString const & name )
- throw (container::NoSuchElementException,
- lang::WrappedTargetException, RuntimeException, std::exception)
{
return getValueByName( name );
}
Sequence<OUString> ComponentContext::getElementNames()
- throw (RuntimeException, std::exception)
{
MutexGuard guard( m_mutex );
Sequence<OUString> ret( m_map.size() );
@@ -277,7 +254,6 @@ Sequence<OUString> ComponentContext::getElementNames()
sal_Bool ComponentContext::hasByName( OUString const & name )
- throw (RuntimeException, std::exception)
{
MutexGuard guard( m_mutex );
return m_map.find( name ) != m_map.end();
@@ -285,13 +261,13 @@ sal_Bool ComponentContext::hasByName( OUString const & name )
// XElementAccess
-Type ComponentContext::getElementType() throw (RuntimeException, std::exception)
+Type ComponentContext::getElementType()
{
return cppu::UnoType<void>::get();
}
-sal_Bool ComponentContext::hasElements() throw (RuntimeException, std::exception)
+sal_Bool ComponentContext::hasElements()
{
MutexGuard guard( m_mutex );
return ! m_map.empty();
@@ -395,7 +371,6 @@ Any ComponentContext::lookupMap( OUString const & rName )
Any ComponentContext::getValueByName( OUString const & rName )
- throw (RuntimeException, std::exception)
{
// to determine the root context:
if ( rName == "_root" )
@@ -415,7 +390,6 @@ Any ComponentContext::getValueByName( OUString const & rName )
}
Reference< lang::XMultiComponentFactory > ComponentContext::getServiceManager()
- throw (RuntimeException, std::exception)
{
if ( !m_xSMgr.is() )
{
diff --git a/cppuhelper/source/exc_thrower.cxx b/cppuhelper/source/exc_thrower.cxx
index 7d3e24b7344b..6bec68874031 100644
--- a/cppuhelper/source/exc_thrower.cxx
+++ b/cppuhelper/source/exc_thrower.cxx
@@ -53,14 +53,13 @@ struct ExceptionThrower : public uno_Interface, XExceptionThrower
}
// XInterface
- virtual Any SAL_CALL queryInterface( Type const & type )
- throw (RuntimeException, std::exception) override;
+ virtual Any SAL_CALL queryInterface( Type const & type ) override;
virtual void SAL_CALL acquire() throw () override;
virtual void SAL_CALL release() throw () override;
// XExceptionThrower
- virtual void SAL_CALL throwException( Any const & exc ) throw (Exception, std::exception) override;
- virtual void SAL_CALL rethrowException() throw (Exception, std::exception) override;
+ virtual void SAL_CALL throwException( Any const & exc ) override;
+ virtual void SAL_CALL rethrowException() override;
};
extern "C"
@@ -129,7 +128,6 @@ void SAL_CALL ExceptionThrower_dispatch(
Any ExceptionThrower::queryInterface( Type const & type )
- throw (RuntimeException, std::exception)
{
if (type.equals( cppu::UnoType<XInterface>::get() ) ||
type.equals( ExceptionThrower::getCppuType() ))
@@ -150,14 +148,14 @@ void ExceptionThrower::release() throw ()
}
-void ExceptionThrower::throwException( Any const & exc ) throw (Exception, std::exception)
+void ExceptionThrower::throwException( Any const & exc )
{
OSL_FAIL( "unexpected!" );
cppu::throwException( exc );
}
-void ExceptionThrower::rethrowException() throw (Exception, std::exception)
+void ExceptionThrower::rethrowException()
{
throw;
}
diff --git a/cppuhelper/source/factory.cxx b/cppuhelper/source/factory.cxx
index 49db5466f449..65f8553657b6 100644
--- a/cppuhelper/source/factory.cxx
+++ b/cppuhelper/source/factory.cxx
@@ -82,30 +82,22 @@ public:
virtual ~OSingleFactoryHelper();
// XInterface
- Any SAL_CALL queryInterface( const Type & rType )
- throw(css::uno::RuntimeException, std::exception) override;
+ Any SAL_CALL queryInterface( const Type & rType ) override;
// XSingleServiceFactory
- Reference<XInterface > SAL_CALL createInstance()
- throw(css::uno::Exception, css::uno::RuntimeException, std::exception) override;
- virtual Reference<XInterface > SAL_CALL createInstanceWithArguments(const Sequence<Any>& Arguments)
- throw(css::uno::Exception, css::uno::RuntimeException, std::exception) override;
+ Reference<XInterface > SAL_CALL createInstance() override;
+ virtual Reference<XInterface > SAL_CALL createInstanceWithArguments(const Sequence<Any>& Arguments) override;
// XSingleComponentFactory
virtual Reference< XInterface > SAL_CALL createInstanceWithContext(
- Reference< XComponentContext > const & xContext )
- throw (Exception, RuntimeException, std::exception) override;
+ Reference< XComponentContext > const & xContext ) override;
virtual Reference< XInterface > SAL_CALL createInstanceWithArgumentsAndContext(
Sequence< Any > const & rArguments,
- Reference< XComponentContext > const & xContext )
- throw (Exception, RuntimeException, std::exception) override;
+ Reference< XComponentContext > const & xContext ) override;
// XServiceInfo
- OUString SAL_CALL getImplementationName()
- throw(css::uno::RuntimeException, std::exception) override;
- sal_Bool SAL_CALL supportsService(const OUString& ServiceName)
- throw(css::uno::RuntimeException, std::exception) override;
- Sequence< OUString > SAL_CALL getSupportedServiceNames()
- throw(css::uno::RuntimeException, std::exception) override;
+ OUString SAL_CALL getImplementationName() override;
+ sal_Bool SAL_CALL supportsService(const OUString& ServiceName) override;
+ Sequence< OUString > SAL_CALL getSupportedServiceNames() override;
protected:
/**
@@ -116,8 +108,7 @@ protected:
* @throw css::uno::RuntimeException
*/
virtual Reference<XInterface > createInstanceEveryTime(
- Reference< XComponentContext > const & xContext )
- throw(css::uno::Exception, css::uno::RuntimeException);
+ Reference< XComponentContext > const & xContext );
Reference<XMultiServiceFactory > xSMgr;
ComponentInstantiation pCreateFunction;
@@ -131,7 +122,6 @@ OSingleFactoryHelper::~OSingleFactoryHelper()
Any OSingleFactoryHelper::queryInterface( const Type & rType )
- throw(css::uno::RuntimeException, std::exception)
{
return ::cppu::queryInterface(
rType,
@@ -144,7 +134,6 @@ Any OSingleFactoryHelper::queryInterface( const Type & rType )
// OSingleFactoryHelper
Reference<XInterface > OSingleFactoryHelper::createInstanceEveryTime(
Reference< XComponentContext > const & xContext )
- throw(css::uno::Exception, css::uno::RuntimeException)
{
if (m_fptr)
{
@@ -169,7 +158,6 @@ Reference<XInterface > OSingleFactoryHelper::createInstanceEveryTime(
// XSingleServiceFactory
Reference<XInterface > OSingleFactoryHelper::createInstance()
- throw(css::uno::Exception, css::uno::RuntimeException, std::exception)
{
return createInstanceWithContext( Reference< XComponentContext >() );
}
@@ -177,7 +165,6 @@ Reference<XInterface > OSingleFactoryHelper::createInstance()
// XSingleServiceFactory
Reference<XInterface > OSingleFactoryHelper::createInstanceWithArguments(
const Sequence<Any>& Arguments )
- throw(css::uno::Exception, css::uno::RuntimeException, std::exception)
{
return createInstanceWithArgumentsAndContext(
Arguments, Reference< XComponentContext >() );
@@ -187,7 +174,6 @@ Reference<XInterface > OSingleFactoryHelper::createInstanceWithArguments(
Reference< XInterface > OSingleFactoryHelper::createInstanceWithContext(
Reference< XComponentContext > const & xContext )
- throw (Exception, RuntimeException, std::exception)
{
return createInstanceEveryTime( xContext );
}
@@ -195,7 +181,6 @@ Reference< XInterface > OSingleFactoryHelper::createInstanceWithContext(
Reference< XInterface > OSingleFactoryHelper::createInstanceWithArgumentsAndContext(
Sequence< Any > const & rArguments,
Reference< XComponentContext > const & xContext )
- throw (Exception, RuntimeException, std::exception)
{
Reference< XInterface > xRet( createInstanceWithContext( xContext ) );
@@ -227,7 +212,6 @@ Reference< XInterface > OSingleFactoryHelper::createInstanceWithArgumentsAndCont
// XServiceInfo
OUString OSingleFactoryHelper::getImplementationName()
- throw(css::uno::RuntimeException, std::exception)
{
return aImplementationName;
}
@@ -235,14 +219,12 @@ OUString OSingleFactoryHelper::getImplementationName()
// XServiceInfo
sal_Bool OSingleFactoryHelper::supportsService(
const OUString& ServiceName )
- throw(css::uno::RuntimeException, std::exception)
{
return cppu::supportsService(this, ServiceName);
}
// XServiceInfo
Sequence< OUString > OSingleFactoryHelper::getSupportedServiceNames()
- throw(css::uno::RuntimeException, std::exception)
{
return aServiceNames;
}
@@ -272,41 +254,34 @@ public:
}
// XInterface
- Any SAL_CALL queryInterface( const Type & rType )
- throw(css::uno::RuntimeException, std::exception) override;
+ Any SAL_CALL queryInterface( const Type & rType ) override;
void SAL_CALL acquire() throw() override
{ OComponentHelper::acquire(); }
void SAL_CALL release() throw() override
{ OComponentHelper::release(); }
// XSingleServiceFactory
- Reference<XInterface > SAL_CALL createInstance()
- throw(css::uno::Exception, css::uno::RuntimeException, std::exception) override;
- Reference<XInterface > SAL_CALL createInstanceWithArguments( const Sequence<Any>& Arguments )
- throw(css::uno::Exception, css::uno::RuntimeException, std::exception) override;
+ Reference<XInterface > SAL_CALL createInstance() override;
+ Reference<XInterface > SAL_CALL createInstanceWithArguments( const Sequence<Any>& Arguments ) override;
// XSingleComponentFactory
virtual Reference< XInterface > SAL_CALL createInstanceWithContext(
- Reference< XComponentContext > const & xContext )
- throw (Exception, RuntimeException, std::exception) override;
+ Reference< XComponentContext > const & xContext ) override;
virtual Reference< XInterface > SAL_CALL createInstanceWithArgumentsAndContext(
Sequence< Any > const & rArguments,
- Reference< XComponentContext > const & xContext )
- throw (Exception, RuntimeException, std::exception) override;
+ Reference< XComponentContext > const & xContext ) override;
// XTypeProvider
- virtual Sequence< Type > SAL_CALL getTypes() throw (css::uno::RuntimeException, std::exception) override;
- virtual Sequence< sal_Int8 > SAL_CALL getImplementationId() throw(css::uno::RuntimeException, std::exception) override;
+ virtual Sequence< Type > SAL_CALL getTypes() override;
+ virtual Sequence< sal_Int8 > SAL_CALL getImplementationId() override;
// XAggregation
- Any SAL_CALL queryAggregation( const Type & rType )
- throw(css::uno::RuntimeException, std::exception) override;
+ Any SAL_CALL queryAggregation( const Type & rType ) override;
// XUnloadingPreference
- virtual sal_Bool SAL_CALL releaseOnNotification()
- throw(css::uno::RuntimeException, std::exception) override;
+ virtual sal_Bool SAL_CALL releaseOnNotification() override;
// OComponentHelper
- void SAL_CALL dispose() throw(css::uno::RuntimeException, std::exception) override;
+ void SAL_CALL dispose() override;
private:
Reference<XInterface > xTheInstance;
@@ -319,7 +294,6 @@ protected:
Any SAL_CALL OFactoryComponentHelper::queryInterface( const Type & rType )
- throw(css::uno::RuntimeException, std::exception)
{
if( rType == cppu::UnoType<XUnloadingPreference>::get() )
{
@@ -332,7 +306,6 @@ Any SAL_CALL OFactoryComponentHelper::queryInterface( const Type & rType )
// XAggregation
Any OFactoryComponentHelper::queryAggregation( const Type & rType )
- throw(css::uno::RuntimeException, std::exception)
{
Any aRet( OComponentHelper::queryAggregation( rType ) );
return (aRet.hasValue() ? aRet : OSingleFactoryHelper::queryInterface( rType ));
@@ -340,7 +313,6 @@ Any OFactoryComponentHelper::queryAggregation( const Type & rType )
// XTypeProvider
Sequence< Type > OFactoryComponentHelper::getTypes()
- throw (css::uno::RuntimeException, std::exception)
{
Type ar[ 4 ];
ar[ 0 ] = cppu::UnoType<XSingleServiceFactory>::get();
@@ -354,14 +326,12 @@ Sequence< Type > OFactoryComponentHelper::getTypes()
}
Sequence< sal_Int8 > OFactoryComponentHelper::getImplementationId()
- throw (css::uno::RuntimeException, std::exception)
{
return css::uno::Sequence<sal_Int8>();
}
// XSingleServiceFactory
Reference<XInterface > OFactoryComponentHelper::createInstance()
- throw(css::uno::Exception, css::uno::RuntimeException, std::exception)
{
if( bOneInstance )
{
@@ -378,7 +348,6 @@ Reference<XInterface > OFactoryComponentHelper::createInstance()
Reference<XInterface > OFactoryComponentHelper::createInstanceWithArguments(
const Sequence<Any>& Arguments )
- throw(css::uno::Exception, css::uno::RuntimeException, std::exception)
{
if( bOneInstance )
{
@@ -398,7 +367,6 @@ Reference<XInterface > OFactoryComponentHelper::createInstanceWithArguments(
Reference< XInterface > OFactoryComponentHelper::createInstanceWithContext(
Reference< XComponentContext > const & xContext )
- throw (Exception, RuntimeException, std::exception)
{
if( bOneInstance )
{
@@ -417,7 +385,6 @@ Reference< XInterface > OFactoryComponentHelper::createInstanceWithContext(
Reference< XInterface > OFactoryComponentHelper::createInstanceWithArgumentsAndContext(
Sequence< Any > const & rArguments,
Reference< XComponentContext > const & xContext )
- throw (Exception, RuntimeException, std::exception)
{
if( bOneInstance )
{
@@ -436,7 +403,6 @@ Reference< XInterface > OFactoryComponentHelper::createInstanceWithArgumentsAndC
// OComponentHelper
void OFactoryComponentHelper::dispose()
- throw(css::uno::RuntimeException, std::exception)
{
OComponentHelper::dispose();
@@ -460,7 +426,7 @@ void OFactoryComponentHelper::dispose()
// one-instance factory: sal_False
// single factory: sal_True
// component factory: sal_True
-sal_Bool SAL_CALL OFactoryComponentHelper::releaseOnNotification() throw(css::uno::RuntimeException, std::exception)
+sal_Bool SAL_CALL OFactoryComponentHelper::releaseOnNotification()
{
if( bOneInstance)
return false;
@@ -484,57 +450,46 @@ public:
{}
// XInterface
- virtual Any SAL_CALL queryInterface( Type const & type )
- throw (RuntimeException, std::exception) override;
+ virtual Any SAL_CALL queryInterface( Type const & type ) override;
virtual void SAL_CALL acquire() throw () override;
virtual void SAL_CALL release() throw () override;
// XTypeProvider
- virtual Sequence< Type > SAL_CALL getTypes()
- throw (RuntimeException, std::exception) override;
+ virtual Sequence< Type > SAL_CALL getTypes() override;
// XPropertySet
- virtual Reference< beans::XPropertySetInfo > SAL_CALL getPropertySetInfo()
- throw (RuntimeException, std::exception) override;
+ virtual Reference< beans::XPropertySetInfo > SAL_CALL getPropertySetInfo() override;
// OPropertySetHelper
virtual IPropertyArrayHelper & SAL_CALL getInfoHelper() override;
virtual sal_Bool SAL_CALL convertFastPropertyValue(
Any & rConvertedValue, Any & rOldValue,
- sal_Int32 nHandle, Any const & rValue )
- throw (lang::IllegalArgumentException) override;
+ sal_Int32 nHandle, Any const & rValue ) override;
virtual void SAL_CALL setFastPropertyValue_NoBroadcast(
- sal_Int32 nHandle, Any const & rValue )
- throw (Exception, std::exception) override;
+ sal_Int32 nHandle, Any const & rValue ) override;
using OPropertySetHelper::getFastPropertyValue;
virtual void SAL_CALL getFastPropertyValue(
Any & rValue, sal_Int32 nHandle ) const override;
// OSingleFactoryHelper
Reference<XInterface > createInstanceEveryTime(
- Reference< XComponentContext > const & xContext )
- throw(css::uno::Exception, css::uno::RuntimeException) override;
+ Reference< XComponentContext > const & xContext ) override;
// XSingleServiceFactory
- Reference<XInterface > SAL_CALL createInstanceWithArguments(const Sequence<Any>& Arguments)
- throw(css::uno::Exception, css::uno::RuntimeException, std::exception) override;
+ Reference<XInterface > SAL_CALL createInstanceWithArguments(const Sequence<Any>& Arguments) override;
// XSingleComponentFactory
Reference< XInterface > SAL_CALL createInstanceWithArgumentsAndContext(
Sequence< Any > const & rArguments,
- Reference< XComponentContext > const & xContext )
- throw (Exception, RuntimeException, std::exception) override;
+ Reference< XComponentContext > const & xContext ) override;
// XServiceInfo
- Sequence< OUString > SAL_CALL getSupportedServiceNames()
- throw(css::uno::RuntimeException, std::exception) override;
+ Sequence< OUString > SAL_CALL getSupportedServiceNames() override;
// XUnloadingPreference
- sal_Bool SAL_CALL releaseOnNotification()
- throw( RuntimeException, std::exception) override;
+ sal_Bool SAL_CALL releaseOnNotification() override;
private:
/// @throws css::uno::Exception
/// @throws css::uno::RuntimeException
- Reference< XInterface > createModuleFactory()
- throw(css::uno::Exception, css::uno::RuntimeException);
+ Reference< XInterface > createModuleFactory();
/** The registry key of the implementation section */
Reference<XRegistryKey > xImplementationKey;
@@ -550,7 +505,7 @@ protected:
// XInterface
Any SAL_CALL ORegistryFactoryHelper::queryInterface(
- Type const & type ) throw (RuntimeException, std::exception)
+ Type const & type )
{
Any ret( OFactoryComponentHelper::queryInterface( type ) );
if (ret.hasValue())
@@ -573,7 +528,7 @@ void ORegistryFactoryHelper::release() throw ()
// XTypeProvider
-Sequence< Type > ORegistryFactoryHelper::getTypes() throw (RuntimeException, std::exception)
+Sequence< Type > ORegistryFactoryHelper::getTypes()
{
Sequence< Type > types( OFactoryComponentHelper::getTypes() );
sal_Int32 pos = types.getLength();
@@ -588,7 +543,7 @@ Sequence< Type > ORegistryFactoryHelper::getTypes() throw (RuntimeException, std
// XPropertySet
Reference< beans::XPropertySetInfo >
-ORegistryFactoryHelper::getPropertySetInfo() throw (RuntimeException, std::exception)
+ORegistryFactoryHelper::getPropertySetInfo()
{
::osl::MutexGuard guard( aMutex );
if (! m_xInfo.is())
@@ -618,7 +573,6 @@ IPropertyArrayHelper & ORegistryFactoryHelper::getInfoHelper()
sal_Bool ORegistryFactoryHelper::convertFastPropertyValue(
Any &, Any &, sal_Int32, Any const & )
- throw (lang::IllegalArgumentException)
{
OSL_FAIL( "unexpected!" );
return false;
@@ -627,7 +581,6 @@ sal_Bool ORegistryFactoryHelper::convertFastPropertyValue(
void ORegistryFactoryHelper::setFastPropertyValue_NoBroadcast(
sal_Int32, Any const & )
- throw (Exception, std::exception)
{
throw beans::PropertyVetoException(
"unexpected: only readonly properties!",
@@ -653,7 +606,6 @@ void ORegistryFactoryHelper::getFastPropertyValue(
Reference<XInterface > ORegistryFactoryHelper::createInstanceEveryTime(
Reference< XComponentContext > const & xContext )
- throw(css::uno::Exception, css::uno::RuntimeException)
{
if( !xModuleFactory.is() && !xModuleFactoryDepr.is() )
{
@@ -682,7 +634,6 @@ Reference<XInterface > ORegistryFactoryHelper::createInstanceEveryTime(
Reference<XInterface > SAL_CALL ORegistryFactoryHelper::createInstanceWithArguments(
const Sequence<Any>& Arguments )
- throw(css::uno::Exception, css::uno::RuntimeException, std::exception)
{
if( !xModuleFactory.is() && !xModuleFactoryDepr.is() )
{
@@ -713,7 +664,6 @@ Reference<XInterface > SAL_CALL ORegistryFactoryHelper::createInstanceWithArgume
Reference< XInterface > ORegistryFactoryHelper::createInstanceWithArgumentsAndContext(
Sequence< Any > const & rArguments,
Reference< XComponentContext > const & xContext )
- throw (Exception, RuntimeException, std::exception)
{
if( !xModuleFactory.is() && !xModuleFactoryDepr.is() )
{
@@ -744,7 +694,6 @@ Reference< XInterface > ORegistryFactoryHelper::createInstanceWithArgumentsAndCo
// OSingleFactoryHelper
Reference< XInterface > ORegistryFactoryHelper::createModuleFactory()
- throw(css::uno::Exception, css::uno::RuntimeException)
{
OUString aActivatorUrl;
OUString aActivatorName;
@@ -807,7 +756,6 @@ Reference< XInterface > ORegistryFactoryHelper::createModuleFactory()
// XServiceInfo
Sequence< OUString > ORegistryFactoryHelper::getSupportedServiceNames()
- throw(css::uno::RuntimeException, std::exception)
{
MutexGuard aGuard( aMutex );
if( aServiceNames.getLength() == 0 )
@@ -838,7 +786,7 @@ Sequence< OUString > ORegistryFactoryHelper::getSupportedServiceNames()
return aServiceNames;
}
-sal_Bool SAL_CALL ORegistryFactoryHelper::releaseOnNotification() throw(css::uno::RuntimeException, std::exception)
+sal_Bool SAL_CALL ORegistryFactoryHelper::releaseOnNotification()
{
bool retVal= true;
if( isOneInstance() && isInstance())
@@ -876,27 +824,20 @@ public:
{}
// XSingleServiceFactory
- Reference<XInterface > SAL_CALL createInstance()
- throw(css::uno::Exception, css::uno::RuntimeException, std::exception) override;
- Reference<XInterface > SAL_CALL createInstanceWithArguments(const Sequence<Any>& Arguments)
- throw(css::uno::Exception, css::uno::RuntimeException, std::exception) override;
+ Reference<XInterface > SAL_CALL createInstance() override;
+ Reference<XInterface > SAL_CALL createInstanceWithArguments(const Sequence<Any>& Arguments) override;
// XServiceInfo
- OUString SAL_CALL getImplementationName()
- throw(css::uno::RuntimeException, std::exception) override;
- sal_Bool SAL_CALL supportsService(const OUString& ServiceName)
- throw(css::uno::RuntimeException, std::exception) override;
- Sequence< OUString > SAL_CALL getSupportedServiceNames()
- throw(css::uno::RuntimeException, std::exception) override;
+ OUString SAL_CALL getImplementationName() override;
+ sal_Bool SAL_CALL supportsService(const OUString& ServiceName) override;
+ Sequence< OUString > SAL_CALL getSupportedServiceNames() override;
//XUnloadingPreference
- sal_Bool SAL_CALL releaseOnNotification()
- throw(css::uno::RuntimeException, std::exception) override;
+ sal_Bool SAL_CALL releaseOnNotification() override;
};
// XSingleServiceFactory
Reference<XInterface > OFactoryProxyHelper::createInstance()
- throw(css::uno::Exception, css::uno::RuntimeException, std::exception)
{
return xFactory->createInstance();
}
@@ -906,14 +847,12 @@ Reference<XInterface > OFactoryProxyHelper::createInstanceWithArguments
(
const Sequence<Any>& Arguments
)
- throw(css::uno::Exception, css::uno::RuntimeException, std::exception)
{
return xFactory->createInstanceWithArguments( Arguments );
}
// XServiceInfo
OUString OFactoryProxyHelper::getImplementationName()
- throw(css::uno::RuntimeException, std::exception)
{
Reference<XServiceInfo > xInfo( xFactory, UNO_QUERY );
if( xInfo.is() )
@@ -923,14 +862,12 @@ OUString OFactoryProxyHelper::getImplementationName()
// XServiceInfo
sal_Bool OFactoryProxyHelper::supportsService(const OUString& ServiceName)
- throw(css::uno::RuntimeException, std::exception)
{
return cppu::supportsService(this, ServiceName);
}
// XServiceInfo
Sequence< OUString > OFactoryProxyHelper::getSupportedServiceNames()
- throw(css::uno::RuntimeException, std::exception)
{
Reference<XServiceInfo > xInfo( xFactory, UNO_QUERY );
if( xInfo.is() )
@@ -938,7 +875,7 @@ Sequence< OUString > OFactoryProxyHelper::getSupportedServiceNames()
return Sequence< OUString >();
}
-sal_Bool SAL_CALL OFactoryProxyHelper::releaseOnNotification() throw(css::uno::RuntimeException, std::exception)
+sal_Bool SAL_CALL OFactoryProxyHelper::releaseOnNotification()
{
Reference<XUnloadingPreference> pref( xFactory, UNO_QUERY);
diff --git a/cppuhelper/source/implbase.cxx b/cppuhelper/source/implbase.cxx
index 32526450b8b8..6118ccb79fc1 100644
--- a/cppuhelper/source/implbase.cxx
+++ b/cppuhelper/source/implbase.cxx
@@ -49,7 +49,6 @@ void WeakComponentImplHelperBase::disposing()
}
Any WeakComponentImplHelperBase::queryInterface( Type const & rType )
- throw (RuntimeException, std::exception)
{
if (rType == cppu::UnoType<lang::XComponent>::get())
{
@@ -90,7 +89,6 @@ void WeakComponentImplHelperBase::release()
}
void WeakComponentImplHelperBase::dispose()
- throw (RuntimeException, std::exception)
{
ClearableMutexGuard aGuard( rBHelper.rMutex );
if (!rBHelper.bDisposed && !rBHelper.bInDispose)
@@ -133,7 +131,6 @@ void WeakComponentImplHelperBase::dispose()
void WeakComponentImplHelperBase::addEventListener(
Reference< lang::XEventListener > const & xListener )
- throw (RuntimeException, std::exception)
{
ClearableMutexGuard aGuard( rBHelper.rMutex );
if (rBHelper.bDisposed || rBHelper.bInDispose)
@@ -150,7 +147,6 @@ void WeakComponentImplHelperBase::addEventListener(
void WeakComponentImplHelperBase::removeEventListener(
Reference< lang::XEventListener > const & xListener )
- throw (RuntimeException, std::exception)
{
rBHelper.removeListener( cppu::UnoType<decltype(xListener)>::get(), xListener );
}
@@ -171,13 +167,11 @@ void WeakAggComponentImplHelperBase::disposing()
}
Any WeakAggComponentImplHelperBase::queryInterface( Type const & rType )
- throw (RuntimeException, std::exception)
{
return OWeakAggObject::queryInterface( rType );
}
Any WeakAggComponentImplHelperBase::queryAggregation( Type const & rType )
- throw (RuntimeException, std::exception)
{
if (rType == cppu::UnoType<lang::XComponent>::get())
{
@@ -222,7 +216,6 @@ void WeakAggComponentImplHelperBase::release()
}
void WeakAggComponentImplHelperBase::dispose()
- throw (RuntimeException, std::exception)
{
ClearableMutexGuard aGuard( rBHelper.rMutex );
if (!rBHelper.bDisposed && !rBHelper.bInDispose)
@@ -265,7 +258,6 @@ void WeakAggComponentImplHelperBase::dispose()
void WeakAggComponentImplHelperBase::addEventListener(
Reference< lang::XEventListener > const & xListener )
- throw (RuntimeException, std::exception)
{
ClearableMutexGuard aGuard( rBHelper.rMutex );
if (rBHelper.bDisposed || rBHelper.bInDispose)
@@ -282,7 +274,6 @@ void WeakAggComponentImplHelperBase::addEventListener(
void WeakAggComponentImplHelperBase::removeEventListener(
Reference< lang::XEventListener > const & xListener )
- throw (RuntimeException, std::exception)
{
// if we have disposed, then we have cleared the list already
MutexGuard aGuard( rBHelper.rMutex );
diff --git a/cppuhelper/source/macro_expander.cxx b/cppuhelper/source/macro_expander.cxx
index 923ee4d67dc8..8180065b2207 100644
--- a/cppuhelper/source/macro_expander.cxx
+++ b/cppuhelper/source/macro_expander.cxx
@@ -131,15 +131,11 @@ public:
{}
// XMacroExpander impl
- virtual OUString SAL_CALL expandMacros( OUString const & exp )
- throw (lang::IllegalArgumentException, uno::RuntimeException, std::exception) override;
+ virtual OUString SAL_CALL expandMacros( OUString const & exp ) override;
// XServiceInfo impl
- virtual OUString SAL_CALL getImplementationName()
- throw (RuntimeException, std::exception) override;
- virtual sal_Bool SAL_CALL supportsService( OUString const & serviceName )
- throw (RuntimeException, std::exception) override;
- virtual Sequence< OUString > SAL_CALL getSupportedServiceNames()
- throw (RuntimeException, std::exception) override;
+ virtual OUString SAL_CALL getImplementationName() override;
+ virtual sal_Bool SAL_CALL supportsService( OUString const & serviceName ) override;
+ virtual Sequence< OUString > SAL_CALL getSupportedServiceNames() override;
};
@@ -149,19 +145,16 @@ void Bootstrap_MacroExpander::disposing()
// XServiceInfo impl
OUString Bootstrap_MacroExpander::getImplementationName()
- throw (RuntimeException, std::exception)
{
return s_impl_name();
}
sal_Bool Bootstrap_MacroExpander::supportsService( OUString const & serviceName )
- throw (RuntimeException, std::exception)
{
return cppu::supportsService(this, serviceName);
}
Sequence< OUString > Bootstrap_MacroExpander::getSupportedServiceNames()
- throw (RuntimeException, std::exception)
{
return s_get_service_names();
}
@@ -169,7 +162,6 @@ Sequence< OUString > Bootstrap_MacroExpander::getSupportedServiceNames()
// XMacroExpander impl
OUString Bootstrap_MacroExpander::expandMacros( OUString const & exp )
- throw (lang::IllegalArgumentException, uno::RuntimeException, std::exception)
{
return cppuhelper::detail::expandMacros( exp );
}
diff --git a/cppuhelper/source/propertysetmixin.cxx b/cppuhelper/source/propertysetmixin.cxx
index 30aa0b90d822..c6de17a7d23b 100644
--- a/cppuhelper/source/propertysetmixin.cxx
+++ b/cppuhelper/source/propertysetmixin.cxx
@@ -279,23 +279,18 @@ class Info: public cppu::WeakImplHelper< css::beans::XPropertySetInfo > {
public:
explicit Info(Data * data): m_data(data) {}
- virtual css::uno::Sequence< css::beans::Property > SAL_CALL getProperties()
- throw (css::uno::RuntimeException, std::exception) override;
+ virtual css::uno::Sequence< css::beans::Property > SAL_CALL getProperties() override;
virtual css::beans::Property SAL_CALL getPropertyByName(
- rtl::OUString const & name)
- throw (
- css::beans::UnknownPropertyException, css::uno::RuntimeException, std::exception) override;
+ rtl::OUString const & name) override;
- virtual sal_Bool SAL_CALL hasPropertyByName(rtl::OUString const & name)
- throw (css::uno::RuntimeException, std::exception) override;
+ virtual sal_Bool SAL_CALL hasPropertyByName(rtl::OUString const & name) override;
private:
rtl::Reference< Data > m_data;
};
css::uno::Sequence< css::beans::Property > Info::getProperties()
- throw (css::uno::RuntimeException, std::exception)
{
assert(m_data->properties.size() <= SAL_MAX_INT32);
css::uno::Sequence< css::beans::Property > s(
@@ -313,14 +308,12 @@ css::uno::Sequence< css::beans::Property > Info::getProperties()
}
css::beans::Property Info::getPropertyByName(rtl::OUString const & name)
- throw (css::beans::UnknownPropertyException, css::uno::RuntimeException, std::exception)
{
return m_data->get(static_cast< cppu::OWeakObject * >(this), name)->
second.property;
}
sal_Bool Info::hasPropertyByName(rtl::OUString const & name)
- throw (css::uno::RuntimeException, std::exception)
{
Data::PropertyMap::iterator i(m_data->properties.find(name));
return i != m_data->properties.end() && i->second.present;
@@ -954,7 +947,6 @@ void PropertySetMixinImpl::dispose() {
}
css::uno::Any PropertySetMixinImpl::queryInterface(css::uno::Type const & type)
- throw (css::uno::RuntimeException, std::exception)
{
if (((m_impl->implements & IMPLEMENTS_PROPERTY_SET) != 0
&& type == css::beans::XPropertySet::static_type()))
@@ -981,17 +973,12 @@ css::uno::Any PropertySetMixinImpl::queryInterface(css::uno::Type const & type)
css::uno::Reference< css::beans::XPropertySetInfo >
PropertySetMixinImpl::getPropertySetInfo()
- throw (css::uno::RuntimeException, std::exception)
{
return new Info(m_impl);
}
void PropertySetMixinImpl::setPropertyValue(
rtl::OUString const & propertyName, css::uno::Any const & value)
- throw (
- css::beans::UnknownPropertyException, css::beans::PropertyVetoException,
- css::lang::IllegalArgumentException, css::lang::WrappedTargetException,
- css::uno::RuntimeException, std::exception)
{
m_impl->setProperty(
static_cast< css::beans::XPropertySet * >(this), propertyName, value,
@@ -1000,9 +987,6 @@ void PropertySetMixinImpl::setPropertyValue(
css::uno::Any PropertySetMixinImpl::getPropertyValue(
rtl::OUString const & propertyName)
- throw (
- css::beans::UnknownPropertyException, css::lang::WrappedTargetException,
- css::uno::RuntimeException, std::exception)
{
return m_impl->getProperty(
static_cast< css::beans::XPropertySet * >(this), propertyName, nullptr);
@@ -1011,9 +995,6 @@ css::uno::Any PropertySetMixinImpl::getPropertyValue(
void PropertySetMixinImpl::addPropertyChangeListener(
rtl::OUString const & propertyName,
css::uno::Reference< css::beans::XPropertyChangeListener > const & listener)
- throw (
- css::beans::UnknownPropertyException, css::lang::WrappedTargetException,
- css::uno::RuntimeException, std::exception)
{
css::uno::Reference< css::beans::XPropertyChangeListener >(
listener, css::uno::UNO_SET_THROW); // reject NULL listener
@@ -1036,9 +1017,6 @@ void PropertySetMixinImpl::addPropertyChangeListener(
void PropertySetMixinImpl::removePropertyChangeListener(
rtl::OUString const & propertyName,
css::uno::Reference< css::beans::XPropertyChangeListener > const & listener)
- throw (
- css::beans::UnknownPropertyException, css::lang::WrappedTargetException,
- css::uno::RuntimeException, std::exception)
{
assert(listener.is());
checkUnknown(propertyName);
@@ -1056,9 +1034,6 @@ void PropertySetMixinImpl::removePropertyChangeListener(
void PropertySetMixinImpl::addVetoableChangeListener(
rtl::OUString const & propertyName,
css::uno::Reference< css::beans::XVetoableChangeListener > const & listener)
- throw (
- css::beans::UnknownPropertyException, css::lang::WrappedTargetException,
- css::uno::RuntimeException, std::exception)
{
css::uno::Reference< css::beans::XVetoableChangeListener >(
listener, css::uno::UNO_SET_THROW); // reject NULL listener
@@ -1081,9 +1056,6 @@ void PropertySetMixinImpl::addVetoableChangeListener(
void PropertySetMixinImpl::removeVetoableChangeListener(
rtl::OUString const & propertyName,
css::uno::Reference< css::beans::XVetoableChangeListener > const & listener)
- throw (
- css::beans::UnknownPropertyException, css::lang::WrappedTargetException,
- css::uno::RuntimeException, std::exception)
{
assert(listener.is());
checkUnknown(propertyName);
@@ -1099,10 +1071,6 @@ void PropertySetMixinImpl::removeVetoableChangeListener(
void PropertySetMixinImpl::setFastPropertyValue(
sal_Int32 handle, css::uno::Any const & value)
- throw (
- css::beans::UnknownPropertyException, css::beans::PropertyVetoException,
- css::lang::IllegalArgumentException, css::lang::WrappedTargetException,
- css::uno::RuntimeException, std::exception)
{
m_impl->setProperty(
static_cast< css::beans::XPropertySet * >(this),
@@ -1112,9 +1080,6 @@ void PropertySetMixinImpl::setFastPropertyValue(
}
css::uno::Any PropertySetMixinImpl::getFastPropertyValue(sal_Int32 handle)
- throw (
- css::beans::UnknownPropertyException, css::lang::WrappedTargetException,
- css::uno::RuntimeException, std::exception)
{
return m_impl->getProperty(
static_cast< css::beans::XPropertySet * >(this),
@@ -1125,7 +1090,6 @@ css::uno::Any PropertySetMixinImpl::getFastPropertyValue(sal_Int32 handle)
css::uno::Sequence< css::beans::PropertyValue >
PropertySetMixinImpl::getPropertyValues()
- throw (css::uno::RuntimeException, std::exception)
{
css::uno::Sequence< css::beans::PropertyValue > s(
m_impl->handleMap.getLength());
@@ -1152,10 +1116,6 @@ PropertySetMixinImpl::getPropertyValues()
void PropertySetMixinImpl::setPropertyValues(
css::uno::Sequence< css::beans::PropertyValue > const & props)
- throw (
- css::beans::UnknownPropertyException, css::beans::PropertyVetoException,
- css::lang::IllegalArgumentException, css::lang::WrappedTargetException,
- css::uno::RuntimeException, std::exception)
{
for (sal_Int32 i = 0; i < props.getLength(); ++i) {
if (props[i].Handle != -1
diff --git a/cppuhelper/source/propshlp.cxx b/cppuhelper/source/propshlp.cxx
index 1ada97639738..bb375dd2a42c 100644
--- a/cppuhelper/source/propshlp.cxx
+++ b/cppuhelper/source/propshlp.cxx
@@ -79,9 +79,9 @@ public:
explicit OPropertySetHelperInfo_Impl( IPropertyArrayHelper & rHelper_ );
// XPropertySetInfo-methods
- virtual Sequence< Property > SAL_CALL getProperties() throw(css::uno::RuntimeException, std::exception) override;
- virtual Property SAL_CALL getPropertyByName(const OUString& PropertyName) throw(css::beans::UnknownPropertyException, css::uno::RuntimeException, std::exception) override;
- virtual sal_Bool SAL_CALL hasPropertyByName(const OUString& PropertyName) throw(css::uno::RuntimeException, std::exception) override;
+ virtual Sequence< Property > SAL_CALL getProperties() override;
+ virtual Property SAL_CALL getPropertyByName(const OUString& PropertyName) override;
+ virtual sal_Bool SAL_CALL hasPropertyByName(const OUString& PropertyName) override;
};
@@ -97,7 +97,7 @@ OPropertySetHelperInfo_Impl::OPropertySetHelperInfo_Impl(
/**
* Return the sequence of properties, which are provided through the constructor.
*/
-Sequence< Property > OPropertySetHelperInfo_Impl::getProperties() throw(css::uno::RuntimeException, std::exception)
+Sequence< Property > OPropertySetHelperInfo_Impl::getProperties()
{
return aInfos;
}
@@ -105,7 +105,7 @@ Sequence< Property > OPropertySetHelperInfo_Impl::getProperties() throw(css::uno
/**
* Return the sequence of properties, which are provided through the constructor.
*/
-Property OPropertySetHelperInfo_Impl::getPropertyByName( const OUString & PropertyName ) throw(css::beans::UnknownPropertyException, css::uno::RuntimeException, std::exception)
+Property OPropertySetHelperInfo_Impl::getPropertyByName( const OUString & PropertyName )
{
Property * pR;
pR = static_cast<Property *>(bsearch( &PropertyName, aInfos.getConstArray(), aInfos.getLength(),
@@ -121,7 +121,7 @@ Property OPropertySetHelperInfo_Impl::getPropertyByName( const OUString & Proper
/**
* Return the sequence of properties, which are provided through the constructor.
*/
-sal_Bool OPropertySetHelperInfo_Impl::hasPropertyByName( const OUString & PropertyName ) throw(css::uno::RuntimeException, std::exception)
+sal_Bool OPropertySetHelperInfo_Impl::hasPropertyByName( const OUString & PropertyName )
{
Property * pR;
pR = static_cast<Property *>(bsearch( &PropertyName, aInfos.getConstArray(), aInfos.getLength(),
@@ -207,7 +207,6 @@ OPropertySetHelper2::~OPropertySetHelper2()
// XInterface
Any OPropertySetHelper::queryInterface( const css::uno::Type & rType )
- throw (RuntimeException, std::exception)
{
return ::cppu::queryInterface(
rType,
@@ -217,7 +216,6 @@ Any OPropertySetHelper::queryInterface( const css::uno::Type & rType )
}
Any OPropertySetHelper2::queryInterface( const css::uno::Type & rType )
- throw (RuntimeException, std::exception)
{
Any cnd(cppu::queryInterface(rType, static_cast< XPropertySetOption * >(this)));
if ( cnd.hasValue() )
@@ -230,7 +228,6 @@ Any OPropertySetHelper2::queryInterface( const css::uno::Type & rType )
* called from the derivee's XTypeProvider::getTypes implementation
*/
css::uno::Sequence< css::uno::Type > OPropertySetHelper::getTypes()
- throw (RuntimeException)
{
return css::uno::Sequence<css::uno::Type>({
UnoType<css::beans::XPropertySet>::get(),
@@ -261,7 +258,6 @@ Reference < XPropertySetInfo > OPropertySetHelper::createPropertySetInfo(
// XPropertySet
void OPropertySetHelper::setPropertyValue(
const OUString& rPropertyName, const Any& rValue )
- throw(css::beans::UnknownPropertyException, css::beans::PropertyVetoException, css::lang::IllegalArgumentException, css::lang::WrappedTargetException, css::uno::RuntimeException, std::exception)
{
// get the map table
IPropertyArrayHelper & rPH = getInfoHelper();
@@ -274,7 +270,6 @@ void OPropertySetHelper::setPropertyValue(
// XPropertySet
Any OPropertySetHelper::getPropertyValue(
const OUString& rPropertyName )
- throw(css::beans::UnknownPropertyException, css::lang::WrappedTargetException, css::uno::RuntimeException, std::exception)
{
// get the map table
IPropertyArrayHelper & rPH = getInfoHelper();
@@ -288,9 +283,6 @@ Any OPropertySetHelper::getPropertyValue(
void OPropertySetHelper::addPropertyChangeListener(
const OUString& rPropertyName,
const Reference < XPropertyChangeListener > & rxListener )
- throw(css::beans::UnknownPropertyException,
- css::lang::WrappedTargetException,
- css::uno::RuntimeException, std::exception)
{
MutexGuard aGuard( rBHelper.rMutex );
OSL_ENSURE( !rBHelper.bInDispose, "do not addPropertyChangeListener in the dispose call" );
@@ -336,9 +328,6 @@ void OPropertySetHelper::addPropertyChangeListener(
void OPropertySetHelper::removePropertyChangeListener(
const OUString& rPropertyName,
const Reference < XPropertyChangeListener >& rxListener )
- throw(css::beans::UnknownPropertyException,
- css::lang::WrappedTargetException,
- css::uno::RuntimeException, std::exception)
{
MutexGuard aGuard( rBHelper.rMutex );
OSL_ENSURE( !rBHelper.bDisposed, "object is disposed" );
@@ -370,9 +359,6 @@ void OPropertySetHelper::removePropertyChangeListener(
void OPropertySetHelper::addVetoableChangeListener(
const OUString& rPropertyName,
const Reference< XVetoableChangeListener > & rxListener )
- throw(css::beans::UnknownPropertyException,
- css::lang::WrappedTargetException,
- css::uno::RuntimeException, std::exception)
{
MutexGuard aGuard( rBHelper.rMutex );
OSL_ENSURE( !rBHelper.bInDispose, "do not addVetoableChangeListener in the dispose call" );
@@ -416,9 +402,6 @@ void OPropertySetHelper::addVetoableChangeListener(
void OPropertySetHelper::removeVetoableChangeListener(
const OUString& rPropertyName,
const Reference < XVetoableChangeListener > & rxListener )
- throw(css::beans::UnknownPropertyException,
- css::lang::WrappedTargetException,
- css::uno::RuntimeException, std::exception)
{
MutexGuard aGuard( rBHelper.rMutex );
OSL_ENSURE( !rBHelper.bDisposed, "object is disposed" );
@@ -500,11 +483,6 @@ void OPropertySetHelper::setDependentFastPropertyValue( sal_Int32 i_handle, cons
// XFastPropertySet
void OPropertySetHelper::setFastPropertyValue( sal_Int32 nHandle, const Any& rValue )
- throw(css::beans::UnknownPropertyException,
- css::beans::PropertyVetoException,
- css::lang::IllegalArgumentException,
- css::lang::WrappedTargetException,
- css::uno::RuntimeException, std::exception)
{
OSL_ENSURE( !rBHelper.bInDispose, "do not setFastPropertyValue in the dispose call" );
OSL_ENSURE( !rBHelper.bDisposed, "object is disposed" );
@@ -570,9 +548,6 @@ void OPropertySetHelper::setFastPropertyValue( sal_Int32 nHandle, const Any& rVa
// XFastPropertySet
Any OPropertySetHelper::getFastPropertyValue( sal_Int32 nHandle )
- throw(css::beans::UnknownPropertyException,
- css::lang::WrappedTargetException,
- css::uno::RuntimeException, std::exception)
{
IPropertyArrayHelper & rInfo = getInfoHelper();
@@ -897,7 +872,6 @@ void OPropertySetHelper::setFastPropertyValues(
void OPropertySetHelper::setPropertyValues(
const Sequence<OUString>& rPropertyNames,
const Sequence<Any>& rValues )
- throw(css::beans::PropertyVetoException, css::lang::IllegalArgumentException, css::lang::WrappedTargetException, css::uno::RuntimeException, std::exception)
{
sal_Int32 nSeqLen = rPropertyNames.getLength();
std::unique_ptr<sal_Int32[]> pHandles(new sal_Int32[ nSeqLen ]);
@@ -911,7 +885,6 @@ void OPropertySetHelper::setPropertyValues(
// XMultiPropertySet
Sequence<Any> OPropertySetHelper::getPropertyValues( const Sequence<OUString>& rPropertyNames )
- throw(css::uno::RuntimeException, std::exception)
{
sal_Int32 nSeqLen = rPropertyNames.getLength();
std::unique_ptr<sal_Int32[]> pHandles(new sal_Int32[ nSeqLen ]);
@@ -936,7 +909,6 @@ Sequence<Any> OPropertySetHelper::getPropertyValues( const Sequence<OUString>& r
void OPropertySetHelper::addPropertiesChangeListener(
const Sequence<OUString> & ,
const Reference < XPropertiesChangeListener > & rListener )
- throw(css::uno::RuntimeException, std::exception)
{
rBHelper.addListener( cppu::UnoType<decltype(rListener)>::get(), rListener );
}
@@ -944,7 +916,6 @@ void OPropertySetHelper::addPropertiesChangeListener(
// XMultiPropertySet
void OPropertySetHelper::removePropertiesChangeListener(
const Reference < XPropertiesChangeListener > & rListener )
- throw(css::uno::RuntimeException, std::exception)
{
rBHelper.removeListener( cppu::UnoType<decltype(rListener)>::get(), rListener );
}
@@ -953,7 +924,6 @@ void OPropertySetHelper::removePropertiesChangeListener(
void OPropertySetHelper::firePropertiesChangeEvent(
const Sequence<OUString>& rPropertyNames,
const Reference < XPropertiesChangeListener >& rListener )
- throw(css::uno::RuntimeException, std::exception)
{
sal_Int32 nLen = rPropertyNames.getLength();
std::unique_ptr<sal_Int32[]> pHandles(new sal_Int32[nLen]);
@@ -995,7 +965,6 @@ void OPropertySetHelper::firePropertiesChangeEvent(
}
void OPropertySetHelper2::enableChangeListenerNotification( sal_Bool bEnable )
- throw(css::uno::RuntimeException, std::exception)
{
m_pReserved->m_bFireEvents = bEnable;
}
@@ -1111,7 +1080,6 @@ Sequence< Property > OPropertyArrayHelper::getProperties()
Property OPropertyArrayHelper::getPropertyByName(const OUString& aPropertyName)
- throw (UnknownPropertyException)
{
Property * pR;
pR = static_cast<Property *>(bsearch( &aPropertyName, aInfos.getConstArray(), aInfos.getLength(),
diff --git a/cppuhelper/source/servicemanager.cxx b/cppuhelper/source/servicemanager.cxx
index 6d2321c3b9b1..1fd8bba105c1 100644
--- a/cppuhelper/source/servicemanager.cxx
+++ b/cppuhelper/source/servicemanager.cxx
@@ -450,13 +450,9 @@ public:
private:
virtual ~ContentEnumeration() override {}
- virtual sal_Bool SAL_CALL hasMoreElements()
- throw (css::uno::RuntimeException, std::exception) override;
+ virtual sal_Bool SAL_CALL hasMoreElements() override;
- virtual css::uno::Any SAL_CALL nextElement()
- throw (
- css::container::NoSuchElementException,
- css::lang::WrappedTargetException, css::uno::RuntimeException, std::exception) override;
+ virtual css::uno::Any SAL_CALL nextElement() override;
osl::Mutex mutex_;
std::vector< css::uno::Any > factories_;
@@ -464,16 +460,12 @@ private:
};
sal_Bool ContentEnumeration::hasMoreElements()
- throw (css::uno::RuntimeException, std::exception)
{
osl::MutexGuard g(mutex_);
return iterator_ != factories_.end();
}
css::uno::Any ContentEnumeration::nextElement()
- throw (
- css::container::NoSuchElementException,
- css::lang::WrappedTargetException, css::uno::RuntimeException, std::exception)
{
osl::MutexGuard g(mutex_);
if (iterator_ == factories_.end()) {
@@ -511,14 +503,12 @@ private:
virtual css::uno::Reference< css::uno::XInterface > SAL_CALL
createInstanceWithContext(
- css::uno::Reference< css::uno::XComponentContext > const & Context)
- throw (css::uno::Exception, css::uno::RuntimeException, std::exception) override;
+ css::uno::Reference< css::uno::XComponentContext > const & Context) override;
virtual css::uno::Reference< css::uno::XInterface > SAL_CALL
createInstanceWithArgumentsAndContext(
css::uno::Sequence< css::uno::Any > const & Arguments,
- css::uno::Reference< css::uno::XComponentContext > const & Context)
- throw (css::uno::Exception, css::uno::RuntimeException, std::exception) override;
+ css::uno::Reference< css::uno::XComponentContext > const & Context) override;
rtl::Reference< cppuhelper::ServiceManager > manager_;
std::shared_ptr< cppuhelper::ServiceManager::Data::Implementation >
@@ -528,7 +518,6 @@ private:
css::uno::Reference< css::uno::XInterface >
SingletonFactory::createInstanceWithContext(
css::uno::Reference< css::uno::XComponentContext > const & Context)
- throw (css::uno::Exception, css::uno::RuntimeException, std::exception)
{
manager_->loadImplementation(Context, implementation_);
return implementation_->createInstance(Context, true);
@@ -538,7 +527,6 @@ css::uno::Reference< css::uno::XInterface >
SingletonFactory::createInstanceWithArgumentsAndContext(
css::uno::Sequence< css::uno::Any > const & Arguments,
css::uno::Reference< css::uno::XComponentContext > const & Context)
- throw (css::uno::Exception, css::uno::RuntimeException, std::exception)
{
manager_->loadImplementation(Context, implementation_);
return implementation_->createInstanceWithArguments(
@@ -567,31 +555,26 @@ private:
virtual css::uno::Reference< css::uno::XInterface > SAL_CALL
createInstanceWithContext(
- css::uno::Reference< css::uno::XComponentContext > const & Context)
- throw (css::uno::Exception, css::uno::RuntimeException, std::exception) override;
+ css::uno::Reference< css::uno::XComponentContext > const & Context) override;
virtual css::uno::Reference< css::uno::XInterface > SAL_CALL
createInstanceWithArgumentsAndContext(
css::uno::Sequence< css::uno::Any > const & Arguments,
- css::uno::Reference< css::uno::XComponentContext > const & Context)
- throw (css::uno::Exception, css::uno::RuntimeException, std::exception) override;
+ css::uno::Reference< css::uno::XComponentContext > const & Context) override;
virtual css::uno::Reference< css::uno::XInterface > SAL_CALL
- createInstance() throw (css::uno::Exception, css::uno::RuntimeException, std::exception) override;
+ createInstance() override;
virtual css::uno::Reference< css::uno::XInterface > SAL_CALL
createInstanceWithArguments(
- css::uno::Sequence< css::uno::Any > const & Arguments)
- throw (css::uno::Exception, css::uno::RuntimeException, std::exception) override;
+ css::uno::Sequence< css::uno::Any > const & Arguments) override;
- virtual rtl::OUString SAL_CALL getImplementationName()
- throw (css::uno::RuntimeException, std::exception) override;
+ virtual rtl::OUString SAL_CALL getImplementationName() override;
- virtual sal_Bool SAL_CALL supportsService(rtl::OUString const & ServiceName)
- throw (css::uno::RuntimeException, std::exception) override;
+ virtual sal_Bool SAL_CALL supportsService(rtl::OUString const & ServiceName) override;
virtual css::uno::Sequence< rtl::OUString > SAL_CALL
- getSupportedServiceNames() throw (css::uno::RuntimeException, std::exception) override;
+ getSupportedServiceNames() override;
rtl::Reference< cppuhelper::ServiceManager > manager_;
std::weak_ptr< cppuhelper::ServiceManager::Data::Implementation >
@@ -601,7 +584,6 @@ private:
css::uno::Reference< css::uno::XInterface >
ImplementationWrapper::createInstanceWithContext(
css::uno::Reference< css::uno::XComponentContext > const & Context)
- throw (css::uno::Exception, css::uno::RuntimeException, std::exception)
{
std::shared_ptr< cppuhelper::ServiceManager::Data::Implementation > impl = implementation_.lock();
assert(impl);
@@ -613,7 +595,6 @@ css::uno::Reference< css::uno::XInterface >
ImplementationWrapper::createInstanceWithArgumentsAndContext(
css::uno::Sequence< css::uno::Any > const & Arguments,
css::uno::Reference< css::uno::XComponentContext > const & Context)
- throw (css::uno::Exception, css::uno::RuntimeException, std::exception)
{
std::shared_ptr< cppuhelper::ServiceManager::Data::Implementation > impl = implementation_.lock();
assert(impl);
@@ -624,7 +605,6 @@ ImplementationWrapper::createInstanceWithArgumentsAndContext(
css::uno::Reference< css::uno::XInterface >
ImplementationWrapper::createInstance()
- throw (css::uno::Exception, css::uno::RuntimeException, std::exception)
{
return createInstanceWithContext(manager_->getContext());
}
@@ -632,14 +612,12 @@ ImplementationWrapper::createInstance()
css::uno::Reference< css::uno::XInterface >
ImplementationWrapper::createInstanceWithArguments(
css::uno::Sequence< css::uno::Any > const & Arguments)
- throw (css::uno::Exception, css::uno::RuntimeException, std::exception)
{
return createInstanceWithArgumentsAndContext(
Arguments, manager_->getContext());
}
rtl::OUString ImplementationWrapper::getImplementationName()
- throw (css::uno::RuntimeException, std::exception)
{
std::shared_ptr< cppuhelper::ServiceManager::Data::Implementation > impl = implementation_.lock();
assert(impl);
@@ -647,14 +625,12 @@ rtl::OUString ImplementationWrapper::getImplementationName()
}
sal_Bool ImplementationWrapper::supportsService(rtl::OUString const & ServiceName)
- throw (css::uno::RuntimeException, std::exception)
{
return cppu::supportsService(this, ServiceName);
}
css::uno::Sequence< rtl::OUString >
ImplementationWrapper::getSupportedServiceNames()
- throw (css::uno::RuntimeException, std::exception)
{
std::shared_ptr< cppuhelper::ServiceManager::Data::Implementation > impl = implementation_.lock();
assert(impl);
@@ -934,7 +910,6 @@ void cppuhelper::ServiceManager::disposing() {
void cppuhelper::ServiceManager::initialize(
css::uno::Sequence<css::uno::Any> const & aArguments)
- throw (css::uno::Exception, css::uno::RuntimeException, std::exception)
{
OUString arg;
if (aArguments.getLength() == 1 && (aArguments[0] >>= arg)
@@ -949,7 +924,6 @@ void cppuhelper::ServiceManager::initialize(
}
rtl::OUString cppuhelper::ServiceManager::getImplementationName()
- throw (css::uno::RuntimeException, std::exception)
{
return rtl::OUString(
"com.sun.star.comp.cppuhelper.bootstrap.ServiceManager");
@@ -957,14 +931,12 @@ rtl::OUString cppuhelper::ServiceManager::getImplementationName()
sal_Bool cppuhelper::ServiceManager::supportsService(
rtl::OUString const & ServiceName)
- throw (css::uno::RuntimeException, std::exception)
{
return cppu::supportsService(this, ServiceName);
}
css::uno::Sequence< rtl::OUString >
cppuhelper::ServiceManager::getSupportedServiceNames()
- throw (css::uno::RuntimeException, std::exception)
{
css::uno::Sequence< rtl::OUString > names(2);
names[0] = "com.sun.star.lang.MultiServiceFactory";
@@ -975,7 +947,6 @@ cppuhelper::ServiceManager::getSupportedServiceNames()
css::uno::Reference< css::uno::XInterface >
cppuhelper::ServiceManager::createInstance(
rtl::OUString const & aServiceSpecifier)
- throw (css::uno::Exception, css::uno::RuntimeException, std::exception)
{
assert(context_.is());
return createInstanceWithContext(aServiceSpecifier, context_);
@@ -985,7 +956,6 @@ css::uno::Reference< css::uno::XInterface >
cppuhelper::ServiceManager::createInstanceWithArguments(
rtl::OUString const & ServiceSpecifier,
css::uno::Sequence< css::uno::Any > const & Arguments)
- throw (css::uno::Exception, css::uno::RuntimeException, std::exception)
{
assert(context_.is());
return createInstanceWithArgumentsAndContext(
@@ -994,7 +964,6 @@ cppuhelper::ServiceManager::createInstanceWithArguments(
css::uno::Sequence< rtl::OUString >
cppuhelper::ServiceManager::getAvailableServiceNames()
- throw (css::uno::RuntimeException, std::exception)
{
osl::MutexGuard g(rBHelper.rMutex);
if (isDisposed()) {
@@ -1021,7 +990,6 @@ css::uno::Reference< css::uno::XInterface >
cppuhelper::ServiceManager::createInstanceWithContext(
rtl::OUString const & aServiceSpecifier,
css::uno::Reference< css::uno::XComponentContext > const & Context)
- throw (css::uno::Exception, css::uno::RuntimeException, std::exception)
{
std::shared_ptr< Data::Implementation > impl(
findServiceImplementation(Context, aServiceSpecifier));
@@ -1035,7 +1003,6 @@ cppuhelper::ServiceManager::createInstanceWithArgumentsAndContext(
rtl::OUString const & ServiceSpecifier,
css::uno::Sequence< css::uno::Any > const & Arguments,
css::uno::Reference< css::uno::XComponentContext > const & Context)
- throw (css::uno::Exception, css::uno::RuntimeException, std::exception)
{
std::shared_ptr< Data::Implementation > impl(
findServiceImplementation(Context, ServiceSpecifier));
@@ -1045,13 +1012,11 @@ cppuhelper::ServiceManager::createInstanceWithArgumentsAndContext(
}
css::uno::Type cppuhelper::ServiceManager::getElementType()
- throw (css::uno::RuntimeException, std::exception)
{
return css::uno::Type();
}
sal_Bool cppuhelper::ServiceManager::hasElements()
- throw (css::uno::RuntimeException, std::exception)
{
osl::MutexGuard g(rBHelper.rMutex);
return
@@ -1061,7 +1026,6 @@ sal_Bool cppuhelper::ServiceManager::hasElements()
css::uno::Reference< css::container::XEnumeration >
cppuhelper::ServiceManager::createEnumeration()
- throw (css::uno::RuntimeException, std::exception)
{
throw css::uno::RuntimeException(
"ServiceManager createEnumeration: method not supported",
@@ -1069,7 +1033,6 @@ cppuhelper::ServiceManager::createEnumeration()
}
sal_Bool cppuhelper::ServiceManager::has(css::uno::Any const &)
- throw (css::uno::RuntimeException, std::exception)
{
throw css::uno::RuntimeException(
"ServiceManager has: method not supported",
@@ -1077,9 +1040,6 @@ sal_Bool cppuhelper::ServiceManager::has(css::uno::Any const &)
}
void cppuhelper::ServiceManager::insert(css::uno::Any const & aElement)
- throw (
- css::lang::IllegalArgumentException,
- css::container::ElementExistException, css::uno::RuntimeException, std::exception)
{
css::uno::Sequence< css::beans::NamedValue > args;
if (aElement >>= args) {
@@ -1143,9 +1103,6 @@ void cppuhelper::ServiceManager::insert(css::uno::Any const & aElement)
}
void cppuhelper::ServiceManager::remove(css::uno::Any const & aElement)
- throw (
- css::lang::IllegalArgumentException,
- css::container::NoSuchElementException, css::uno::RuntimeException, std::exception)
{
css::uno::Sequence< css::beans::NamedValue > args;
if (aElement >>= args) {
@@ -1190,7 +1147,6 @@ void cppuhelper::ServiceManager::remove(css::uno::Any const & aElement)
css::uno::Reference< css::container::XEnumeration >
cppuhelper::ServiceManager::createContentEnumeration(
rtl::OUString const & aServiceName)
- throw (css::uno::RuntimeException, std::exception)
{
std::vector< std::shared_ptr< Data::Implementation > > impls;
{
@@ -1241,17 +1197,12 @@ cppuhelper::ServiceManager::createContentEnumeration(
css::uno::Reference< css::beans::XPropertySetInfo >
cppuhelper::ServiceManager::getPropertySetInfo()
- throw (css::uno::RuntimeException, std::exception)
{
return this;
}
void cppuhelper::ServiceManager::setPropertyValue(
rtl::OUString const & aPropertyName, css::uno::Any const &)
- throw (
- css::beans::UnknownPropertyException, css::beans::PropertyVetoException,
- css::lang::IllegalArgumentException, css::lang::WrappedTargetException,
- css::uno::RuntimeException, std::exception)
{
if (aPropertyName == "DefaultContext") {
throw css::beans::PropertyVetoException(
@@ -1264,9 +1215,6 @@ void cppuhelper::ServiceManager::setPropertyValue(
css::uno::Any cppuhelper::ServiceManager::getPropertyValue(
rtl::OUString const & PropertyName)
- throw (
- css::beans::UnknownPropertyException, css::lang::WrappedTargetException,
- css::uno::RuntimeException, std::exception)
{
if (PropertyName != "DefaultContext") {
throw css::beans::UnknownPropertyException(
@@ -1280,9 +1228,6 @@ void cppuhelper::ServiceManager::addPropertyChangeListener(
rtl::OUString const & aPropertyName,
css::uno::Reference< css::beans::XPropertyChangeListener > const &
xListener)
- throw (
- css::beans::UnknownPropertyException, css::lang::WrappedTargetException,
- css::uno::RuntimeException, std::exception)
{
if (!aPropertyName.isEmpty() && aPropertyName != "DefaultContext") {
throw css::beans::UnknownPropertyException(
@@ -1296,9 +1241,6 @@ void cppuhelper::ServiceManager::removePropertyChangeListener(
rtl::OUString const & aPropertyName,
css::uno::Reference< css::beans::XPropertyChangeListener > const &
aListener)
- throw (
- css::beans::UnknownPropertyException, css::lang::WrappedTargetException,
- css::uno::RuntimeException, std::exception)
{
if (!aPropertyName.isEmpty() && aPropertyName != "DefaultContext") {
throw css::beans::UnknownPropertyException(
@@ -1312,9 +1254,6 @@ void cppuhelper::ServiceManager::addVetoableChangeListener(
rtl::OUString const & PropertyName,
css::uno::Reference< css::beans::XVetoableChangeListener > const &
aListener)
- throw (
- css::beans::UnknownPropertyException, css::lang::WrappedTargetException,
- css::uno::RuntimeException, std::exception)
{
if (!PropertyName.isEmpty() && PropertyName != "DefaultContext") {
throw css::beans::UnknownPropertyException(
@@ -1328,9 +1267,6 @@ void cppuhelper::ServiceManager::removeVetoableChangeListener(
rtl::OUString const & PropertyName,
css::uno::Reference< css::beans::XVetoableChangeListener > const &
aListener)
- throw (
- css::beans::UnknownPropertyException, css::lang::WrappedTargetException,
- css::uno::RuntimeException, std::exception)
{
if (!PropertyName.isEmpty() && PropertyName != "DefaultContext") {
throw css::beans::UnknownPropertyException(
@@ -1341,7 +1277,7 @@ void cppuhelper::ServiceManager::removeVetoableChangeListener(
}
css::uno::Sequence< css::beans::Property >
-cppuhelper::ServiceManager::getProperties() throw (css::uno::RuntimeException, std::exception) {
+cppuhelper::ServiceManager::getProperties() {
css::uno::Sequence< css::beans::Property > props(1);
props[0] = getDefaultContextProperty();
return props;
@@ -1349,7 +1285,6 @@ cppuhelper::ServiceManager::getProperties() throw (css::uno::RuntimeException, s
css::beans::Property cppuhelper::ServiceManager::getPropertyByName(
rtl::OUString const & aName)
- throw (css::beans::UnknownPropertyException, css::uno::RuntimeException, std::exception)
{
if (aName != "DefaultContext") {
throw css::beans::UnknownPropertyException(
@@ -1360,7 +1295,6 @@ css::beans::Property cppuhelper::ServiceManager::getPropertyByName(
sal_Bool cppuhelper::ServiceManager::hasPropertyByName(
rtl::OUString const & Name)
- throw (css::uno::RuntimeException, std::exception)
{
return Name == "DefaultContext";
}
@@ -1369,7 +1303,6 @@ cppuhelper::ServiceManager::~ServiceManager() {}
void cppuhelper::ServiceManager::disposing(
css::lang::EventObject const & Source)
- throw (css::uno::RuntimeException, std::exception)
{
removeLegacyFactory(
css::uno::Reference< css::lang::XServiceInfo >(
diff --git a/cppuhelper/source/servicemanager.hxx b/cppuhelper/source/servicemanager.hxx
index 5f6efd094dd5..1252b9dab37f 100644
--- a/cppuhelper/source/servicemanager.hxx
+++ b/cppuhelper/source/servicemanager.hxx
@@ -225,132 +225,91 @@ private:
virtual void SAL_CALL disposing() override;
- virtual rtl::OUString SAL_CALL getImplementationName()
- throw (css::uno::RuntimeException, std::exception) override;
+ virtual rtl::OUString SAL_CALL getImplementationName() override;
- virtual sal_Bool SAL_CALL supportsService(rtl::OUString const & ServiceName)
- throw (css::uno::RuntimeException, std::exception) override;
+ virtual sal_Bool SAL_CALL supportsService(rtl::OUString const & ServiceName) override;
virtual css::uno::Sequence< rtl::OUString > SAL_CALL
- getSupportedServiceNames() throw (css::uno::RuntimeException, std::exception) override;
+ getSupportedServiceNames() override;
virtual css::uno::Reference< css::uno::XInterface > SAL_CALL createInstance(
- rtl::OUString const & aServiceSpecifier)
- throw (css::uno::Exception, css::uno::RuntimeException, std::exception) override;
+ rtl::OUString const & aServiceSpecifier) override;
virtual css::uno::Reference< css::uno::XInterface > SAL_CALL
createInstanceWithArguments(
rtl::OUString const & ServiceSpecifier,
- css::uno::Sequence< css::uno::Any > const & Arguments)
- throw (css::uno::Exception, css::uno::RuntimeException, std::exception) override;
+ css::uno::Sequence< css::uno::Any > const & Arguments) override;
virtual css::uno::Sequence< rtl::OUString > SAL_CALL
- getAvailableServiceNames() throw (css::uno::RuntimeException, std::exception) override;
+ getAvailableServiceNames() override;
virtual css::uno::Reference< css::uno::XInterface > SAL_CALL
createInstanceWithContext(
rtl::OUString const & aServiceSpecifier,
- css::uno::Reference< css::uno::XComponentContext > const & Context)
- throw (css::uno::Exception, css::uno::RuntimeException, std::exception) override;
+ css::uno::Reference< css::uno::XComponentContext > const & Context) override;
virtual css::uno::Reference< css::uno::XInterface > SAL_CALL
createInstanceWithArgumentsAndContext(
rtl::OUString const & ServiceSpecifier,
css::uno::Sequence< css::uno::Any > const & Arguments,
- css::uno::Reference< css::uno::XComponentContext > const & Context)
- throw (css::uno::Exception, css::uno::RuntimeException, std::exception) override;
+ css::uno::Reference< css::uno::XComponentContext > const & Context) override;
- virtual css::uno::Type SAL_CALL getElementType()
- throw (css::uno::RuntimeException, std::exception) override;
+ virtual css::uno::Type SAL_CALL getElementType() override;
- virtual sal_Bool SAL_CALL hasElements() throw (css::uno::RuntimeException, std::exception) override;
+ virtual sal_Bool SAL_CALL hasElements() override;
virtual css::uno::Reference< css::container::XEnumeration > SAL_CALL
- createEnumeration() throw (css::uno::RuntimeException, std::exception) override;
+ createEnumeration() override;
- virtual sal_Bool SAL_CALL has(css::uno::Any const & aElement)
- throw (css::uno::RuntimeException, std::exception) override;
+ virtual sal_Bool SAL_CALL has(css::uno::Any const & aElement) override;
- virtual void SAL_CALL insert(css::uno::Any const & aElement)
- throw (
- css::lang::IllegalArgumentException,
- css::container::ElementExistException, css::uno::RuntimeException, std::exception) override;
+ virtual void SAL_CALL insert(css::uno::Any const & aElement) override;
- virtual void SAL_CALL remove(css::uno::Any const & aElement)
- throw (
- css::lang::IllegalArgumentException,
- css::container::NoSuchElementException, css::uno::RuntimeException, std::exception) override;
+ virtual void SAL_CALL remove(css::uno::Any const & aElement) override;
virtual css::uno::Reference< css::container::XEnumeration > SAL_CALL
- createContentEnumeration(rtl::OUString const & aServiceName)
- throw (css::uno::RuntimeException, std::exception) override;
+ createContentEnumeration(rtl::OUString const & aServiceName) override;
virtual css::uno::Reference< css::beans::XPropertySetInfo > SAL_CALL
- getPropertySetInfo() throw (css::uno::RuntimeException, std::exception) override;
+ getPropertySetInfo() override;
virtual void SAL_CALL setPropertyValue(
- rtl::OUString const & aPropertyName, css::uno::Any const & aValue)
- throw (
- css::beans::UnknownPropertyException,
- css::beans::PropertyVetoException,
- css::lang::IllegalArgumentException,
- css::lang::WrappedTargetException, css::uno::RuntimeException, std::exception) override;
+ rtl::OUString const & aPropertyName, css::uno::Any const & aValue) override;
virtual css::uno::Any SAL_CALL getPropertyValue(
- rtl::OUString const & PropertyName)
- throw (
- css::beans::UnknownPropertyException,
- css::lang::WrappedTargetException, css::uno::RuntimeException, std::exception) override;
+ rtl::OUString const & PropertyName) override;
virtual void SAL_CALL addPropertyChangeListener(
rtl::OUString const & aPropertyName,
css::uno::Reference< css::beans::XPropertyChangeListener > const &
- xListener)
- throw (
- css::beans::UnknownPropertyException,
- css::lang::WrappedTargetException, css::uno::RuntimeException, std::exception) override;
+ xListener) override;
virtual void SAL_CALL removePropertyChangeListener(
rtl::OUString const & aPropertyName,
css::uno::Reference< css::beans::XPropertyChangeListener > const &
- aListener)
- throw (
- css::beans::UnknownPropertyException,
- css::lang::WrappedTargetException, css::uno::RuntimeException, std::exception) override;
+ aListener) override;
virtual void SAL_CALL addVetoableChangeListener(
rtl::OUString const & PropertyName,
css::uno::Reference< css::beans::XVetoableChangeListener > const &
- aListener)
- throw (
- css::beans::UnknownPropertyException,
- css::lang::WrappedTargetException, css::uno::RuntimeException, std::exception) override;
+ aListener) override;
virtual void SAL_CALL removeVetoableChangeListener(
rtl::OUString const & PropertyName,
css::uno::Reference< css::beans::XVetoableChangeListener > const &
- aListener)
- throw (
- css::beans::UnknownPropertyException,
- css::lang::WrappedTargetException, css::uno::RuntimeException, std::exception) override;
+ aListener) override;
- virtual css::uno::Sequence< css::beans::Property > SAL_CALL getProperties()
- throw (css::uno::RuntimeException, std::exception) override;
+ virtual css::uno::Sequence< css::beans::Property > SAL_CALL getProperties() override;
virtual css::beans::Property SAL_CALL getPropertyByName(
- rtl::OUString const & aName)
- throw (
- css::beans::UnknownPropertyException, css::uno::RuntimeException, std::exception) override;
+ rtl::OUString const & aName) override;
- virtual sal_Bool SAL_CALL hasPropertyByName(rtl::OUString const & Name)
- throw (css::uno::RuntimeException, std::exception) override;
+ virtual sal_Bool SAL_CALL hasPropertyByName(rtl::OUString const & Name) override;
- virtual void SAL_CALL disposing(css::lang::EventObject const & Source)
- throw (css::uno::RuntimeException, std::exception) override;
+ virtual void SAL_CALL disposing(css::lang::EventObject const & Source) override;
virtual void SAL_CALL initialize(
css::uno::Sequence<css::uno::Any> const & aArguments)
- throw (css::uno::Exception, css::uno::RuntimeException, std::exception)
override;
// needs to be called with rBHelper.rMutex locked:
diff --git a/cppuhelper/source/tdmgr.cxx b/cppuhelper/source/tdmgr.cxx
index 38c53759b3ed..02da05163732 100644
--- a/cppuhelper/source/tdmgr.cxx
+++ b/cppuhelper/source/tdmgr.cxx
@@ -615,12 +615,10 @@ public:
{}
// XEventListener
- virtual void SAL_CALL disposing( lang::EventObject const & rEvt )
- throw (RuntimeException, std::exception) override;
+ virtual void SAL_CALL disposing( lang::EventObject const & rEvt ) override;
};
void EventListenerImpl::disposing( lang::EventObject const & rEvt )
- throw (RuntimeException, std::exception)
{
if (rEvt.Source != m_xTDMgr) {
OSL_ASSERT(false);
diff --git a/cppuhelper/source/typemanager.cxx b/cppuhelper/source/typemanager.cxx
index baa421996e05..54e5cd972301 100644
--- a/cppuhelper/source/typemanager.cxx
+++ b/cppuhelper/source/typemanager.cxx
@@ -91,11 +91,10 @@ public:
private:
virtual ~SimpleTypeDescription() override {}
- virtual css::uno::TypeClass SAL_CALL getTypeClass()
- throw (css::uno::RuntimeException, std::exception) override
+ virtual css::uno::TypeClass SAL_CALL getTypeClass() override
{ return typeClass_; }
- virtual rtl::OUString SAL_CALL getName() throw (css::uno::RuntimeException, std::exception) override
+ virtual rtl::OUString SAL_CALL getName() override
{ return name_; }
css::uno::TypeClass typeClass_;
@@ -115,15 +114,14 @@ public:
private:
virtual ~SequenceTypeDescription() override {}
- virtual css::uno::TypeClass SAL_CALL getTypeClass()
- throw (css::uno::RuntimeException, std::exception) override
+ virtual css::uno::TypeClass SAL_CALL getTypeClass() override
{ return css::uno::TypeClass_SEQUENCE; }
- virtual rtl::OUString SAL_CALL getName() throw (css::uno::RuntimeException, std::exception) override
+ virtual rtl::OUString SAL_CALL getName() override
{ return name_; }
virtual css::uno::Reference< css::reflection::XTypeDescription > SAL_CALL
- getReferencedType() throw (css::uno::RuntimeException, std::exception) override
+ getReferencedType() override
{ return manager_->resolve(componentType_); }
rtl::Reference< cppuhelper::TypeManager > manager_;
@@ -140,7 +138,7 @@ protected:
virtual ~PublishableDescription() override {}
private:
- virtual sal_Bool SAL_CALL isPublished() throw (css::uno::RuntimeException, std::exception) override
+ virtual sal_Bool SAL_CALL isPublished() override
{ return published_; }
bool published_;
@@ -160,17 +158,16 @@ public:
private:
virtual ~ModuleDescription() override {}
- virtual css::uno::TypeClass SAL_CALL getTypeClass()
- throw (css::uno::RuntimeException, std::exception) override
+ virtual css::uno::TypeClass SAL_CALL getTypeClass() override
{ return css::uno::TypeClass_MODULE; }
- virtual rtl::OUString SAL_CALL getName() throw (css::uno::RuntimeException, std::exception) override
+ virtual rtl::OUString SAL_CALL getName() override
{ return name_; }
virtual
css::uno::Sequence<
css::uno::Reference< css::reflection::XTypeDescription > >
- SAL_CALL getMembers() throw (css::uno::RuntimeException, std::exception) override;
+ SAL_CALL getMembers() override;
rtl::Reference< cppuhelper::TypeManager > manager_;
rtl::OUString name_;
@@ -178,7 +175,7 @@ private:
};
css::uno::Sequence< css::uno::Reference< css::reflection::XTypeDescription > >
-ModuleDescription::getMembers() throw (css::uno::RuntimeException, std::exception) {
+ModuleDescription::getMembers() {
try {
std::vector< rtl::OUString > names(entity_->getMemberNames());
assert(names.size() <= SAL_MAX_INT32);
@@ -212,29 +209,24 @@ public:
private:
virtual ~EnumTypeDescription() override {}
- virtual css::uno::TypeClass SAL_CALL getTypeClass()
- throw (css::uno::RuntimeException, std::exception) override
+ virtual css::uno::TypeClass SAL_CALL getTypeClass() override
{ return css::uno::TypeClass_ENUM; }
- virtual rtl::OUString SAL_CALL getName() throw (css::uno::RuntimeException, std::exception) override
+ virtual rtl::OUString SAL_CALL getName() override
{ return name_; }
- virtual sal_Int32 SAL_CALL getDefaultEnumValue()
- throw (css::uno::RuntimeException, std::exception) override
+ virtual sal_Int32 SAL_CALL getDefaultEnumValue() override
{ return entity_->getMembers()[0].value; }
- virtual css::uno::Sequence< rtl::OUString > SAL_CALL getEnumNames()
- throw (css::uno::RuntimeException, std::exception) override;
+ virtual css::uno::Sequence< rtl::OUString > SAL_CALL getEnumNames() override;
- virtual css::uno::Sequence< sal_Int32 > SAL_CALL getEnumValues()
- throw (css::uno::RuntimeException, std::exception) override;
+ virtual css::uno::Sequence< sal_Int32 > SAL_CALL getEnumValues() override;
rtl::OUString name_;
rtl::Reference< unoidl::EnumTypeEntity > entity_;
};
css::uno::Sequence< rtl::OUString > EnumTypeDescription::getEnumNames()
- throw (css::uno::RuntimeException, std::exception)
{
assert(entity_->getMembers().size() <= SAL_MAX_INT32);
sal_Int32 n = static_cast< sal_Int32 >(entity_->getMembers().size());
@@ -246,7 +238,6 @@ css::uno::Sequence< rtl::OUString > EnumTypeDescription::getEnumNames()
}
css::uno::Sequence< sal_Int32 > EnumTypeDescription::getEnumValues()
- throw (css::uno::RuntimeException, std::exception)
{
assert(entity_->getMembers().size() <= SAL_MAX_INT32);
sal_Int32 n = static_cast< sal_Int32 >(entity_->getMembers().size());
@@ -274,15 +265,14 @@ public:
private:
virtual ~PlainStructTypeDescription() override {}
- virtual css::uno::TypeClass SAL_CALL getTypeClass()
- throw (css::uno::RuntimeException, std::exception) override
+ virtual css::uno::TypeClass SAL_CALL getTypeClass() override
{ return css::uno::TypeClass_STRUCT; }
- virtual rtl::OUString SAL_CALL getName() throw (css::uno::RuntimeException, std::exception) override
+ virtual rtl::OUString SAL_CALL getName() override
{ return name_; }
virtual css::uno::Reference< css::reflection::XTypeDescription > SAL_CALL
- getBaseType() throw (css::uno::RuntimeException, std::exception) override {
+ getBaseType() override {
return entity_->getDirectBase().isEmpty()
? css::uno::Reference< css::reflection::XTypeDescription >()
: manager_->resolve(entity_->getDirectBase());
@@ -291,19 +281,17 @@ private:
virtual
css::uno::Sequence<
css::uno::Reference< css::reflection::XTypeDescription > >
- SAL_CALL getMemberTypes() throw (css::uno::RuntimeException, std::exception) override;
+ SAL_CALL getMemberTypes() override;
- virtual css::uno::Sequence< rtl::OUString > SAL_CALL getMemberNames()
- throw (css::uno::RuntimeException, std::exception) override;
+ virtual css::uno::Sequence< rtl::OUString > SAL_CALL getMemberNames() override;
- virtual css::uno::Sequence< rtl::OUString > SAL_CALL getTypeParameters()
- throw (css::uno::RuntimeException, std::exception) override
+ virtual css::uno::Sequence< rtl::OUString > SAL_CALL getTypeParameters() override
{ return css::uno::Sequence< rtl::OUString >(); }
virtual
css::uno::Sequence<
css::uno::Reference< css::reflection::XTypeDescription > >
- SAL_CALL getTypeArguments() throw (css::uno::RuntimeException, std::exception) override {
+ SAL_CALL getTypeArguments() override {
return css::uno::Sequence<
css::uno::Reference< css::reflection::XTypeDescription > >();
}
@@ -314,7 +302,7 @@ private:
};
css::uno::Sequence< css::uno::Reference< css::reflection::XTypeDescription > >
-PlainStructTypeDescription::getMemberTypes() throw (css::uno::RuntimeException, std::exception)
+PlainStructTypeDescription::getMemberTypes()
{
assert(entity_->getDirectMembers().size() <= SAL_MAX_INT32);
sal_Int32 n = static_cast< sal_Int32 >(entity_->getDirectMembers().size());
@@ -327,7 +315,6 @@ PlainStructTypeDescription::getMemberTypes() throw (css::uno::RuntimeException,
}
css::uno::Sequence< rtl::OUString > PlainStructTypeDescription::getMemberNames()
- throw (css::uno::RuntimeException, std::exception)
{
assert(entity_->getDirectMembers().size() <= SAL_MAX_INT32);
sal_Int32 n = static_cast< sal_Int32 >(entity_->getDirectMembers().size());
@@ -350,11 +337,10 @@ public:
private:
virtual ~ParameterizedMemberTypeDescription() override {}
- virtual css::uno::TypeClass SAL_CALL getTypeClass()
- throw (css::uno::RuntimeException, std::exception) override
+ virtual css::uno::TypeClass SAL_CALL getTypeClass() override
{ return css::uno::TypeClass_UNKNOWN; }
- virtual rtl::OUString SAL_CALL getName() throw (css::uno::RuntimeException, std::exception) override
+ virtual rtl::OUString SAL_CALL getName() override
{ return typeParameterName_; }
rtl::OUString typeParameterName_;
@@ -380,32 +366,29 @@ public:
private:
virtual ~PolymorphicStructTypeTemplateDescription() override {}
- virtual css::uno::TypeClass SAL_CALL getTypeClass()
- throw (css::uno::RuntimeException, std::exception) override
+ virtual css::uno::TypeClass SAL_CALL getTypeClass() override
{ return css::uno::TypeClass_STRUCT; }
- virtual rtl::OUString SAL_CALL getName() throw (css::uno::RuntimeException, std::exception) override
+ virtual rtl::OUString SAL_CALL getName() override
{ return name_; }
virtual css::uno::Reference< css::reflection::XTypeDescription > SAL_CALL
- getBaseType() throw (css::uno::RuntimeException, std::exception) override
+ getBaseType() override
{ return css::uno::Reference< css::reflection::XTypeDescription >(); }
virtual
css::uno::Sequence<
css::uno::Reference< css::reflection::XTypeDescription > >
- SAL_CALL getMemberTypes() throw (css::uno::RuntimeException, std::exception) override;
+ SAL_CALL getMemberTypes() override;
- virtual css::uno::Sequence< rtl::OUString > SAL_CALL getMemberNames()
- throw (css::uno::RuntimeException, std::exception) override;
+ virtual css::uno::Sequence< rtl::OUString > SAL_CALL getMemberNames() override;
- virtual css::uno::Sequence< rtl::OUString > SAL_CALL getTypeParameters()
- throw (css::uno::RuntimeException, std::exception) override;
+ virtual css::uno::Sequence< rtl::OUString > SAL_CALL getTypeParameters() override;
virtual
css::uno::Sequence<
css::uno::Reference< css::reflection::XTypeDescription > >
- SAL_CALL getTypeArguments() throw (css::uno::RuntimeException, std::exception) override {
+ SAL_CALL getTypeArguments() override {
return css::uno::Sequence<
css::uno::Reference< css::reflection::XTypeDescription > >();
}
@@ -417,7 +400,6 @@ private:
css::uno::Sequence< css::uno::Reference< css::reflection::XTypeDescription > >
PolymorphicStructTypeTemplateDescription::getMemberTypes()
- throw (css::uno::RuntimeException, std::exception)
{
assert(entity_->getMembers().size() <= SAL_MAX_INT32);
sal_Int32 n = static_cast< sal_Int32 >(entity_->getMembers().size());
@@ -434,7 +416,6 @@ PolymorphicStructTypeTemplateDescription::getMemberTypes()
css::uno::Sequence< rtl::OUString >
PolymorphicStructTypeTemplateDescription::getMemberNames()
- throw (css::uno::RuntimeException, std::exception)
{
assert(entity_->getMembers().size() <= SAL_MAX_INT32);
sal_Int32 n = static_cast< sal_Int32 >(entity_->getMembers().size());
@@ -447,7 +428,6 @@ PolymorphicStructTypeTemplateDescription::getMemberNames()
css::uno::Sequence< rtl::OUString >
PolymorphicStructTypeTemplateDescription::getTypeParameters()
- throw (css::uno::RuntimeException, std::exception)
{
assert(entity_->getTypeParameters().size() <= SAL_MAX_INT32);
sal_Int32 n = static_cast< sal_Int32 >(entity_->getTypeParameters().size());
@@ -478,33 +458,30 @@ public:
private:
virtual ~InstantiatedPolymorphicStructTypeDescription() override {}
- virtual css::uno::TypeClass SAL_CALL getTypeClass()
- throw (css::uno::RuntimeException, std::exception) override
+ virtual css::uno::TypeClass SAL_CALL getTypeClass() override
{ return css::uno::TypeClass_STRUCT; }
- virtual rtl::OUString SAL_CALL getName() throw (css::uno::RuntimeException, std::exception) override
+ virtual rtl::OUString SAL_CALL getName() override
{ return name_; }
virtual css::uno::Reference< css::reflection::XTypeDescription > SAL_CALL
- getBaseType() throw (css::uno::RuntimeException, std::exception) override
+ getBaseType() override
{ return css::uno::Reference< css::reflection::XTypeDescription >(); }
virtual
css::uno::Sequence<
css::uno::Reference< css::reflection::XTypeDescription > >
- SAL_CALL getMemberTypes() throw (css::uno::RuntimeException, std::exception) override;
+ SAL_CALL getMemberTypes() override;
- virtual css::uno::Sequence< rtl::OUString > SAL_CALL getMemberNames()
- throw (css::uno::RuntimeException, std::exception) override;
+ virtual css::uno::Sequence< rtl::OUString > SAL_CALL getMemberNames() override;
- virtual css::uno::Sequence< rtl::OUString > SAL_CALL getTypeParameters()
- throw (css::uno::RuntimeException, std::exception) override
+ virtual css::uno::Sequence< rtl::OUString > SAL_CALL getTypeParameters() override
{ return css::uno::Sequence< rtl::OUString >(); }
virtual
css::uno::Sequence<
css::uno::Reference< css::reflection::XTypeDescription > >
- SAL_CALL getTypeArguments() throw (css::uno::RuntimeException, std::exception) override;
+ SAL_CALL getTypeArguments() override;
rtl::Reference< cppuhelper::TypeManager > manager_;
rtl::OUString name_;
@@ -514,7 +491,6 @@ private:
css::uno::Sequence< css::uno::Reference< css::reflection::XTypeDescription > >
InstantiatedPolymorphicStructTypeDescription::getMemberTypes()
- throw (css::uno::RuntimeException, std::exception)
{
assert(entity_->getMembers().size() <= SAL_MAX_INT32);
sal_Int32 n = static_cast< sal_Int32 >(entity_->getMembers().size());
@@ -542,7 +518,6 @@ InstantiatedPolymorphicStructTypeDescription::getMemberTypes()
css::uno::Sequence< rtl::OUString >
InstantiatedPolymorphicStructTypeDescription::getMemberNames()
- throw (css::uno::RuntimeException, std::exception)
{
assert(entity_->getMembers().size() <= SAL_MAX_INT32);
sal_Int32 n = static_cast< sal_Int32 >(entity_->getMembers().size());
@@ -554,7 +529,6 @@ InstantiatedPolymorphicStructTypeDescription::getMemberNames()
}
css::uno::Sequence< css::uno::Reference< css::reflection::XTypeDescription > >
InstantiatedPolymorphicStructTypeDescription::getTypeArguments()
- throw (css::uno::RuntimeException, std::exception)
{
assert(arguments_.size() <= SAL_MAX_INT32);
sal_Int32 n = static_cast< sal_Int32 >(arguments_.size());
@@ -583,15 +557,14 @@ public:
private:
virtual ~ExceptionTypeDescription() override {}
- virtual css::uno::TypeClass SAL_CALL getTypeClass()
- throw (css::uno::RuntimeException, std::exception) override
+ virtual css::uno::TypeClass SAL_CALL getTypeClass() override
{ return css::uno::TypeClass_EXCEPTION; }
- virtual rtl::OUString SAL_CALL getName() throw (css::uno::RuntimeException, std::exception) override
+ virtual rtl::OUString SAL_CALL getName() override
{ return name_; }
virtual css::uno::Reference< css::reflection::XTypeDescription > SAL_CALL
- getBaseType() throw (css::uno::RuntimeException, std::exception) override {
+ getBaseType() override {
return entity_->getDirectBase().isEmpty()
? css::uno::Reference< css::reflection::XTypeDescription >()
: manager_->resolve(entity_->getDirectBase());
@@ -600,10 +573,9 @@ private:
virtual
css::uno::Sequence<
css::uno::Reference< css::reflection::XTypeDescription > >
- SAL_CALL getMemberTypes() throw (css::uno::RuntimeException, std::exception) override;
+ SAL_CALL getMemberTypes() override;
- virtual css::uno::Sequence< rtl::OUString > SAL_CALL getMemberNames()
- throw (css::uno::RuntimeException, std::exception) override;
+ virtual css::uno::Sequence< rtl::OUString > SAL_CALL getMemberNames() override;
rtl::Reference< cppuhelper::TypeManager > manager_;
rtl::OUString name_;
@@ -611,7 +583,7 @@ private:
};
css::uno::Sequence< css::uno::Reference< css::reflection::XTypeDescription > >
-ExceptionTypeDescription::getMemberTypes() throw (css::uno::RuntimeException, std::exception) {
+ExceptionTypeDescription::getMemberTypes() {
assert(entity_->getDirectMembers().size() <= SAL_MAX_INT32);
sal_Int32 n = static_cast< sal_Int32 >(entity_->getDirectMembers().size());
css::uno::Sequence<
@@ -623,7 +595,6 @@ ExceptionTypeDescription::getMemberTypes() throw (css::uno::RuntimeException, st
}
css::uno::Sequence< rtl::OUString > ExceptionTypeDescription::getMemberNames()
- throw (css::uno::RuntimeException, std::exception)
{
assert(entity_->getDirectMembers().size() <= SAL_MAX_INT32);
sal_Int32 n = static_cast< sal_Int32 >(entity_->getDirectMembers().size());
@@ -651,39 +622,37 @@ public:
private:
virtual ~AttributeDescription() override {}
- virtual css::uno::TypeClass SAL_CALL getTypeClass()
- throw (css::uno::RuntimeException, std::exception) override
+ virtual css::uno::TypeClass SAL_CALL getTypeClass() override
{ return css::uno::TypeClass_INTERFACE_ATTRIBUTE; }
- virtual rtl::OUString SAL_CALL getName() throw (css::uno::RuntimeException, std::exception) override
+ virtual rtl::OUString SAL_CALL getName() override
{ return name_; }
- virtual rtl::OUString SAL_CALL getMemberName()
- throw (css::uno::RuntimeException, std::exception) override
+ virtual rtl::OUString SAL_CALL getMemberName() override
{ return attribute_.name; }
- virtual sal_Int32 SAL_CALL getPosition() throw (css::uno::RuntimeException, std::exception) override
+ virtual sal_Int32 SAL_CALL getPosition() override
{ return position_; }
- virtual sal_Bool SAL_CALL isReadOnly() throw (css::uno::RuntimeException, std::exception) override
+ virtual sal_Bool SAL_CALL isReadOnly() override
{ return attribute_.readOnly; }
virtual css::uno::Reference< css::reflection::XTypeDescription > SAL_CALL
- getType() throw (css::uno::RuntimeException, std::exception) override
+ getType() override
{ return manager_->resolve(attribute_.type); }
- virtual sal_Bool SAL_CALL isBound() throw (css::uno::RuntimeException, std::exception) override
+ virtual sal_Bool SAL_CALL isBound() override
{ return attribute_.bound; }
virtual
css::uno::Sequence<
css::uno::Reference< css::reflection::XCompoundTypeDescription > >
- SAL_CALL getGetExceptions() throw (css::uno::RuntimeException, std::exception) override;
+ SAL_CALL getGetExceptions() override;
virtual
css::uno::Sequence<
css::uno::Reference< css::reflection::XCompoundTypeDescription > >
- SAL_CALL getSetExceptions() throw (css::uno::RuntimeException, std::exception) override;
+ SAL_CALL getSetExceptions() override;
rtl::Reference< cppuhelper::TypeManager > manager_;
rtl::OUString name_;
@@ -693,7 +662,7 @@ private:
css::uno::Sequence<
css::uno::Reference< css::reflection::XCompoundTypeDescription > >
-AttributeDescription::getGetExceptions() throw (css::uno::RuntimeException, std::exception) {
+AttributeDescription::getGetExceptions() {
assert(attribute_.getExceptions.size() <= SAL_MAX_INT32);
sal_Int32 n = static_cast< sal_Int32 >(attribute_.getExceptions.size());
css::uno::Sequence<
@@ -708,7 +677,7 @@ AttributeDescription::getGetExceptions() throw (css::uno::RuntimeException, std:
css::uno::Sequence<
css::uno::Reference< css::reflection::XCompoundTypeDescription > >
-AttributeDescription::getSetExceptions() throw (css::uno::RuntimeException, std::exception) {
+AttributeDescription::getSetExceptions() {
assert(attribute_.setExceptions.size() <= SAL_MAX_INT32);
sal_Int32 n = static_cast< sal_Int32 >(attribute_.setExceptions.size());
css::uno::Sequence<
@@ -735,14 +704,14 @@ public:
private:
virtual ~MethodParameter() override {}
- virtual rtl::OUString SAL_CALL getName() throw (css::uno::RuntimeException, std::exception) override
+ virtual rtl::OUString SAL_CALL getName() override
{ return parameter_.name; }
virtual css::uno::Reference< css::reflection::XTypeDescription > SAL_CALL
- getType() throw (css::uno::RuntimeException, std::exception) override
+ getType() override
{ return manager_->resolve(parameter_.type); }
- virtual sal_Bool SAL_CALL isIn() throw (css::uno::RuntimeException, std::exception) override {
+ virtual sal_Bool SAL_CALL isIn() override {
return
(parameter_.direction
== unoidl::InterfaceTypeEntity::Method::Parameter::DIRECTION_IN)
@@ -751,7 +720,7 @@ private:
DIRECTION_IN_OUT);
}
- virtual sal_Bool SAL_CALL isOut() throw (css::uno::RuntimeException, std::exception) override {
+ virtual sal_Bool SAL_CALL isOut() override {
return
(parameter_.direction
== unoidl::InterfaceTypeEntity::Method::Parameter::DIRECTION_OUT)
@@ -760,7 +729,7 @@ private:
DIRECTION_IN_OUT);
}
- virtual sal_Int32 SAL_CALL getPosition() throw (css::uno::RuntimeException, std::exception) override
+ virtual sal_Int32 SAL_CALL getPosition() override
{ return position_; }
rtl::Reference< cppuhelper::TypeManager > manager_;
@@ -783,36 +752,34 @@ public:
private:
virtual ~MethodDescription() override {}
- virtual css::uno::TypeClass SAL_CALL getTypeClass()
- throw (css::uno::RuntimeException, std::exception) override
+ virtual css::uno::TypeClass SAL_CALL getTypeClass() override
{ return css::uno::TypeClass_INTERFACE_METHOD; }
- virtual rtl::OUString SAL_CALL getName() throw (css::uno::RuntimeException, std::exception) override
+ virtual rtl::OUString SAL_CALL getName() override
{ return name_; }
- virtual rtl::OUString SAL_CALL getMemberName()
- throw (css::uno::RuntimeException, std::exception) override
+ virtual rtl::OUString SAL_CALL getMemberName() override
{ return method_.name; }
- virtual sal_Int32 SAL_CALL getPosition() throw (css::uno::RuntimeException, std::exception) override
+ virtual sal_Int32 SAL_CALL getPosition() override
{ return position_; }
virtual css::uno::Reference< css::reflection::XTypeDescription > SAL_CALL
- getReturnType() throw (css::uno::RuntimeException, std::exception) override
+ getReturnType() override
{ return manager_->resolve(method_.returnType); }
- virtual sal_Bool SAL_CALL isOneway() throw (css::uno::RuntimeException, std::exception) override
+ virtual sal_Bool SAL_CALL isOneway() override
{ return false; }
virtual
css::uno::Sequence<
css::uno::Reference< css::reflection::XMethodParameter > >
- SAL_CALL getParameters() throw (css::uno::RuntimeException, std::exception) override;
+ SAL_CALL getParameters() override;
virtual
css::uno::Sequence<
css::uno::Reference< css::reflection::XTypeDescription > >
- SAL_CALL getExceptions() throw (css::uno::RuntimeException, std::exception) override;
+ SAL_CALL getExceptions() override;
rtl::Reference< cppuhelper::TypeManager > manager_;
rtl::OUString name_;
@@ -821,7 +788,7 @@ private:
};
css::uno::Sequence< css::uno::Reference< css::reflection::XMethodParameter > >
-MethodDescription::getParameters() throw (css::uno::RuntimeException, std::exception) {
+MethodDescription::getParameters() {
assert(method_.parameters.size() <= SAL_MAX_INT32);
sal_Int32 n = static_cast< sal_Int32 >(method_.parameters.size());
css::uno::Sequence<
@@ -833,7 +800,7 @@ MethodDescription::getParameters() throw (css::uno::RuntimeException, std::excep
}
css::uno::Sequence< css::uno::Reference< css::reflection::XTypeDescription > >
-MethodDescription::getExceptions() throw (css::uno::RuntimeException, std::exception) {
+MethodDescription::getExceptions() {
assert(method_.exceptions.size() <= SAL_MAX_INT32);
sal_Int32 n = static_cast< sal_Int32 >(method_.exceptions.size());
css::uno::Sequence<
@@ -918,38 +885,37 @@ public:
private:
virtual ~InterfaceTypeDescription() override {}
- virtual css::uno::TypeClass SAL_CALL getTypeClass()
- throw (css::uno::RuntimeException, std::exception) override
+ virtual css::uno::TypeClass SAL_CALL getTypeClass() override
{ return css::uno::TypeClass_INTERFACE; }
- virtual rtl::OUString SAL_CALL getName() throw (css::uno::RuntimeException, std::exception) override
+ virtual rtl::OUString SAL_CALL getName() override
{ return name_; }
virtual css::uno::Reference< css::reflection::XTypeDescription > SAL_CALL
- getBaseType() throw (css::uno::RuntimeException, std::exception) override {
+ getBaseType() override {
return entity_->getDirectMandatoryBases().empty()
? css::uno::Reference< css::reflection::XTypeDescription >()
: manager_->resolve(entity_->getDirectMandatoryBases()[0].name);
}
- virtual css::uno::Uik SAL_CALL getUik() throw (css::uno::RuntimeException, std::exception) override
+ virtual css::uno::Uik SAL_CALL getUik() override
{ return css::uno::Uik(); }
virtual
css::uno::Sequence<
css::uno::Reference<
css::reflection::XInterfaceMemberTypeDescription > >
- SAL_CALL getMembers() throw (css::uno::RuntimeException, std::exception) override;
+ SAL_CALL getMembers() override;
virtual
css::uno::Sequence<
css::uno::Reference< css::reflection::XTypeDescription > >
- SAL_CALL getBaseTypes() throw (css::uno::RuntimeException, std::exception) override;
+ SAL_CALL getBaseTypes() override;
virtual
css::uno::Sequence<
css::uno::Reference< css::reflection::XTypeDescription > >
- SAL_CALL getOptionalBaseTypes() throw (css::uno::RuntimeException, std::exception) override;
+ SAL_CALL getOptionalBaseTypes() override;
rtl::Reference< cppuhelper::TypeManager > manager_;
rtl::OUString name_;
@@ -958,7 +924,7 @@ private:
css::uno::Sequence<
css::uno::Reference< css::reflection::XInterfaceMemberTypeDescription > >
-InterfaceTypeDescription::getMembers() throw (css::uno::RuntimeException, std::exception) {
+InterfaceTypeDescription::getMembers() {
assert(
entity_->getDirectAttributes().size() <= SAL_MAX_INT32
&& (entity_->getDirectMethods().size()
@@ -984,7 +950,7 @@ InterfaceTypeDescription::getMembers() throw (css::uno::RuntimeException, std::e
}
css::uno::Sequence< css::uno::Reference< css::reflection::XTypeDescription > >
-InterfaceTypeDescription::getBaseTypes() throw (css::uno::RuntimeException, std::exception) {
+InterfaceTypeDescription::getBaseTypes() {
assert(entity_->getDirectMandatoryBases().size() <= SAL_MAX_INT32);
sal_Int32 n = static_cast< sal_Int32 >(
entity_->getDirectMandatoryBases().size());
@@ -998,7 +964,6 @@ InterfaceTypeDescription::getBaseTypes() throw (css::uno::RuntimeException, std:
css::uno::Sequence< css::uno::Reference< css::reflection::XTypeDescription > >
InterfaceTypeDescription::getOptionalBaseTypes()
- throw (css::uno::RuntimeException, std::exception)
{
assert(entity_->getDirectOptionalBases().size() <= SAL_MAX_INT32);
sal_Int32 n = static_cast< sal_Int32 >(
@@ -1022,15 +987,13 @@ public:
private:
virtual ~ConstantDescription() override {}
- virtual css::uno::TypeClass SAL_CALL getTypeClass()
- throw (css::uno::RuntimeException, std::exception) override
+ virtual css::uno::TypeClass SAL_CALL getTypeClass() override
{ return css::uno::TypeClass_CONSTANT; }
- virtual rtl::OUString SAL_CALL getName() throw (css::uno::RuntimeException, std::exception) override
+ virtual rtl::OUString SAL_CALL getName() override
{ return name_; }
- virtual css::uno::Any SAL_CALL getConstantValue()
- throw (css::uno::RuntimeException, std::exception) override
+ virtual css::uno::Any SAL_CALL getConstantValue() override
{ return value_; }
rtl::OUString name_;
@@ -1094,17 +1057,16 @@ public:
private:
virtual ~ConstantGroupDescription() override {}
- virtual css::uno::TypeClass SAL_CALL getTypeClass()
- throw (css::uno::RuntimeException, std::exception) override
+ virtual css::uno::TypeClass SAL_CALL getTypeClass() override
{ return css::uno::TypeClass_CONSTANTS; }
- virtual rtl::OUString SAL_CALL getName() throw (css::uno::RuntimeException, std::exception) override
+ virtual rtl::OUString SAL_CALL getName() override
{ return name_; }
virtual
css::uno::Sequence<
css::uno::Reference< css::reflection::XConstantTypeDescription > >
- SAL_CALL getConstants() throw (css::uno::RuntimeException, std::exception) override;
+ SAL_CALL getConstants() override;
rtl::OUString name_;
rtl::Reference< unoidl::ConstantGroupEntity > entity_;
@@ -1112,7 +1074,7 @@ private:
css::uno::Sequence<
css::uno::Reference< css::reflection::XConstantTypeDescription > >
-ConstantGroupDescription::getConstants() throw (css::uno::RuntimeException, std::exception) {
+ConstantGroupDescription::getConstants() {
assert(entity_->getMembers().size() <= SAL_MAX_INT32);
sal_Int32 n = static_cast< sal_Int32 >(entity_->getMembers().size());
css::uno::Sequence<
@@ -1140,15 +1102,14 @@ public:
private:
virtual ~TypedefDescription() override {}
- virtual css::uno::TypeClass SAL_CALL getTypeClass()
- throw (css::uno::RuntimeException, std::exception) override
+ virtual css::uno::TypeClass SAL_CALL getTypeClass() override
{ return css::uno::TypeClass_TYPEDEF; }
- virtual rtl::OUString SAL_CALL getName() throw (css::uno::RuntimeException, std::exception) override
+ virtual rtl::OUString SAL_CALL getName() override
{ return name_; }
virtual css::uno::Reference< css::reflection::XTypeDescription > SAL_CALL
- getReferencedType() throw (css::uno::RuntimeException, std::exception) override
+ getReferencedType() override
{ return manager_->resolve(entity_->getType()); }
rtl::Reference< cppuhelper::TypeManager > manager_;
@@ -1171,24 +1132,23 @@ public:
private:
virtual ~ConstructorParameter() override {}
- virtual rtl::OUString SAL_CALL getName() throw (css::uno::RuntimeException, std::exception) override
+ virtual rtl::OUString SAL_CALL getName() override
{ return parameter_.name; }
virtual css::uno::Reference< css::reflection::XTypeDescription > SAL_CALL
- getType() throw (css::uno::RuntimeException, std::exception) override
+ getType() override
{ return manager_->resolve(parameter_.type); }
- virtual sal_Bool SAL_CALL isIn() throw (css::uno::RuntimeException, std::exception) override
+ virtual sal_Bool SAL_CALL isIn() override
{ return true; }
- virtual sal_Bool SAL_CALL isOut() throw (css::uno::RuntimeException, std::exception) override
+ virtual sal_Bool SAL_CALL isOut() override
{ return false; }
- virtual sal_Int32 SAL_CALL getPosition() throw (css::uno::RuntimeException, std::exception) override
+ virtual sal_Int32 SAL_CALL getPosition() override
{ return position_; }
- virtual sal_Bool SAL_CALL isRestParameter()
- throw (css::uno::RuntimeException, std::exception) override
+ virtual sal_Bool SAL_CALL isRestParameter() override
{ return parameter_.rest; }
rtl::Reference< cppuhelper::TypeManager > manager_;
@@ -1212,29 +1172,28 @@ public:
private:
virtual ~ConstructorDescription() override {}
- virtual sal_Bool SAL_CALL isDefaultConstructor()
- throw (css::uno::RuntimeException, std::exception) override
+ virtual sal_Bool SAL_CALL isDefaultConstructor() override
{ return constructor_.defaultConstructor; }
- virtual rtl::OUString SAL_CALL getName() throw (css::uno::RuntimeException, std::exception) override
+ virtual rtl::OUString SAL_CALL getName() override
{ return constructor_.name; }
virtual
css::uno::Sequence<
css::uno::Reference< css::reflection::XParameter > >
- SAL_CALL getParameters() throw (css::uno::RuntimeException, std::exception) override;
+ SAL_CALL getParameters() override;
virtual
css::uno::Sequence<
css::uno::Reference< css::reflection::XCompoundTypeDescription > >
- SAL_CALL getExceptions() throw (css::uno::RuntimeException, std::exception) override;
+ SAL_CALL getExceptions() override;
rtl::Reference< cppuhelper::TypeManager > manager_;
unoidl::SingleInterfaceBasedServiceEntity::Constructor constructor_;
};
css::uno::Sequence< css::uno::Reference< css::reflection::XParameter > >
-ConstructorDescription::getParameters() throw (css::uno::RuntimeException, std::exception) {
+ConstructorDescription::getParameters() {
assert(constructor_.parameters.size() <= SAL_MAX_INT32);
sal_Int32 n = static_cast< sal_Int32 >(constructor_.parameters.size());
css::uno::Sequence< css::uno::Reference< css::reflection::XParameter > > s(
@@ -1248,7 +1207,7 @@ ConstructorDescription::getParameters() throw (css::uno::RuntimeException, std::
css::uno::Sequence<
css::uno::Reference< css::reflection::XCompoundTypeDescription > >
-ConstructorDescription::getExceptions() throw (css::uno::RuntimeException, std::exception) {
+ConstructorDescription::getExceptions() {
assert(constructor_.exceptions.size() <= SAL_MAX_INT32);
sal_Int32 n = static_cast< sal_Int32 >(constructor_.exceptions.size());
css::uno::Sequence<
@@ -1281,17 +1240,16 @@ public:
private:
virtual ~SingleInterfaceBasedServiceDescription() override {}
- virtual css::uno::TypeClass SAL_CALL getTypeClass()
- throw (css::uno::RuntimeException, std::exception) override
+ virtual css::uno::TypeClass SAL_CALL getTypeClass() override
{ return css::uno::TypeClass_SERVICE; }
- virtual rtl::OUString SAL_CALL getName() throw (css::uno::RuntimeException, std::exception) override
+ virtual rtl::OUString SAL_CALL getName() override
{ return name_; }
virtual
css::uno::Sequence<
css::uno::Reference< css::reflection::XServiceTypeDescription > >
- SAL_CALL getMandatoryServices() throw (css::uno::RuntimeException, std::exception) override
+ SAL_CALL getMandatoryServices() override
{
return css::uno::Sequence<
css::uno::Reference< css::reflection::XServiceTypeDescription > >();
@@ -1300,7 +1258,7 @@ private:
virtual
css::uno::Sequence<
css::uno::Reference< css::reflection::XServiceTypeDescription > >
- SAL_CALL getOptionalServices() throw (css::uno::RuntimeException, std::exception) override
+ SAL_CALL getOptionalServices() override
{
return css::uno::Sequence<
css::uno::Reference< css::reflection::XServiceTypeDescription > >();
@@ -1309,7 +1267,7 @@ private:
virtual
css::uno::Sequence<
css::uno::Reference< css::reflection::XInterfaceTypeDescription > >
- SAL_CALL getMandatoryInterfaces() throw (css::uno::RuntimeException, std::exception) override
+ SAL_CALL getMandatoryInterfaces() override
{
return css::uno::Sequence<
css::uno::Reference<
@@ -1319,7 +1277,7 @@ private:
virtual
css::uno::Sequence<
css::uno::Reference< css::reflection::XInterfaceTypeDescription > >
- SAL_CALL getOptionalInterfaces() throw (css::uno::RuntimeException, std::exception) override
+ SAL_CALL getOptionalInterfaces() override
{
return css::uno::Sequence<
css::uno::Reference<
@@ -1329,25 +1287,24 @@ private:
virtual
css::uno::Sequence<
css::uno::Reference< css::reflection::XPropertyTypeDescription > >
- SAL_CALL getProperties() throw (css::uno::RuntimeException, std::exception) override
+ SAL_CALL getProperties() override
{
return css::uno::Sequence<
css::uno::Reference<
css::reflection::XPropertyTypeDescription > >();
}
- virtual sal_Bool SAL_CALL isSingleInterfaceBased()
- throw (css::uno::RuntimeException, std::exception) override
+ virtual sal_Bool SAL_CALL isSingleInterfaceBased() override
{ return true; }
virtual css::uno::Reference< css::reflection::XTypeDescription > SAL_CALL
- getInterface() throw (css::uno::RuntimeException, std::exception) override
+ getInterface() override
{ return manager_->resolve(entity_->getBase()); }
virtual
css::uno::Sequence<
css::uno::Reference< css::reflection::XServiceConstructorDescription > >
- SAL_CALL getConstructors() throw (css::uno::RuntimeException, std::exception) override;
+ SAL_CALL getConstructors() override;
rtl::Reference< cppuhelper::TypeManager > manager_;
rtl::OUString name_;
@@ -1357,7 +1314,6 @@ private:
css::uno::Sequence<
css::uno::Reference< css::reflection::XServiceConstructorDescription > >
SingleInterfaceBasedServiceDescription::getConstructors()
- throw (css::uno::RuntimeException, std::exception)
{
assert(entity_->getConstructors().size() <= SAL_MAX_INT32);
sal_Int32 n = static_cast< sal_Int32 >(entity_->getConstructors().size());
@@ -1384,19 +1340,17 @@ public:
private:
virtual ~PropertyDescription() override {}
- virtual css::uno::TypeClass SAL_CALL getTypeClass()
- throw (css::uno::RuntimeException, std::exception) override
+ virtual css::uno::TypeClass SAL_CALL getTypeClass() override
{ return css::uno::TypeClass_PROPERTY; }
- virtual rtl::OUString SAL_CALL getName() throw (css::uno::RuntimeException, std::exception) override
+ virtual rtl::OUString SAL_CALL getName() override
{ return property_.name; }
- virtual sal_Int16 SAL_CALL getPropertyFlags()
- throw (css::uno::RuntimeException, std::exception) override
+ virtual sal_Int16 SAL_CALL getPropertyFlags() override
{ return property_.attributes; }
virtual css::uno::Reference< css::reflection::XTypeDescription > SAL_CALL
- getPropertyTypeDescription() throw (css::uno::RuntimeException, std::exception) override
+ getPropertyTypeDescription() override
{ return manager_->resolve(property_.type); }
rtl::Reference< cppuhelper::TypeManager > manager_;
@@ -1423,50 +1377,48 @@ public:
private:
virtual ~AccumulationBasedServiceDescription() override {}
- virtual css::uno::TypeClass SAL_CALL getTypeClass()
- throw (css::uno::RuntimeException, std::exception) override
+ virtual css::uno::TypeClass SAL_CALL getTypeClass() override
{ return css::uno::TypeClass_SERVICE; }
- virtual rtl::OUString SAL_CALL getName() throw (css::uno::RuntimeException, std::exception) override
+ virtual rtl::OUString SAL_CALL getName() override
{ return name_; }
virtual
css::uno::Sequence<
css::uno::Reference< css::reflection::XServiceTypeDescription > >
- SAL_CALL getMandatoryServices() throw (css::uno::RuntimeException, std::exception) override;
+ SAL_CALL getMandatoryServices() override;
virtual
css::uno::Sequence<
css::uno::Reference< css::reflection::XServiceTypeDescription > >
- SAL_CALL getOptionalServices() throw (css::uno::RuntimeException, std::exception) override;
+ SAL_CALL getOptionalServices() override;
virtual
css::uno::Sequence<
css::uno::Reference< css::reflection::XInterfaceTypeDescription > >
- SAL_CALL getMandatoryInterfaces() throw (css::uno::RuntimeException, std::exception) override;
+ SAL_CALL getMandatoryInterfaces() override;
virtual
css::uno::Sequence<
css::uno::Reference< css::reflection::XInterfaceTypeDescription > >
- SAL_CALL getOptionalInterfaces() throw (css::uno::RuntimeException, std::exception) override;
+ SAL_CALL getOptionalInterfaces() override;
virtual
css::uno::Sequence<
css::uno::Reference< css::reflection::XPropertyTypeDescription > >
- SAL_CALL getProperties() throw (css::uno::RuntimeException, std::exception) override;
+ SAL_CALL getProperties() override;
- virtual sal_Bool SAL_CALL isSingleInterfaceBased()
- throw (css::uno::RuntimeException, std::exception) override
+ virtual sal_Bool SAL_CALL isSingleInterfaceBased() override
{ return false; }
virtual css::uno::Reference< css::reflection::XTypeDescription > SAL_CALL
- getInterface() throw (css::uno::RuntimeException, std::exception) override
+ getInterface() override
{ return css::uno::Reference< css::reflection::XTypeDescription >(); }
virtual
css::uno::Sequence<
css::uno::Reference< css::reflection::XServiceConstructorDescription > >
- SAL_CALL getConstructors() throw (css::uno::RuntimeException, std::exception) override
+ SAL_CALL getConstructors() override
{
return css::uno::Sequence<
css::uno::Reference<
@@ -1481,7 +1433,6 @@ private:
css::uno::Sequence<
css::uno::Reference< css::reflection::XServiceTypeDescription > >
AccumulationBasedServiceDescription::getMandatoryServices()
- throw (css::uno::RuntimeException, std::exception)
{
assert(entity_->getDirectMandatoryBaseServices().size() <= SAL_MAX_INT32);
sal_Int32 n = static_cast< sal_Int32 >(
@@ -1500,7 +1451,6 @@ AccumulationBasedServiceDescription::getMandatoryServices()
css::uno::Sequence<
css::uno::Reference< css::reflection::XServiceTypeDescription > >
AccumulationBasedServiceDescription::getOptionalServices()
- throw (css::uno::RuntimeException, std::exception)
{
assert(entity_->getDirectOptionalBaseServices().size() <= SAL_MAX_INT32);
sal_Int32 n = static_cast< sal_Int32 >(
@@ -1518,7 +1468,6 @@ AccumulationBasedServiceDescription::getOptionalServices()
css::uno::Sequence<
css::uno::Reference< css::reflection::XInterfaceTypeDescription > >
AccumulationBasedServiceDescription::getMandatoryInterfaces()
- throw (css::uno::RuntimeException, std::exception)
{
assert(entity_->getDirectMandatoryBaseInterfaces().size() <= SAL_MAX_INT32);
sal_Int32 n = static_cast< sal_Int32 >(
@@ -1539,7 +1488,6 @@ AccumulationBasedServiceDescription::getMandatoryInterfaces()
css::uno::Sequence<
css::uno::Reference< css::reflection::XInterfaceTypeDescription > >
AccumulationBasedServiceDescription::getOptionalInterfaces()
- throw (css::uno::RuntimeException, std::exception)
{
assert(entity_->getDirectOptionalBaseInterfaces().size() <= SAL_MAX_INT32);
sal_Int32 n = static_cast< sal_Int32 >(
@@ -1560,7 +1508,6 @@ AccumulationBasedServiceDescription::getOptionalInterfaces()
css::uno::Sequence<
css::uno::Reference< css::reflection::XPropertyTypeDescription > >
AccumulationBasedServiceDescription::getProperties()
- throw (css::uno::RuntimeException, std::exception)
{
assert(entity_->getDirectProperties().size() <= SAL_MAX_INT32);
sal_Int32 n = static_cast< sal_Int32 >(
@@ -1593,26 +1540,24 @@ public:
private:
virtual ~InterfaceBasedSingletonDescription() override {}
- virtual css::uno::TypeClass SAL_CALL getTypeClass()
- throw (css::uno::RuntimeException, std::exception) override
+ virtual css::uno::TypeClass SAL_CALL getTypeClass() override
{ return css::uno::TypeClass_SINGLETON; }
- virtual rtl::OUString SAL_CALL getName() throw (css::uno::RuntimeException, std::exception) override
+ virtual rtl::OUString SAL_CALL getName() override
{ return name_; }
virtual css::uno::Reference< css::reflection::XServiceTypeDescription >
- SAL_CALL getService() throw (css::uno::RuntimeException, std::exception) override
+ SAL_CALL getService() override
{
return
css::uno::Reference< css::reflection::XServiceTypeDescription >();
}
- virtual sal_Bool SAL_CALL isInterfaceBased()
- throw (css::uno::RuntimeException, std::exception) override
+ virtual sal_Bool SAL_CALL isInterfaceBased() override
{ return true; }
virtual css::uno::Reference< css::reflection::XTypeDescription >
- SAL_CALL getInterface() throw (css::uno::RuntimeException, std::exception) override
+ SAL_CALL getInterface() override
{ return manager_->resolve(entity_->getBase()); }
rtl::Reference< cppuhelper::TypeManager > manager_;
@@ -1639,26 +1584,24 @@ public:
private:
virtual ~ServiceBasedSingletonDescription() override {}
- virtual css::uno::TypeClass SAL_CALL getTypeClass()
- throw (css::uno::RuntimeException, std::exception) override
+ virtual css::uno::TypeClass SAL_CALL getTypeClass() override
{ return css::uno::TypeClass_SINGLETON; }
- virtual rtl::OUString SAL_CALL getName() throw (css::uno::RuntimeException, std::exception) override
+ virtual rtl::OUString SAL_CALL getName() override
{ return name_; }
virtual css::uno::Reference< css::reflection::XServiceTypeDescription >
- SAL_CALL getService() throw (css::uno::RuntimeException, std::exception) override
+ SAL_CALL getService() override
{
return css::uno::Reference< css::reflection::XServiceTypeDescription >(
manager_->resolve(entity_->getBase()), css::uno::UNO_QUERY_THROW);
}
- virtual sal_Bool SAL_CALL isInterfaceBased()
- throw (css::uno::RuntimeException, std::exception) override
+ virtual sal_Bool SAL_CALL isInterfaceBased() override
{ return false; }
virtual css::uno::Reference< css::reflection::XTypeDescription >
- SAL_CALL getInterface() throw (css::uno::RuntimeException, std::exception) override
+ SAL_CALL getInterface() override
{ return css::uno::Reference< css::reflection::XTypeDescription >(); }
rtl::Reference< cppuhelper::TypeManager > manager_;
@@ -1685,20 +1628,14 @@ public:
private:
virtual ~Enumeration() override {}
- virtual sal_Bool SAL_CALL hasMoreElements()
- throw (css::uno::RuntimeException, std::exception) override
+ virtual sal_Bool SAL_CALL hasMoreElements() override
{ return !positions_.empty(); }
- virtual css::uno::Any SAL_CALL nextElement()
- throw (
- css::container::NoSuchElementException,
- css::lang::WrappedTargetException, css::uno::RuntimeException, std::exception) override
+ virtual css::uno::Any SAL_CALL nextElement() override
{ return css::uno::makeAny(nextTypeDescription()); }
virtual css::uno::Reference< css::reflection::XTypeDescription > SAL_CALL
- nextTypeDescription()
- throw (
- css::container::NoSuchElementException, css::uno::RuntimeException, std::exception) override;
+ nextTypeDescription() override;
bool matches(css::uno::TypeClass tc) const;
@@ -1746,7 +1683,6 @@ private:
css::uno::Reference< css::reflection::XTypeDescription >
Enumeration::nextTypeDescription()
- throw (css::container::NoSuchElementException, css::uno::RuntimeException, std::exception)
{
rtl::OUString name;
{
@@ -1959,7 +1895,6 @@ cppuhelper::TypeManager::~TypeManager() throw () {}
void cppuhelper::TypeManager::disposing() {} //TODO
rtl::OUString cppuhelper::TypeManager::getImplementationName()
- throw (css::uno::RuntimeException, std::exception)
{
return rtl::OUString(
"com.sun.star.comp.cppuhelper.bootstrap.TypeManager");
@@ -1967,14 +1902,12 @@ rtl::OUString cppuhelper::TypeManager::getImplementationName()
sal_Bool cppuhelper::TypeManager::supportsService(
rtl::OUString const & ServiceName)
- throw (css::uno::RuntimeException, std::exception)
{
return cppu::supportsService(this, ServiceName);
}
css::uno::Sequence< rtl::OUString >
cppuhelper::TypeManager::getSupportedServiceNames()
- throw (css::uno::RuntimeException, std::exception)
{
css::uno::Sequence<OUString> names { "com.sun.star.reflection.TypeDescriptionManager" }; //TODO
return names;
@@ -1982,7 +1915,6 @@ cppuhelper::TypeManager::getSupportedServiceNames()
css::uno::Any cppuhelper::TypeManager::getByHierarchicalName(
rtl::OUString const & aName)
- throw (css::container::NoSuchElementException, css::uno::RuntimeException, std::exception)
{
css::uno::Any desc(find(aName));
if (!desc.hasValue()) {
@@ -1994,19 +1926,16 @@ css::uno::Any cppuhelper::TypeManager::getByHierarchicalName(
sal_Bool cppuhelper::TypeManager::hasByHierarchicalName(
rtl::OUString const & aName)
- throw (css::uno::RuntimeException, std::exception)
{
return find(aName).hasValue();
}
css::uno::Type cppuhelper::TypeManager::getElementType()
- throw (css::uno::RuntimeException, std::exception)
{
return cppu::UnoType< rtl::OUString >::get();
}
sal_Bool cppuhelper::TypeManager::hasElements()
- throw (css::uno::RuntimeException, std::exception)
{
throw css::uno::RuntimeException(
"TypeManager hasElements: method not supported",
@@ -2015,7 +1944,6 @@ sal_Bool cppuhelper::TypeManager::hasElements()
css::uno::Reference< css::container::XEnumeration >
cppuhelper::TypeManager::createEnumeration()
- throw (css::uno::RuntimeException, std::exception)
{
throw css::uno::RuntimeException(
"TypeManager createEnumeration: method not supported",
@@ -2023,7 +1951,6 @@ cppuhelper::TypeManager::createEnumeration()
}
sal_Bool cppuhelper::TypeManager::has(css::uno::Any const &)
- throw (css::uno::RuntimeException, std::exception)
{
throw css::uno::RuntimeException(
"TypeManager has: method not supported",
@@ -2031,9 +1958,6 @@ sal_Bool cppuhelper::TypeManager::has(css::uno::Any const &)
}
void cppuhelper::TypeManager::insert(css::uno::Any const & aElement)
- throw (
- css::lang::IllegalArgumentException,
- css::container::ElementExistException, css::uno::RuntimeException, std::exception)
{
rtl::OUString uri;
if (!(aElement >>= uri)) {
@@ -2048,9 +1972,6 @@ void cppuhelper::TypeManager::insert(css::uno::Any const & aElement)
}
void cppuhelper::TypeManager::remove(css::uno::Any const & aElement)
- throw (
- css::lang::IllegalArgumentException,
- css::container::NoSuchElementException, css::uno::RuntimeException, std::exception)
{
rtl::OUString uri;
if (!(aElement >>= uri)) {
@@ -2067,10 +1988,6 @@ cppuhelper::TypeManager::createTypeDescriptionEnumeration(
rtl::OUString const & moduleName,
css::uno::Sequence< css::uno::TypeClass > const & types,
css::reflection::TypeDescriptionSearchDepth depth)
- throw (
- css::reflection::NoSuchTypeNameException,
- css::reflection::InvalidTypeNameException,
- css::uno::RuntimeException, std::exception)
{
rtl::Reference< unoidl::MapCursor > cursor;
try {
diff --git a/cppuhelper/source/typemanager.hxx b/cppuhelper/source/typemanager.hxx
index 3a8f6ad3fd56..2ad52f836ff3 100644
--- a/cppuhelper/source/typemanager.hxx
+++ b/cppuhelper/source/typemanager.hxx
@@ -68,53 +68,36 @@ private:
virtual void SAL_CALL disposing() override;
- virtual rtl::OUString SAL_CALL getImplementationName()
- throw (css::uno::RuntimeException, std::exception) override;
+ virtual rtl::OUString SAL_CALL getImplementationName() override;
- virtual sal_Bool SAL_CALL supportsService(rtl::OUString const & ServiceName)
- throw (css::uno::RuntimeException, std::exception) override;
+ virtual sal_Bool SAL_CALL supportsService(rtl::OUString const & ServiceName) override;
virtual css::uno::Sequence< rtl::OUString > SAL_CALL
- getSupportedServiceNames() throw (css::uno::RuntimeException, std::exception) override;
+ getSupportedServiceNames() override;
virtual css::uno::Any SAL_CALL getByHierarchicalName(
- rtl::OUString const & aName)
- throw (
- css::container::NoSuchElementException, css::uno::RuntimeException, std::exception) override;
+ rtl::OUString const & aName) override;
- virtual sal_Bool SAL_CALL hasByHierarchicalName(rtl::OUString const & aName)
- throw (css::uno::RuntimeException, std::exception) override;
+ virtual sal_Bool SAL_CALL hasByHierarchicalName(rtl::OUString const & aName) override;
- virtual css::uno::Type SAL_CALL getElementType()
- throw (css::uno::RuntimeException, std::exception) override;
+ virtual css::uno::Type SAL_CALL getElementType() override;
- virtual sal_Bool SAL_CALL hasElements() throw (css::uno::RuntimeException, std::exception) override;
+ virtual sal_Bool SAL_CALL hasElements() override;
virtual css::uno::Reference< css::container::XEnumeration > SAL_CALL
- createEnumeration() throw (css::uno::RuntimeException, std::exception) override;
+ createEnumeration() override;
- virtual sal_Bool SAL_CALL has(css::uno::Any const & aElement)
- throw (css::uno::RuntimeException, std::exception) override;
+ virtual sal_Bool SAL_CALL has(css::uno::Any const & aElement) override;
- virtual void SAL_CALL insert(css::uno::Any const & aElement)
- throw (
- css::lang::IllegalArgumentException,
- css::container::ElementExistException, css::uno::RuntimeException, std::exception) override;
+ virtual void SAL_CALL insert(css::uno::Any const & aElement) override;
- virtual void SAL_CALL remove(css::uno::Any const & aElement)
- throw (
- css::lang::IllegalArgumentException,
- css::container::NoSuchElementException, css::uno::RuntimeException, std::exception) override;
+ virtual void SAL_CALL remove(css::uno::Any const & aElement) override;
virtual css::uno::Reference< css::reflection::XTypeDescriptionEnumeration >
SAL_CALL createTypeDescriptionEnumeration(
rtl::OUString const & moduleName,
css::uno::Sequence< css::uno::TypeClass > const & types,
- css::reflection::TypeDescriptionSearchDepth depth)
- throw (
- css::reflection::NoSuchTypeNameException,
- css::reflection::InvalidTypeNameException,
- css::uno::RuntimeException, std::exception) override;
+ css::reflection::TypeDescriptionSearchDepth depth) override;
void readRdbDirectory(rtl::OUString const & uri, bool optional);
diff --git a/cppuhelper/source/weak.cxx b/cppuhelper/source/weak.cxx
index a30700bdd691..b52634b26ecc 100644
--- a/cppuhelper/source/weak.cxx
+++ b/cppuhelper/source/weak.cxx
@@ -64,19 +64,19 @@ public:
const OWeakConnectionPoint& operator=(const OWeakConnectionPoint&) = delete;
// XInterface
- Any SAL_CALL queryInterface( const Type & rType ) throw(css::uno::RuntimeException, std::exception) override;
+ Any SAL_CALL queryInterface( const Type & rType ) override;
void SAL_CALL acquire() throw() override;
void SAL_CALL release() throw() override;
// XAdapter
- css::uno::Reference< css::uno::XInterface > SAL_CALL queryAdapted() throw(css::uno::RuntimeException, std::exception) override;
- void SAL_CALL addReference( const css::uno::Reference< css::uno::XReference >& xRef ) throw(css::uno::RuntimeException, std::exception) override;
- void SAL_CALL removeReference( const css::uno::Reference< css::uno::XReference >& xRef ) throw(css::uno::RuntimeException, std::exception) override;
+ css::uno::Reference< css::uno::XInterface > SAL_CALL queryAdapted() override;
+ void SAL_CALL addReference( const css::uno::Reference< css::uno::XReference >& xRef ) override;
+ void SAL_CALL removeReference( const css::uno::Reference< css::uno::XReference >& xRef ) override;
/// Called from the weak object if the reference count goes to zero.
///
/// @throws css::uno::RuntimeException
- void SAL_CALL dispose() throw(css::uno::RuntimeException);
+ void SAL_CALL dispose();
private:
virtual ~OWeakConnectionPoint() {}
@@ -91,7 +91,6 @@ private:
// XInterface
Any SAL_CALL OWeakConnectionPoint::queryInterface( const Type & rType )
- throw(css::uno::RuntimeException, std::exception)
{
return ::cppu::queryInterface(
rType, static_cast< XAdapter * >( this ), static_cast< XInterface * >( this ) );
@@ -110,7 +109,7 @@ void SAL_CALL OWeakConnectionPoint::release() throw()
delete this;
}
-void SAL_CALL OWeakConnectionPoint::dispose() throw(css::uno::RuntimeException)
+void SAL_CALL OWeakConnectionPoint::dispose()
{
std::vector<Reference<XReference>> aCopy;
{ // only hold the mutex while we access the field
@@ -142,7 +141,7 @@ void SAL_CALL OWeakConnectionPoint::dispose() throw(css::uno::RuntimeException)
}
// XInterface
-Reference< XInterface > SAL_CALL OWeakConnectionPoint::queryAdapted() throw(css::uno::RuntimeException, std::exception)
+Reference< XInterface > SAL_CALL OWeakConnectionPoint::queryAdapted()
{
Reference< XInterface > ret;
@@ -171,7 +170,6 @@ Reference< XInterface > SAL_CALL OWeakConnectionPoint::queryAdapted() throw(css:
// XInterface
void SAL_CALL OWeakConnectionPoint::addReference(const Reference< XReference >& rRef)
- throw(css::uno::RuntimeException, std::exception)
{
MutexGuard aGuard(getWeakMutex());
m_aReferences.push_back( rRef );
@@ -179,7 +177,6 @@ void SAL_CALL OWeakConnectionPoint::addReference(const Reference< XReference >&
// XInterface
void SAL_CALL OWeakConnectionPoint::removeReference(const Reference< XReference >& rRef)
- throw(css::uno::RuntimeException, std::exception)
{
MutexGuard aGuard(getWeakMutex());
// Search from end because the thing that last added a ref is most likely to be the
@@ -211,7 +208,7 @@ OWeakObject::OWeakObject()
#endif
// XInterface
-Any SAL_CALL OWeakObject::queryInterface( const Type & rType ) throw(css::uno::RuntimeException, std::exception)
+Any SAL_CALL OWeakObject::queryInterface( const Type & rType )
{
return ::cppu::queryInterface(
rType,
@@ -261,7 +258,6 @@ OWeakObject::~OWeakObject()
// XWeak
Reference< XAdapter > SAL_CALL OWeakObject::queryAdapter()
- throw (css::uno::RuntimeException, std::exception)
{
if (!m_pWeakConnectionPoint)
{
@@ -306,14 +302,14 @@ void OWeakAggObject::release() throw()
}
// XInterface
-Any OWeakAggObject::queryInterface( const Type & rType ) throw(css::uno::RuntimeException, std::exception)
+Any OWeakAggObject::queryInterface( const Type & rType )
{
Reference< XInterface > x( xDelegator ); // harden ref
return (x.is() ? x->queryInterface( rType ) : queryAggregation( rType ));
}
// XAggregation
-Any OWeakAggObject::queryAggregation( const Type & rType ) throw(css::uno::RuntimeException, std::exception)
+Any OWeakAggObject::queryAggregation( const Type & rType )
{
return ::cppu::queryInterface(
rType,
@@ -323,7 +319,7 @@ Any OWeakAggObject::queryAggregation( const Type & rType ) throw(css::uno::Runti
}
// XAggregation
-void OWeakAggObject::setDelegator( const Reference<XInterface > & rDelegator ) throw(css::uno::RuntimeException, std::exception)
+void OWeakAggObject::setDelegator( const Reference<XInterface > & rDelegator )
{
xDelegator = rDelegator;
}
@@ -357,12 +353,12 @@ public:
const OWeakRefListener& operator=(const OWeakRefListener&) = delete;
// XInterface
- Any SAL_CALL queryInterface( const Type & rType ) throw(RuntimeException, std::exception) override;
+ Any SAL_CALL queryInterface( const Type & rType ) override;
void SAL_CALL acquire() throw() override;
void SAL_CALL release() throw() override;
// XReference
- void SAL_CALL dispose() throw(css::uno::RuntimeException, std::exception) override;
+ void SAL_CALL dispose() override;
/// The reference counter.
oslInterlockedCount m_aRefCount;
@@ -405,7 +401,7 @@ OWeakRefListener::~OWeakRefListener()
}
// XInterface
-Any SAL_CALL OWeakRefListener::queryInterface( const Type & rType ) throw(RuntimeException, std::exception)
+Any SAL_CALL OWeakRefListener::queryInterface( const Type & rType )
{
return ::cppu::queryInterface(
rType, static_cast< XReference * >( this ), static_cast< XInterface * >( this ) );
@@ -425,7 +421,6 @@ void SAL_CALL OWeakRefListener::release() throw()
}
void SAL_CALL OWeakRefListener::dispose()
- throw(css::uno::RuntimeException, std::exception)
{
Reference< XAdapter > xAdp;
{
generated by cgit (git 2.34.1) at 2024-08-14 18:49:09 +0000