summaryrefslogtreecommitdiff
path: root/comphelper/source/container
diff options
context:
space:
mode:
Diffstat (limited to 'comphelper/source/container')
-rw-r--r--comphelper/source/container/IndexedPropertyValuesContainer.cxx48
-rw-r--r--comphelper/source/container/NamedPropertyValuesContainer.cxx52
-rw-r--r--comphelper/source/container/containermultiplexer.cxx12
-rw-r--r--comphelper/source/container/enumerablemap.cxx76
-rw-r--r--comphelper/source/container/enumhelper.cxx11
-rw-r--r--comphelper/source/container/namecontainer.cxx40
6 files changed, 80 insertions, 159 deletions
diff --git a/comphelper/source/container/IndexedPropertyValuesContainer.cxx b/comphelper/source/container/IndexedPropertyValuesContainer.cxx
index 803b171dbf1e..9bc88a408d43 100644
--- a/comphelper/source/container/IndexedPropertyValuesContainer.cxx
+++ b/comphelper/source/container/IndexedPropertyValuesContainer.cxx
@@ -37,35 +37,24 @@ public:
IndexedPropertyValuesContainer() throw();
// XIndexContainer
- virtual void SAL_CALL insertByIndex( sal_Int32 nIndex, const css::uno::Any& aElement )
- throw(css::lang::IllegalArgumentException, css::lang::IndexOutOfBoundsException,
- css::lang::WrappedTargetException, css::uno::RuntimeException, std::exception) override;
- virtual void SAL_CALL removeByIndex( sal_Int32 nIndex )
- throw(css::lang::IndexOutOfBoundsException, css::lang::WrappedTargetException,
- css::uno::RuntimeException, std::exception) override;
+ virtual void SAL_CALL insertByIndex( sal_Int32 nIndex, const css::uno::Any& aElement ) override;
+ virtual void SAL_CALL removeByIndex( sal_Int32 nIndex ) override;
// XIndexReplace
- virtual void SAL_CALL replaceByIndex( sal_Int32 nIndex, const css::uno::Any& aElement )
- throw(css::lang::IllegalArgumentException, css::lang::IndexOutOfBoundsException,
- css::lang::WrappedTargetException, css::uno::RuntimeException, std::exception) override;
+ virtual void SAL_CALL replaceByIndex( sal_Int32 nIndex, const css::uno::Any& aElement ) override;
// XIndexAccess
- virtual sal_Int32 SAL_CALL getCount( )
- throw(css::uno::RuntimeException, std::exception) override;
- virtual css::uno::Any SAL_CALL getByIndex( sal_Int32 nIndex )
- throw(css::lang::IndexOutOfBoundsException, css::lang::WrappedTargetException,
- css::uno::RuntimeException, std::exception) override;
+ virtual sal_Int32 SAL_CALL getCount( ) override;
+ virtual css::uno::Any SAL_CALL getByIndex( sal_Int32 nIndex ) override;
// XElementAccess
- virtual css::uno::Type SAL_CALL getElementType( )
- throw(css::uno::RuntimeException, std::exception) override;
- virtual sal_Bool SAL_CALL hasElements( )
- throw(css::uno::RuntimeException, std::exception) override;
+ virtual css::uno::Type SAL_CALL getElementType( ) override;
+ virtual sal_Bool SAL_CALL hasElements( ) override;
//XServiceInfo
- virtual OUString SAL_CALL getImplementationName( ) throw(css::uno::RuntimeException, std::exception) override;
- virtual sal_Bool SAL_CALL supportsService( const OUString& ServiceName ) throw(css::uno::RuntimeException, std::exception) override;
- virtual css::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames( ) throw(css::uno::RuntimeException, std::exception) override;
+ virtual OUString SAL_CALL getImplementationName( ) override;
+ virtual sal_Bool SAL_CALL supportsService( const OUString& ServiceName ) override;
+ virtual css::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames( ) override;
private:
IndexedPropertyValues maProperties;
@@ -77,8 +66,6 @@ IndexedPropertyValuesContainer::IndexedPropertyValuesContainer() throw()
// XIndexContainer
void SAL_CALL IndexedPropertyValuesContainer::insertByIndex( sal_Int32 nIndex, const css::uno::Any& aElement )
- throw(css::lang::IllegalArgumentException, css::lang::IndexOutOfBoundsException,
- css::lang::WrappedTargetException, css::uno::RuntimeException, std::exception)
{
sal_Int32 nSize(maProperties.size());
if ((nSize >= nIndex) && (nIndex >= 0))
@@ -119,8 +106,6 @@ void SAL_CALL IndexedPropertyValuesContainer::insertByIndex( sal_Int32 nIndex, c
}
void SAL_CALL IndexedPropertyValuesContainer::removeByIndex( sal_Int32 nIndex )
- throw(css::lang::IndexOutOfBoundsException, css::lang::WrappedTargetException,
- css::uno::RuntimeException, std::exception)
{
sal_Int32 nSize(maProperties.size());
if ((nIndex < nSize) && (nIndex >= 0))
@@ -154,8 +139,6 @@ void SAL_CALL IndexedPropertyValuesContainer::removeByIndex( sal_Int32 nIndex )
// XIndexReplace
void SAL_CALL IndexedPropertyValuesContainer::replaceByIndex( sal_Int32 nIndex, const css::uno::Any& aElement )
- throw(css::lang::IllegalArgumentException, css::lang::IndexOutOfBoundsException,
- css::lang::WrappedTargetException, css::uno::RuntimeException, std::exception)
{
sal_Int32 nSize(maProperties.size());
if ((nIndex < nSize) && (nIndex >= 0))
@@ -171,14 +154,11 @@ void SAL_CALL IndexedPropertyValuesContainer::replaceByIndex( sal_Int32 nIndex,
// XIndexAccess
sal_Int32 SAL_CALL IndexedPropertyValuesContainer::getCount( )
- throw(css::uno::RuntimeException, std::exception)
{
return maProperties.size();
}
css::uno::Any SAL_CALL IndexedPropertyValuesContainer::getByIndex( sal_Int32 nIndex )
- throw(css::lang::IndexOutOfBoundsException, css::lang::WrappedTargetException,
- css::uno::RuntimeException, std::exception)
{
sal_Int32 nSize(maProperties.size());
if (!((nIndex < nSize) && (nIndex >= 0)))
@@ -189,29 +169,27 @@ css::uno::Any SAL_CALL IndexedPropertyValuesContainer::getByIndex( sal_Int32 nIn
// XElementAccess
css::uno::Type SAL_CALL IndexedPropertyValuesContainer::getElementType( )
- throw(css::uno::RuntimeException, std::exception)
{
return cppu::UnoType<uno::Sequence<beans::PropertyValue>>::get();
}
sal_Bool SAL_CALL IndexedPropertyValuesContainer::hasElements( )
- throw(css::uno::RuntimeException, std::exception)
{
return !maProperties.empty();
}
//XServiceInfo
-OUString SAL_CALL IndexedPropertyValuesContainer::getImplementationName( ) throw(css::uno::RuntimeException, std::exception)
+OUString SAL_CALL IndexedPropertyValuesContainer::getImplementationName( )
{
return OUString( "IndexedPropertyValuesContainer" );
}
-sal_Bool SAL_CALL IndexedPropertyValuesContainer::supportsService( const OUString& ServiceName ) throw(css::uno::RuntimeException, std::exception)
+sal_Bool SAL_CALL IndexedPropertyValuesContainer::supportsService( const OUString& ServiceName )
{
return cppu::supportsService(this, ServiceName);
}
-css::uno::Sequence< OUString > SAL_CALL IndexedPropertyValuesContainer::getSupportedServiceNames( ) throw(css::uno::RuntimeException, std::exception)
+css::uno::Sequence< OUString > SAL_CALL IndexedPropertyValuesContainer::getSupportedServiceNames( )
{
const OUString aServiceName( "com.sun.star.document.IndexedPropertyValues" );
const uno::Sequence< OUString > aSeq( &aServiceName, 1 );
diff --git a/comphelper/source/container/NamedPropertyValuesContainer.cxx b/comphelper/source/container/NamedPropertyValuesContainer.cxx
index 4ac5b42fb5f5..7e72ccce808e 100644
--- a/comphelper/source/container/NamedPropertyValuesContainer.cxx
+++ b/comphelper/source/container/NamedPropertyValuesContainer.cxx
@@ -38,37 +38,25 @@ public:
NamedPropertyValuesContainer() throw();
// XNameContainer
- virtual void SAL_CALL insertByName( const OUString& aName, const css::uno::Any& aElement )
- throw(css::lang::IllegalArgumentException, css::container::ElementExistException,
- css::lang::WrappedTargetException, css::uno::RuntimeException, std::exception) override;
- virtual void SAL_CALL removeByName( const OUString& Name )
- throw(css::container::NoSuchElementException, css::lang::WrappedTargetException,
- css::uno::RuntimeException, std::exception) override;
+ virtual void SAL_CALL insertByName( const OUString& aName, const css::uno::Any& aElement ) override;
+ virtual void SAL_CALL removeByName( const OUString& Name ) override;
// XNameReplace
- virtual void SAL_CALL replaceByName( const OUString& aName, const css::uno::Any& aElement )
- throw(css::lang::IllegalArgumentException, css::container::NoSuchElementException,
- css::lang::WrappedTargetException, css::uno::RuntimeException, std::exception) override;
+ virtual void SAL_CALL replaceByName( const OUString& aName, const css::uno::Any& aElement ) override;
// XNameAccess
- virtual css::uno::Any SAL_CALL getByName( const OUString& aName )
- throw(css::container::NoSuchElementException, css::lang::WrappedTargetException,
- css::uno::RuntimeException, std::exception) override;
- virtual css::uno::Sequence< OUString > SAL_CALL getElementNames( )
- throw(css::uno::RuntimeException, std::exception) override;
- virtual sal_Bool SAL_CALL hasByName( const OUString& aName )
- throw(css::uno::RuntimeException, std::exception) override;
+ virtual css::uno::Any SAL_CALL getByName( const OUString& aName ) override;
+ virtual css::uno::Sequence< OUString > SAL_CALL getElementNames( ) override;
+ virtual sal_Bool SAL_CALL hasByName( const OUString& aName ) override;
// XElementAccess
- virtual css::uno::Type SAL_CALL getElementType( )
- throw(css::uno::RuntimeException, std::exception) override;
- virtual sal_Bool SAL_CALL hasElements( )
- throw(css::uno::RuntimeException, std::exception) override;
+ virtual css::uno::Type SAL_CALL getElementType( ) override;
+ virtual sal_Bool SAL_CALL hasElements( ) override;
//XServiceInfo
- virtual OUString SAL_CALL getImplementationName( ) throw(css::uno::RuntimeException, std::exception) override;
- virtual sal_Bool SAL_CALL supportsService( const OUString& ServiceName ) throw(css::uno::RuntimeException, std::exception) override;
- virtual css::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames( ) throw(css::uno::RuntimeException, std::exception) override;
+ virtual OUString SAL_CALL getImplementationName( ) override;
+ virtual sal_Bool SAL_CALL supportsService( const OUString& ServiceName ) override;
+ virtual css::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames( ) override;
private:
NamedPropertyValues maProperties;
@@ -80,8 +68,6 @@ NamedPropertyValuesContainer::NamedPropertyValuesContainer() throw()
// XNameContainer
void SAL_CALL NamedPropertyValuesContainer::insertByName( const OUString& aName, const uno::Any& aElement )
- throw(css::lang::IllegalArgumentException, css::container::ElementExistException,
- css::lang::WrappedTargetException, css::uno::RuntimeException, std::exception)
{
if( maProperties.find( aName ) != maProperties.end() )
throw container::ElementExistException();
@@ -94,8 +80,6 @@ void SAL_CALL NamedPropertyValuesContainer::insertByName( const OUString& aName,
}
void SAL_CALL NamedPropertyValuesContainer::removeByName( const OUString& Name )
- throw(css::container::NoSuchElementException, css::lang::WrappedTargetException,
- css::uno::RuntimeException, std::exception)
{
NamedPropertyValues::iterator aIter = maProperties.find( Name );
if( aIter == maProperties.end() )
@@ -106,8 +90,6 @@ void SAL_CALL NamedPropertyValuesContainer::removeByName( const OUString& Name )
// XNameReplace
void SAL_CALL NamedPropertyValuesContainer::replaceByName( const OUString& aName, const css::uno::Any& aElement )
- throw(css::lang::IllegalArgumentException, css::container::NoSuchElementException,
- css::lang::WrappedTargetException, css::uno::RuntimeException, std::exception)
{
NamedPropertyValues::iterator aIter = maProperties.find( aName );
if( aIter == maProperties.end() )
@@ -122,8 +104,6 @@ void SAL_CALL NamedPropertyValuesContainer::replaceByName( const OUString& aName
// XNameAccess
css::uno::Any SAL_CALL NamedPropertyValuesContainer::getByName( const OUString& aName )
- throw(css::container::NoSuchElementException, css::lang::WrappedTargetException,
- css::uno::RuntimeException, std::exception)
{
NamedPropertyValues::iterator aIter = maProperties.find( aName );
if( aIter == maProperties.end() )
@@ -137,13 +117,11 @@ css::uno::Any SAL_CALL NamedPropertyValuesContainer::getByName( const OUString&
}
css::uno::Sequence< OUString > SAL_CALL NamedPropertyValuesContainer::getElementNames( )
- throw(css::uno::RuntimeException, std::exception)
{
return comphelper::mapKeysToSequence(maProperties);
}
sal_Bool SAL_CALL NamedPropertyValuesContainer::hasByName( const OUString& aName )
- throw(css::uno::RuntimeException, std::exception)
{
NamedPropertyValues::iterator aIter = maProperties.find( aName );
return aIter != maProperties.end();
@@ -151,29 +129,27 @@ sal_Bool SAL_CALL NamedPropertyValuesContainer::hasByName( const OUString& aName
// XElementAccess
css::uno::Type SAL_CALL NamedPropertyValuesContainer::getElementType( )
- throw(css::uno::RuntimeException, std::exception)
{
return cppu::UnoType<uno::Sequence<beans::PropertyValue>>::get();
}
sal_Bool SAL_CALL NamedPropertyValuesContainer::hasElements( )
- throw(css::uno::RuntimeException, std::exception)
{
return !maProperties.empty();
}
//XServiceInfo
-OUString SAL_CALL NamedPropertyValuesContainer::getImplementationName( ) throw(css::uno::RuntimeException, std::exception)
+OUString SAL_CALL NamedPropertyValuesContainer::getImplementationName( )
{
return OUString( "NamedPropertyValuesContainer" );
}
-sal_Bool SAL_CALL NamedPropertyValuesContainer::supportsService( const OUString& ServiceName ) throw(css::uno::RuntimeException, std::exception)
+sal_Bool SAL_CALL NamedPropertyValuesContainer::supportsService( const OUString& ServiceName )
{
return cppu::supportsService(this, ServiceName);
}
-css::uno::Sequence< OUString > SAL_CALL NamedPropertyValuesContainer::getSupportedServiceNames( ) throw(css::uno::RuntimeException, std::exception)
+css::uno::Sequence< OUString > SAL_CALL NamedPropertyValuesContainer::getSupportedServiceNames( )
{
const OUString aServiceName( "com.sun.star.document.NamedPropertyValues" );
const uno::Sequence< OUString > aSeq( &aServiceName, 1 );
diff --git a/comphelper/source/container/containermultiplexer.cxx b/comphelper/source/container/containermultiplexer.cxx
index e80f550bb02e..ae37e3a311ef 100644
--- a/comphelper/source/container/containermultiplexer.cxx
+++ b/comphelper/source/container/containermultiplexer.cxx
@@ -44,25 +44,21 @@ namespace comphelper
void OContainerListener::_elementInserted( const ContainerEvent& /*_rEvent*/ )
- throw (RuntimeException, std::exception)
{
}
void OContainerListener::_elementRemoved( const ContainerEvent& )
- throw (RuntimeException, std::exception)
{
}
void OContainerListener::_elementReplaced( const ContainerEvent& /*_rEvent*/ )
- throw (RuntimeException, std::exception)
{
}
void OContainerListener::_disposing(const EventObject& )
- throw (RuntimeException, std::exception)
{
}
@@ -119,7 +115,7 @@ namespace comphelper
}
- void SAL_CALL OContainerListenerAdapter::disposing( const EventObject& _rSource) throw(RuntimeException, std::exception)
+ void SAL_CALL OContainerListenerAdapter::disposing( const EventObject& _rSource)
{
if (m_pListener)
{
@@ -135,21 +131,21 @@ namespace comphelper
}
- void SAL_CALL OContainerListenerAdapter::elementInserted( const ContainerEvent& _rEvent ) throw(RuntimeException, std::exception)
+ void SAL_CALL OContainerListenerAdapter::elementInserted( const ContainerEvent& _rEvent )
{
if (m_pListener)
m_pListener->_elementInserted(_rEvent);
}
- void SAL_CALL OContainerListenerAdapter::elementRemoved( const ContainerEvent& _rEvent ) throw(RuntimeException, std::exception)
+ void SAL_CALL OContainerListenerAdapter::elementRemoved( const ContainerEvent& _rEvent )
{
if (m_pListener)
m_pListener->_elementRemoved(_rEvent);
}
- void SAL_CALL OContainerListenerAdapter::elementReplaced( const ContainerEvent& _rEvent ) throw(RuntimeException, std::exception)
+ void SAL_CALL OContainerListenerAdapter::elementReplaced( const ContainerEvent& _rEvent )
{
if (m_pListener)
m_pListener->_elementReplaced(_rEvent);
diff --git a/comphelper/source/container/enumerablemap.cxx b/comphelper/source/container/enumerablemap.cxx
index 1dc23292d1e7..69e89760e531 100644
--- a/comphelper/source/container/enumerablemap.cxx
+++ b/comphelper/source/container/enumerablemap.cxx
@@ -155,31 +155,31 @@ namespace comphelper
virtual ~EnumerableMap() override;
// XInitialization
- virtual void SAL_CALL initialize( const Sequence< Any >& aArguments ) throw (Exception, RuntimeException, std::exception) override;
+ virtual void SAL_CALL initialize( const Sequence< Any >& aArguments ) override;
// XEnumerableMap
- virtual css::uno::Reference< css::container::XEnumeration > SAL_CALL createKeyEnumeration( sal_Bool Isolated ) throw (css::lang::NoSupportException, css::uno::RuntimeException, std::exception) override;
- virtual css::uno::Reference< css::container::XEnumeration > SAL_CALL createValueEnumeration( sal_Bool Isolated ) throw (css::lang::NoSupportException, css::uno::RuntimeException, std::exception) override;
- virtual css::uno::Reference< css::container::XEnumeration > SAL_CALL createElementEnumeration( sal_Bool Isolated ) throw (css::lang::NoSupportException, css::uno::RuntimeException, std::exception) override;
+ virtual css::uno::Reference< css::container::XEnumeration > SAL_CALL createKeyEnumeration( sal_Bool Isolated ) override;
+ virtual css::uno::Reference< css::container::XEnumeration > SAL_CALL createValueEnumeration( sal_Bool Isolated ) override;
+ virtual css::uno::Reference< css::container::XEnumeration > SAL_CALL createElementEnumeration( sal_Bool Isolated ) override;
// XMap
- virtual Type SAL_CALL getKeyType() throw (RuntimeException, std::exception) override;
- virtual Type SAL_CALL getValueType() throw (RuntimeException, std::exception) override;
- virtual void SAL_CALL clear( ) throw (NoSupportException, RuntimeException, std::exception) override;
- virtual sal_Bool SAL_CALL containsKey( const Any& _key ) throw (IllegalTypeException, IllegalArgumentException, RuntimeException, std::exception) override;
- virtual sal_Bool SAL_CALL containsValue( const Any& _value ) throw (IllegalTypeException, IllegalArgumentException, RuntimeException, std::exception) override;
- virtual Any SAL_CALL get( const Any& _key ) throw (IllegalTypeException, IllegalArgumentException, NoSuchElementException, RuntimeException, std::exception) override;
- virtual Any SAL_CALL put( const Any& _key, const Any& _value ) throw (NoSupportException, IllegalTypeException, IllegalArgumentException, RuntimeException, std::exception) override;
- virtual Any SAL_CALL remove( const Any& _key ) throw (NoSupportException, IllegalTypeException, IllegalArgumentException, NoSuchElementException, RuntimeException, std::exception) override;
+ virtual Type SAL_CALL getKeyType() override;
+ virtual Type SAL_CALL getValueType() override;
+ virtual void SAL_CALL clear( ) override;
+ virtual sal_Bool SAL_CALL containsKey( const Any& _key ) override;
+ virtual sal_Bool SAL_CALL containsValue( const Any& _value ) override;
+ virtual Any SAL_CALL get( const Any& _key ) override;
+ virtual Any SAL_CALL put( const Any& _key, const Any& _value ) override;
+ virtual Any SAL_CALL remove( const Any& _key ) override;
// XElementAccess (base of XMap)
- 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;
// XServiceInfo
- virtual OUString SAL_CALL getImplementationName( ) throw (RuntimeException, std::exception) override;
- virtual sal_Bool SAL_CALL supportsService( const OUString& 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( const OUString& ServiceName ) override;
+ virtual Sequence< OUString > SAL_CALL getSupportedServiceNames( ) override;
public:
// XServiceInfo, static version (used for component registration)
@@ -278,8 +278,8 @@ namespace comphelper
}
// XEnumeration
- virtual sal_Bool SAL_CALL hasMoreElements( ) throw (RuntimeException, std::exception) override;
- virtual Any SAL_CALL nextElement( ) throw (NoSuchElementException, WrappedTargetException, RuntimeException, std::exception) override;
+ virtual sal_Bool SAL_CALL hasMoreElements( ) override;
+ virtual Any SAL_CALL nextElement( ) override;
protected:
virtual ~MapEnumeration() override
@@ -317,7 +317,7 @@ namespace comphelper
}
- void SAL_CALL EnumerableMap::initialize( const Sequence< Any >& _arguments ) throw (Exception, RuntimeException, std::exception)
+ void SAL_CALL EnumerableMap::initialize( const Sequence< Any >& _arguments )
{
ComponentMethodGuard aGuard( *this, ComponentMethodGuard::MethodType::WithoutInit );
if ( impl_isInitialized_nothrow() )
@@ -496,42 +496,42 @@ namespace comphelper
}
- Reference< XEnumeration > SAL_CALL EnumerableMap::createKeyEnumeration( sal_Bool Isolated ) throw (NoSupportException, RuntimeException, std::exception)
+ Reference< XEnumeration > SAL_CALL EnumerableMap::createKeyEnumeration( sal_Bool Isolated )
{
ComponentMethodGuard aGuard( *this );
return new MapEnumeration( *this, m_aData, getBroadcastHelper(), eKeys, Isolated );
}
- Reference< XEnumeration > SAL_CALL EnumerableMap::createValueEnumeration( sal_Bool Isolated ) throw (NoSupportException, RuntimeException, std::exception)
+ Reference< XEnumeration > SAL_CALL EnumerableMap::createValueEnumeration( sal_Bool Isolated )
{
ComponentMethodGuard aGuard( *this );
return new MapEnumeration( *this, m_aData, getBroadcastHelper(), eValues, Isolated );
}
- Reference< XEnumeration > SAL_CALL EnumerableMap::createElementEnumeration( sal_Bool Isolated ) throw (NoSupportException, RuntimeException, std::exception)
+ Reference< XEnumeration > SAL_CALL EnumerableMap::createElementEnumeration( sal_Bool Isolated )
{
ComponentMethodGuard aGuard( *this );
return new MapEnumeration( *this, m_aData, getBroadcastHelper(), eBoth, Isolated );
}
- Type SAL_CALL EnumerableMap::getKeyType() throw (RuntimeException, std::exception)
+ Type SAL_CALL EnumerableMap::getKeyType()
{
ComponentMethodGuard aGuard( *this );
return m_aData.m_aKeyType;
}
- Type SAL_CALL EnumerableMap::getValueType() throw (RuntimeException, std::exception)
+ Type SAL_CALL EnumerableMap::getValueType()
{
ComponentMethodGuard aGuard( *this );
return m_aData.m_aValueType;
}
- void SAL_CALL EnumerableMap::clear( ) throw (NoSupportException, RuntimeException, std::exception)
+ void SAL_CALL EnumerableMap::clear( )
{
ComponentMethodGuard aGuard( *this );
impl_checkMutable_throw();
@@ -542,7 +542,7 @@ namespace comphelper
}
- sal_Bool SAL_CALL EnumerableMap::containsKey( const Any& _key ) throw (IllegalTypeException, IllegalArgumentException, RuntimeException, std::exception)
+ sal_Bool SAL_CALL EnumerableMap::containsKey( const Any& _key )
{
ComponentMethodGuard aGuard( *this );
impl_checkKey_throw( _key );
@@ -552,7 +552,7 @@ namespace comphelper
}
- sal_Bool SAL_CALL EnumerableMap::containsValue( const Any& _value ) throw (IllegalTypeException, IllegalArgumentException, RuntimeException, std::exception)
+ sal_Bool SAL_CALL EnumerableMap::containsValue( const Any& _value )
{
ComponentMethodGuard aGuard( *this );
impl_checkValue_throw( _value );
@@ -569,7 +569,7 @@ namespace comphelper
}
- Any SAL_CALL EnumerableMap::get( const Any& _key ) throw (IllegalTypeException, IllegalArgumentException, NoSuchElementException, RuntimeException, std::exception)
+ Any SAL_CALL EnumerableMap::get( const Any& _key )
{
ComponentMethodGuard aGuard( *this );
impl_checkKey_throw( _key );
@@ -582,7 +582,7 @@ namespace comphelper
}
- Any SAL_CALL EnumerableMap::put( const Any& _key, const Any& _value ) throw (NoSupportException, IllegalTypeException, IllegalArgumentException, RuntimeException, std::exception)
+ Any SAL_CALL EnumerableMap::put( const Any& _key, const Any& _value )
{
ComponentMethodGuard aGuard( *this );
impl_checkMutable_throw();
@@ -608,7 +608,7 @@ namespace comphelper
}
- Any SAL_CALL EnumerableMap::remove( const Any& _key ) throw (NoSupportException, IllegalTypeException, IllegalArgumentException, NoSuchElementException, RuntimeException, std::exception)
+ Any SAL_CALL EnumerableMap::remove( const Any& _key )
{
ComponentMethodGuard aGuard( *this );
impl_checkMutable_throw();
@@ -629,31 +629,31 @@ namespace comphelper
}
- Type SAL_CALL EnumerableMap::getElementType() throw (RuntimeException, std::exception)
+ Type SAL_CALL EnumerableMap::getElementType()
{
return ::cppu::UnoType< Pair< Any, Any > >::get();
}
- sal_Bool SAL_CALL EnumerableMap::hasElements() throw (RuntimeException, std::exception)
+ sal_Bool SAL_CALL EnumerableMap::hasElements()
{
ComponentMethodGuard aGuard( *this );
return m_aData.m_pValues->empty();
}
- OUString SAL_CALL EnumerableMap::getImplementationName( ) throw (RuntimeException, std::exception)
+ OUString SAL_CALL EnumerableMap::getImplementationName( )
{
return getImplementationName_static();
}
- sal_Bool SAL_CALL EnumerableMap::supportsService( const OUString& _serviceName ) throw (RuntimeException, std::exception)
+ sal_Bool SAL_CALL EnumerableMap::supportsService( const OUString& _serviceName )
{
return cppu::supportsService(this, _serviceName);
}
- Sequence< OUString > SAL_CALL EnumerableMap::getSupportedServiceNames( ) throw (RuntimeException, std::exception)
+ Sequence< OUString > SAL_CALL EnumerableMap::getSupportedServiceNames( )
{
return getSupportedServiceNames_static();
}
@@ -711,14 +711,14 @@ namespace comphelper
}
- sal_Bool SAL_CALL MapEnumeration::hasMoreElements( ) throw (RuntimeException, std::exception)
+ sal_Bool SAL_CALL MapEnumeration::hasMoreElements( )
{
ComponentMethodGuard aGuard( *this );
return m_aEnumerator.hasMoreElements();
}
- Any SAL_CALL MapEnumeration::nextElement( ) throw (NoSuchElementException, WrappedTargetException, RuntimeException, std::exception)
+ Any SAL_CALL MapEnumeration::nextElement( )
{
ComponentMethodGuard aGuard( *this );
return m_aEnumerator.nextElement();
diff --git a/comphelper/source/container/enumhelper.cxx b/comphelper/source/container/enumhelper.cxx
index d501dd9dadd5..c5e49a6555c8 100644
--- a/comphelper/source/container/enumhelper.cxx
+++ b/comphelper/source/container/enumhelper.cxx
@@ -51,7 +51,7 @@ OEnumerationByName::~OEnumerationByName()
}
-sal_Bool SAL_CALL OEnumerationByName::hasMoreElements( ) throw(css::uno::RuntimeException, std::exception)
+sal_Bool SAL_CALL OEnumerationByName::hasMoreElements( )
{
::osl::ResettableMutexGuard aLock(m_aLock);
@@ -69,7 +69,6 @@ sal_Bool SAL_CALL OEnumerationByName::hasMoreElements( ) throw(css::uno::Runtim
css::uno::Any SAL_CALL OEnumerationByName::nextElement( )
- throw(css::container::NoSuchElementException, css::lang::WrappedTargetException, css::uno::RuntimeException, std::exception)
{
::osl::ResettableMutexGuard aLock(m_aLock);
@@ -91,7 +90,6 @@ css::uno::Any SAL_CALL OEnumerationByName::nextElement( )
void SAL_CALL OEnumerationByName::disposing(const css::lang::EventObject& aEvent)
- throw(css::uno::RuntimeException, std::exception)
{
::osl::ResettableMutexGuard aLock(m_aLock);
@@ -150,7 +148,7 @@ OEnumerationByIndex::~OEnumerationByIndex()
}
-sal_Bool SAL_CALL OEnumerationByIndex::hasMoreElements( ) throw(css::uno::RuntimeException, std::exception)
+sal_Bool SAL_CALL OEnumerationByIndex::hasMoreElements( )
{
::osl::ResettableMutexGuard aLock(m_aLock);
@@ -168,7 +166,6 @@ sal_Bool SAL_CALL OEnumerationByIndex::hasMoreElements( ) throw(css::uno::Runti
css::uno::Any SAL_CALL OEnumerationByIndex::nextElement( )
- throw(css::container::NoSuchElementException, css::lang::WrappedTargetException, css::uno::RuntimeException, std::exception)
{
::osl::ResettableMutexGuard aLock(m_aLock);
@@ -190,7 +187,6 @@ css::uno::Any SAL_CALL OEnumerationByIndex::nextElement( )
void SAL_CALL OEnumerationByIndex::disposing(const css::lang::EventObject& aEvent)
- throw(css::uno::RuntimeException, std::exception)
{
::osl::ResettableMutexGuard aLock(m_aLock);
@@ -246,7 +242,7 @@ OAnyEnumeration::~OAnyEnumeration()
}
-sal_Bool SAL_CALL OAnyEnumeration::hasMoreElements( ) throw(css::uno::RuntimeException, std::exception)
+sal_Bool SAL_CALL OAnyEnumeration::hasMoreElements( )
{
::osl::ResettableMutexGuard aLock(m_aLock);
@@ -255,7 +251,6 @@ sal_Bool SAL_CALL OAnyEnumeration::hasMoreElements( ) throw(css::uno::RuntimeEx
css::uno::Any SAL_CALL OAnyEnumeration::nextElement( )
- throw(css::container::NoSuchElementException, css::lang::WrappedTargetException, css::uno::RuntimeException, std::exception)
{
if ( ! hasMoreElements())
throw css::container::NoSuchElementException();
diff --git a/comphelper/source/container/namecontainer.cxx b/comphelper/source/container/namecontainer.cxx
index 0332cd29f90c..ed10fbb72076 100644
--- a/comphelper/source/container/namecontainer.cxx
+++ b/comphelper/source/container/namecontainer.cxx
@@ -38,32 +38,20 @@ namespace comphelper
explicit NameContainer( css::uno::Type aType );
// XNameContainer
- virtual void SAL_CALL insertByName( const OUString& aName, const css::uno::Any& aElement )
- throw(css::lang::IllegalArgumentException, css::container::ElementExistException,
- css::lang::WrappedTargetException, css::uno::RuntimeException, std::exception) override;
- virtual void SAL_CALL removeByName( const OUString& Name )
- throw(css::container::NoSuchElementException, css::lang::WrappedTargetException,
- css::uno::RuntimeException, std::exception) override;
+ virtual void SAL_CALL insertByName( const OUString& aName, const css::uno::Any& aElement ) override;
+ virtual void SAL_CALL removeByName( const OUString& Name ) override;
// XNameReplace
- virtual void SAL_CALL replaceByName( const OUString& aName, const css::uno::Any& aElement )
- throw(css::lang::IllegalArgumentException, css::container::NoSuchElementException,
- css::lang::WrappedTargetException, css::uno::RuntimeException, std::exception) override;
+ virtual void SAL_CALL replaceByName( const OUString& aName, const css::uno::Any& aElement ) override;
// XNameAccess
- virtual css::uno::Any SAL_CALL getByName( const OUString& aName )
- throw(css::container::NoSuchElementException, css::lang::WrappedTargetException,
- css::uno::RuntimeException, std::exception) override;
- virtual css::uno::Sequence< OUString > SAL_CALL getElementNames( )
- throw(css::uno::RuntimeException, std::exception) override;
- virtual sal_Bool SAL_CALL hasByName( const OUString& aName )
- throw(css::uno::RuntimeException, std::exception) override;
+ virtual css::uno::Any SAL_CALL getByName( const OUString& aName ) override;
+ virtual css::uno::Sequence< OUString > SAL_CALL getElementNames( ) override;
+ virtual sal_Bool SAL_CALL hasByName( const OUString& aName ) override;
// XElementAccess
- virtual sal_Bool SAL_CALL hasElements( )
- throw(css::uno::RuntimeException, std::exception) override;
- virtual css::uno::Type SAL_CALL getElementType( )
- throw(css::uno::RuntimeException, std::exception) override;
+ virtual sal_Bool SAL_CALL hasElements( ) override;
+ virtual css::uno::Type SAL_CALL getElementType( ) override;
private:
SvGenericNameContainerMapImpl maProperties;
@@ -86,8 +74,6 @@ NameContainer::NameContainer( css::uno::Type aType )
// XNameContainer
void SAL_CALL NameContainer::insertByName( const OUString& aName, const Any& aElement )
- throw(IllegalArgumentException, ElementExistException,
- WrappedTargetException, RuntimeException, std::exception)
{
MutexGuard aGuard( maMutex );
@@ -101,8 +87,6 @@ void SAL_CALL NameContainer::insertByName( const OUString& aName, const Any& aEl
}
void SAL_CALL NameContainer::removeByName( const OUString& Name )
- throw(NoSuchElementException, WrappedTargetException,
- RuntimeException, std::exception)
{
MutexGuard aGuard( maMutex );
@@ -116,8 +100,6 @@ void SAL_CALL NameContainer::removeByName( const OUString& Name )
// XNameReplace
void SAL_CALL NameContainer::replaceByName( const OUString& aName, const Any& aElement )
- throw(IllegalArgumentException, NoSuchElementException,
- WrappedTargetException, RuntimeException, std::exception)
{
MutexGuard aGuard( maMutex );
@@ -134,8 +116,6 @@ void SAL_CALL NameContainer::replaceByName( const OUString& aName, const Any& aE
// XNameAccess
Any SAL_CALL NameContainer::getByName( const OUString& aName )
- throw(NoSuchElementException, WrappedTargetException,
- RuntimeException, std::exception)
{
MutexGuard aGuard( maMutex );
@@ -147,7 +127,6 @@ Any SAL_CALL NameContainer::getByName( const OUString& aName )
}
Sequence< OUString > SAL_CALL NameContainer::getElementNames( )
- throw(RuntimeException, std::exception)
{
MutexGuard aGuard( maMutex );
@@ -155,7 +134,6 @@ Sequence< OUString > SAL_CALL NameContainer::getElementNames( )
}
sal_Bool SAL_CALL NameContainer::hasByName( const OUString& aName )
- throw(RuntimeException, std::exception)
{
MutexGuard aGuard( maMutex );
@@ -164,7 +142,6 @@ sal_Bool SAL_CALL NameContainer::hasByName( const OUString& aName )
}
sal_Bool SAL_CALL NameContainer::hasElements( )
- throw(RuntimeException, std::exception)
{
MutexGuard aGuard( maMutex );
@@ -172,7 +149,6 @@ sal_Bool SAL_CALL NameContainer::hasElements( )
}
Type SAL_CALL NameContainer::getElementType()
- throw( RuntimeException, std::exception )
{
return maType;
}