summaryrefslogtreecommitdiff
path: root/framework/source/fwe
diff options
context:
space:
mode:
authorStephan Bergmann <sbergman@redhat.com>2017-01-26 12:28:58 +0100
committerStephan Bergmann <sbergman@redhat.com>2017-01-26 12:54:43 +0000
commite57ca02849c3d87142ff5ff9099a212e72b8139c (patch)
treebcce66b27261553c308779f3e8663a269ed3a671 /framework/source/fwe
parent8802ebd5172ec4bc412a59d136c82b77ab452281 (diff)
Remove dynamic exception specifications
...(for now, from LIBO_INTERNAL_CODE only). See the mail thread starting at <https://lists.freedesktop.org/archives/libreoffice/2017-January/076665.html> "Dynamic Exception Specifications" for details. Most changes have been done automatically by the rewriting loplugin:dynexcspec (after enabling the rewriting mode, to be committed shortly). The way it only removes exception specs from declarations if it also sees a definition, it identified some dead declarations-w/o-definitions (that have been removed manually) and some cases where a definition appeared in multiple include files (which have also been cleaned up manually). There's also been cases of macro paramters (that were used to abstract over exception specs) that have become unused now (and been removed). Furthermore, some code needed to be cleaned up manually (avmedia/source/quicktime/ and connectivity/source/drivers/kab/), as I had no configurations available that would actually build that code. Missing @throws documentation has not been applied in such manual clean-up. Change-Id: I3408691256c9b0c12bc5332de976743626e13960 Reviewed-on: https://gerrit.libreoffice.org/33574 Tested-by: Jenkins <ci@libreoffice.org> Reviewed-by: Stephan Bergmann <sbergman@redhat.com>
Diffstat (limited to 'framework/source/fwe')
-rw-r--r--framework/source/fwe/classes/actiontriggercontainer.cxx11
-rw-r--r--framework/source/fwe/classes/actiontriggerpropertyset.cxx14
-rw-r--r--framework/source/fwe/classes/actiontriggerseparatorpropertyset.cxx12
-rw-r--r--framework/source/fwe/classes/imagewrapper.cxx8
-rw-r--r--framework/source/fwe/classes/rootactiontriggercontainer.cxx24
-rw-r--r--framework/source/fwe/dispatch/interaction.cxx24
-rw-r--r--framework/source/fwe/helper/actiontriggerhelper.cxx6
-rw-r--r--framework/source/fwe/helper/documentundoguard.cxx48
-rw-r--r--framework/source/fwe/helper/propertysetcontainer.cxx7
-rw-r--r--framework/source/fwe/helper/titlehelper.cxx8
-rw-r--r--framework/source/fwe/interaction/preventduplicateinteraction.cxx3
-rw-r--r--framework/source/fwe/xml/menuconfiguration.cxx2
-rw-r--r--framework/source/fwe/xml/menudocumenthandler.cxx25
-rw-r--r--framework/source/fwe/xml/saxnamespacefilter.cxx8
-rw-r--r--framework/source/fwe/xml/statusbardocumenthandler.cxx12
-rw-r--r--framework/source/fwe/xml/toolboxdocumenthandler.cxx21
-rw-r--r--framework/source/fwe/xml/xmlnamespaces.cxx8
17 files changed, 62 insertions, 179 deletions
diff --git a/framework/source/fwe/classes/actiontriggercontainer.cxx b/framework/source/fwe/classes/actiontriggercontainer.cxx
index 8144dfec7d7a..71a6d4532047 100644
--- a/framework/source/fwe/classes/actiontriggercontainer.cxx
+++ b/framework/source/fwe/classes/actiontriggercontainer.cxx
@@ -43,7 +43,6 @@ ActionTriggerContainer::~ActionTriggerContainer()
// XInterface
Any SAL_CALL ActionTriggerContainer::queryInterface( const Type& aType )
-throw ( RuntimeException, std::exception )
{
Any a = ::cppu::queryInterface(
aType ,
@@ -71,7 +70,6 @@ void ActionTriggerContainer::release() throw()
// XMultiServiceFactory
Reference< XInterface > SAL_CALL ActionTriggerContainer::createInstance( const OUString& aServiceSpecifier )
-throw ( css::uno::Exception, RuntimeException, std::exception)
{
if ( aServiceSpecifier == SERVICENAME_ACTIONTRIGGER )
return static_cast<OWeakObject *>( new ActionTriggerPropertySet());
@@ -84,13 +82,11 @@ throw ( css::uno::Exception, RuntimeException, std::exception)
}
Reference< XInterface > SAL_CALL ActionTriggerContainer::createInstanceWithArguments( const OUString& ServiceSpecifier, const Sequence< Any >& /*Arguments*/ )
-throw ( Exception, RuntimeException, std::exception)
{
return createInstance( ServiceSpecifier );
}
Sequence< OUString > SAL_CALL ActionTriggerContainer::getAvailableServiceNames()
-throw ( RuntimeException, std::exception )
{
Sequence< OUString > aSeq( 3 );
@@ -103,26 +99,23 @@ throw ( RuntimeException, std::exception )
// XServiceInfo
OUString SAL_CALL ActionTriggerContainer::getImplementationName()
-throw ( RuntimeException, std::exception )
{
return OUString( IMPLEMENTATIONNAME_ACTIONTRIGGERCONTAINER );
}
sal_Bool SAL_CALL ActionTriggerContainer::supportsService( const OUString& ServiceName )
-throw ( RuntimeException, std::exception )
{
return cppu::supportsService(this, ServiceName);
}
Sequence< OUString > SAL_CALL ActionTriggerContainer::getSupportedServiceNames()
-throw ( RuntimeException, std::exception )
{
Sequence< OUString > seqServiceNames { SERVICENAME_ACTIONTRIGGERCONTAINER };
return seqServiceNames;
}
// XTypeProvider
-Sequence< Type > SAL_CALL ActionTriggerContainer::getTypes() throw ( RuntimeException, std::exception )
+Sequence< Type > SAL_CALL ActionTriggerContainer::getTypes()
{
// Optimize this method !
// We initialize a static variable only one time. And we don't must use a mutex at every call!
@@ -152,7 +145,7 @@ Sequence< Type > SAL_CALL ActionTriggerContainer::getTypes() throw ( RuntimeExce
return pTypeCollection->getTypes();
}
-Sequence< sal_Int8 > SAL_CALL ActionTriggerContainer::getImplementationId() throw ( RuntimeException, std::exception )
+Sequence< sal_Int8 > SAL_CALL ActionTriggerContainer::getImplementationId()
{
return css::uno::Sequence<sal_Int8>();
}
diff --git a/framework/source/fwe/classes/actiontriggerpropertyset.cxx b/framework/source/fwe/classes/actiontriggerpropertyset.cxx
index 158429eef129..738a5ac5b1df 100644
--- a/framework/source/fwe/classes/actiontriggerpropertyset.cxx
+++ b/framework/source/fwe/classes/actiontriggerpropertyset.cxx
@@ -66,7 +66,6 @@ ActionTriggerPropertySet::~ActionTriggerPropertySet()
// XInterface
Any SAL_CALL ActionTriggerPropertySet::queryInterface( const Type& aType )
-throw ( RuntimeException, std::exception )
{
Any a = ::cppu::queryInterface(
aType,
@@ -98,26 +97,23 @@ void SAL_CALL ActionTriggerPropertySet::release() throw ()
// XServiceInfo
OUString SAL_CALL ActionTriggerPropertySet::getImplementationName()
-throw ( RuntimeException, std::exception )
{
return OUString( IMPLEMENTATIONNAME_ACTIONTRIGGER );
}
sal_Bool SAL_CALL ActionTriggerPropertySet::supportsService( const OUString& ServiceName )
-throw ( RuntimeException, std::exception )
{
return cppu::supportsService(this, ServiceName);
}
Sequence< OUString > SAL_CALL ActionTriggerPropertySet::getSupportedServiceNames()
-throw ( RuntimeException, std::exception )
{
Sequence<OUString> seqServiceNames { SERVICENAME_ACTIONTRIGGER };
return seqServiceNames;
}
// XTypeProvider
-Sequence< Type > SAL_CALL ActionTriggerPropertySet::getTypes() throw ( RuntimeException, std::exception )
+Sequence< Type > SAL_CALL ActionTriggerPropertySet::getTypes()
{
// Optimize this method !
// We initialize a static variable only one time. And we don't must use a mutex at every call!
@@ -148,7 +144,7 @@ Sequence< Type > SAL_CALL ActionTriggerPropertySet::getTypes() throw ( RuntimeEx
return pTypeCollection->getTypes();
}
-Sequence< sal_Int8 > SAL_CALL ActionTriggerPropertySet::getImplementationId() throw ( RuntimeException, std::exception )
+Sequence< sal_Int8 > SAL_CALL ActionTriggerPropertySet::getImplementationId()
{
return css::uno::Sequence<sal_Int8>();
}
@@ -158,7 +154,6 @@ sal_Bool SAL_CALL ActionTriggerPropertySet::convertFastPropertyValue(
Any& aOldValue,
sal_Int32 nHandle,
const Any& aValue )
-throw( IllegalArgumentException )
{
// Check, if value of property will changed in method "setFastPropertyValue_NoBroadcast()".
// Return sal_True, if changed - else return sal_False.
@@ -196,7 +191,6 @@ throw( IllegalArgumentException )
void SAL_CALL ActionTriggerPropertySet::setFastPropertyValue_NoBroadcast(
sal_Int32 nHandle, const Any& aValue )
-throw( Exception, std::exception )
{
SolarMutexGuard aGuard;
@@ -280,7 +274,6 @@ void SAL_CALL ActionTriggerPropertySet::getFastPropertyValue(
}
Reference< XPropertySetInfo > SAL_CALL ActionTriggerPropertySet::getPropertySetInfo()
-throw ( RuntimeException, std::exception )
{
// Optimize this method !
// We initialize a static variable only one time. And we don't must use a mutex at every call!
@@ -326,7 +319,6 @@ bool ActionTriggerPropertySet::impl_tryToChangeProperty(
const Any& aNewValue ,
Any& aOldValue ,
Any& aConvertedValue )
-throw( IllegalArgumentException )
{
// Set default return value if method failed.
bool bReturn = false;
@@ -361,7 +353,6 @@ bool ActionTriggerPropertySet::impl_tryToChangeProperty(
const Any& aNewValue ,
Any& aOldValue ,
Any& aConvertedValue )
-throw( IllegalArgumentException )
{
// Set default return value if method failed.
bool bReturn = false;
@@ -396,7 +387,6 @@ bool ActionTriggerPropertySet::impl_tryToChangeProperty(
const Any& aNewValue ,
Any& aOldValue ,
Any& aConvertedValue )
-throw( IllegalArgumentException )
{
// Set default return value if method failed.
bool bReturn = false;
diff --git a/framework/source/fwe/classes/actiontriggerseparatorpropertyset.cxx b/framework/source/fwe/classes/actiontriggerseparatorpropertyset.cxx
index 53b3e0e559c8..7752d6caa9f6 100644
--- a/framework/source/fwe/classes/actiontriggerseparatorpropertyset.cxx
+++ b/framework/source/fwe/classes/actiontriggerseparatorpropertyset.cxx
@@ -59,7 +59,6 @@ ActionTriggerSeparatorPropertySet::~ActionTriggerSeparatorPropertySet()
// XInterface
Any SAL_CALL ActionTriggerSeparatorPropertySet::queryInterface( const Type& aType )
-throw ( RuntimeException, std::exception )
{
Any a = ::cppu::queryInterface(
aType,
@@ -91,26 +90,23 @@ void ActionTriggerSeparatorPropertySet::release() throw()
// XServiceInfo
OUString SAL_CALL ActionTriggerSeparatorPropertySet::getImplementationName()
-throw ( RuntimeException, std::exception )
{
return OUString( IMPLEMENTATIONNAME_ACTIONTRIGGERSEPARATOR );
}
sal_Bool SAL_CALL ActionTriggerSeparatorPropertySet::supportsService( const OUString& ServiceName )
-throw ( RuntimeException, std::exception )
{
return cppu::supportsService(this, ServiceName);
}
Sequence< OUString > SAL_CALL ActionTriggerSeparatorPropertySet::getSupportedServiceNames()
-throw ( RuntimeException, std::exception )
{
Sequence<OUString> seqServiceNames { SERVICENAME_ACTIONTRIGGERSEPARATOR };
return seqServiceNames;
}
// XTypeProvider
-Sequence< Type > SAL_CALL ActionTriggerSeparatorPropertySet::getTypes() throw ( RuntimeException, std::exception )
+Sequence< Type > SAL_CALL ActionTriggerSeparatorPropertySet::getTypes()
{
// Optimize this method !
// We initialize a static variable only one time. And we don't must use a mutex at every call!
@@ -141,7 +137,7 @@ Sequence< Type > SAL_CALL ActionTriggerSeparatorPropertySet::getTypes() throw (
return pTypeCollection->getTypes();
}
-Sequence< sal_Int8 > SAL_CALL ActionTriggerSeparatorPropertySet::getImplementationId() throw ( RuntimeException, std::exception )
+Sequence< sal_Int8 > SAL_CALL ActionTriggerSeparatorPropertySet::getImplementationId()
{
return css::uno::Sequence<sal_Int8>();
}
@@ -151,7 +147,6 @@ sal_Bool SAL_CALL ActionTriggerSeparatorPropertySet::convertFastPropertyValue(
Any& aOldValue,
sal_Int32 nHandle,
const Any& aValue )
- throw( IllegalArgumentException, RuntimeException, std::exception )
{
// Check, if value of property will changed in method "setFastPropertyValue_NoBroadcast()".
// Return sal_True, if changed - else return sal_False.
@@ -173,7 +168,6 @@ sal_Bool SAL_CALL ActionTriggerSeparatorPropertySet::convertFastPropertyValue(
void SAL_CALL ActionTriggerSeparatorPropertySet::setFastPropertyValue_NoBroadcast(
sal_Int32 nHandle, const Any& aValue )
-throw( Exception, std::exception )
{
SolarMutexGuard aGuard;
@@ -225,7 +219,6 @@ void SAL_CALL ActionTriggerSeparatorPropertySet::getFastPropertyValue(
}
Reference< XPropertySetInfo > SAL_CALL ActionTriggerSeparatorPropertySet::getPropertySetInfo()
-throw ( RuntimeException, std::exception )
{
// Optimize this method !
// We initialize a static variable only one time. And we don't must use a mutex at every call!
@@ -267,7 +260,6 @@ bool ActionTriggerSeparatorPropertySet::impl_tryToChangeProperty(
const Any& aNewValue ,
Any& aOldValue ,
Any& aConvertedValue )
-throw( IllegalArgumentException, RuntimeException, std::exception )
{
// Set default return value if method failed.
bool bReturn = false;
diff --git a/framework/source/fwe/classes/imagewrapper.cxx b/framework/source/fwe/classes/imagewrapper.cxx
index 98897e39149a..f475dd2bf7bb 100644
--- a/framework/source/fwe/classes/imagewrapper.cxx
+++ b/framework/source/fwe/classes/imagewrapper.cxx
@@ -53,7 +53,7 @@ Sequence< sal_Int8 > ImageWrapper::GetUnoTunnelId()
}
// XBitmap
-css::awt::Size SAL_CALL ImageWrapper::getSize() throw ( RuntimeException, std::exception )
+css::awt::Size SAL_CALL ImageWrapper::getSize()
{
SolarMutexGuard aGuard;
@@ -63,7 +63,7 @@ css::awt::Size SAL_CALL ImageWrapper::getSize() throw ( RuntimeException, std::e
return css::awt::Size( aBitmapSize.Width(), aBitmapSize.Height() );
}
-Sequence< sal_Int8 > SAL_CALL ImageWrapper::getDIB() throw ( RuntimeException, std::exception )
+Sequence< sal_Int8 > SAL_CALL ImageWrapper::getDIB()
{
SolarMutexGuard aGuard;
@@ -72,7 +72,7 @@ Sequence< sal_Int8 > SAL_CALL ImageWrapper::getDIB() throw ( RuntimeException, s
return Sequence< sal_Int8 >( static_cast<sal_Int8 const *>(aMem.GetData()), aMem.Tell() );
}
-Sequence< sal_Int8 > SAL_CALL ImageWrapper::getMaskDIB() throw ( RuntimeException, std::exception )
+Sequence< sal_Int8 > SAL_CALL ImageWrapper::getMaskDIB()
{
SolarMutexGuard aGuard;
BitmapEx aBmpEx( m_aImage.GetBitmapEx() );
@@ -94,7 +94,7 @@ Sequence< sal_Int8 > SAL_CALL ImageWrapper::getMaskDIB() throw ( RuntimeExceptio
}
// XUnoTunnel
-sal_Int64 SAL_CALL ImageWrapper::getSomething( const Sequence< sal_Int8 >& aIdentifier ) throw ( RuntimeException, std::exception )
+sal_Int64 SAL_CALL ImageWrapper::getSomething( const Sequence< sal_Int8 >& aIdentifier )
{
if ( aIdentifier == impl_getStaticIdentifier() )
return reinterpret_cast< sal_Int64 >( this );
diff --git a/framework/source/fwe/classes/rootactiontriggercontainer.cxx b/framework/source/fwe/classes/rootactiontriggercontainer.cxx
index 7c4312470c8b..c1306b33dfd5 100644
--- a/framework/source/fwe/classes/rootactiontriggercontainer.cxx
+++ b/framework/source/fwe/classes/rootactiontriggercontainer.cxx
@@ -60,7 +60,6 @@ RootActionTriggerContainer::~RootActionTriggerContainer()
// XInterface
Any SAL_CALL RootActionTriggerContainer::queryInterface( const Type& aType )
-throw ( RuntimeException, std::exception )
{
Any a = ::cppu::queryInterface(
aType ,
@@ -90,7 +89,6 @@ void SAL_CALL RootActionTriggerContainer::release() throw ()
// XMultiServiceFactory
Reference< XInterface > SAL_CALL RootActionTriggerContainer::createInstance( const OUString& aServiceSpecifier )
-throw ( Exception, RuntimeException, std::exception )
{
if ( aServiceSpecifier == SERVICENAME_ACTIONTRIGGER )
return static_cast<OWeakObject *>( new ActionTriggerPropertySet());
@@ -103,13 +101,11 @@ throw ( Exception, RuntimeException, std::exception )
}
Reference< XInterface > SAL_CALL RootActionTriggerContainer::createInstanceWithArguments( const OUString& ServiceSpecifier, const Sequence< Any >& /*Arguments*/ )
-throw ( Exception, RuntimeException, std::exception )
{
return createInstance( ServiceSpecifier );
}
Sequence< OUString > SAL_CALL RootActionTriggerContainer::getAvailableServiceNames()
-throw ( RuntimeException, std::exception )
{
Sequence< OUString > aSeq( 3 );
@@ -122,7 +118,6 @@ throw ( RuntimeException, std::exception )
// XIndexContainer
void SAL_CALL RootActionTriggerContainer::insertByIndex( sal_Int32 Index, const Any& Element )
-throw ( IllegalArgumentException, IndexOutOfBoundsException, WrappedTargetException, RuntimeException, std::exception )
{
SolarMutexGuard g;
@@ -135,7 +130,6 @@ throw ( IllegalArgumentException, IndexOutOfBoundsException, WrappedTargetExcept
}
void SAL_CALL RootActionTriggerContainer::removeByIndex( sal_Int32 Index )
-throw ( IndexOutOfBoundsException, WrappedTargetException, RuntimeException, std::exception )
{
SolarMutexGuard g;
@@ -149,7 +143,6 @@ throw ( IndexOutOfBoundsException, WrappedTargetException, RuntimeException, std
// XIndexReplace
void SAL_CALL RootActionTriggerContainer::replaceByIndex( sal_Int32 Index, const Any& Element )
-throw ( IllegalArgumentException, IndexOutOfBoundsException, WrappedTargetException, RuntimeException, std::exception )
{
SolarMutexGuard g;
@@ -163,7 +156,6 @@ throw ( IllegalArgumentException, IndexOutOfBoundsException, WrappedTargetExcept
// XIndexAccess
sal_Int32 SAL_CALL RootActionTriggerContainer::getCount()
-throw ( RuntimeException, std::exception )
{
SolarMutexGuard g;
@@ -184,7 +176,6 @@ throw ( RuntimeException, std::exception )
}
Any SAL_CALL RootActionTriggerContainer::getByIndex( sal_Int32 Index )
-throw ( IndexOutOfBoundsException, WrappedTargetException, RuntimeException, std::exception )
{
SolarMutexGuard g;
@@ -196,13 +187,11 @@ throw ( IndexOutOfBoundsException, WrappedTargetException, RuntimeException, std
// XElementAccess
Type SAL_CALL RootActionTriggerContainer::getElementType()
- throw (css::uno::RuntimeException, std::exception)
{
return cppu::UnoType<XPropertySet>::get();
}
sal_Bool SAL_CALL RootActionTriggerContainer::hasElements()
-throw (css::uno::RuntimeException, std::exception)
{
if ( m_pMenu )
{
@@ -215,26 +204,23 @@ throw (css::uno::RuntimeException, std::exception)
// XServiceInfo
OUString SAL_CALL RootActionTriggerContainer::getImplementationName()
-throw ( RuntimeException, std::exception )
{
return OUString( IMPLEMENTATIONNAME_ROOTACTIONTRIGGERCONTAINER );
}
sal_Bool SAL_CALL RootActionTriggerContainer::supportsService( const OUString& ServiceName )
-throw ( RuntimeException, std::exception )
{
return cppu::supportsService(this, ServiceName);
}
Sequence< OUString > SAL_CALL RootActionTriggerContainer::getSupportedServiceNames()
-throw ( RuntimeException, std::exception )
{
Sequence< OUString > seqServiceNames { SERVICENAME_ACTIONTRIGGERCONTAINER };
return seqServiceNames;
}
// XUnoTunnel
-sal_Int64 SAL_CALL RootActionTriggerContainer::getSomething( const Sequence< sal_Int8 >& aIdentifier ) throw ( RuntimeException, std::exception )
+sal_Int64 SAL_CALL RootActionTriggerContainer::getSomething( const Sequence< sal_Int8 >& aIdentifier )
{
if ( aIdentifier == impl_getStaticIdentifier() )
return reinterpret_cast< sal_Int64 >( this );
@@ -243,7 +229,7 @@ sal_Int64 SAL_CALL RootActionTriggerContainer::getSomething( const Sequence< sal
}
// XTypeProvider
-Sequence< Type > SAL_CALL RootActionTriggerContainer::getTypes() throw ( RuntimeException, std::exception )
+Sequence< Type > SAL_CALL RootActionTriggerContainer::getTypes()
{
// Optimize this method !
// We initialize a static variable only one time. And we don't must use a mutex at every call!
@@ -275,7 +261,7 @@ Sequence< Type > SAL_CALL RootActionTriggerContainer::getTypes() throw ( Runtime
return pTypeCollection->getTypes();
}
-Sequence< sal_Int8 > SAL_CALL RootActionTriggerContainer::getImplementationId() throw ( RuntimeException, std::exception )
+Sequence< sal_Int8 > SAL_CALL RootActionTriggerContainer::getImplementationId()
{
return css::uno::Sequence<sal_Int8>();
}
@@ -291,7 +277,7 @@ void RootActionTriggerContainer::FillContainer()
m_pMenu );
m_bInContainerCreation = false;
}
-OUString RootActionTriggerContainer::getName() throw ( RuntimeException, std::exception )
+OUString RootActionTriggerContainer::getName()
{
OUString sRet;
if( m_pMenuIdentifier )
@@ -299,7 +285,7 @@ OUString RootActionTriggerContainer::getName() throw ( RuntimeException, std::ex
return sRet;
}
-void RootActionTriggerContainer::setName( const OUString& ) throw ( RuntimeException, std::exception)
+void RootActionTriggerContainer::setName( const OUString& )
{
throw RuntimeException();
}
diff --git a/framework/source/fwe/dispatch/interaction.cxx b/framework/source/fwe/dispatch/interaction.cxx
index a4a7fc2e2b0d..a9025aaef71b 100644
--- a/framework/source/fwe/dispatch/interaction.cxx
+++ b/framework/source/fwe/dispatch/interaction.cxx
@@ -53,8 +53,8 @@ class ContinuationFilterSelect : public comphelper::OInteraction< css::document:
// uno interface
public:
- virtual void SAL_CALL setFilter( const OUString& sFilter ) throw( css::uno::RuntimeException, std::exception ) override;
- virtual OUString SAL_CALL getFilter( ) throw( css::uno::RuntimeException, std::exception ) override;
+ virtual void SAL_CALL setFilter( const OUString& sFilter ) override;
+ virtual OUString SAL_CALL getFilter( ) override;
// member
private:
@@ -71,14 +71,14 @@ ContinuationFilterSelect::ContinuationFilterSelect()
// handler should use it after selection to set user specified filter for transport
-void SAL_CALL ContinuationFilterSelect::setFilter( const OUString& sFilter ) throw( css::uno::RuntimeException, std::exception )
+void SAL_CALL ContinuationFilterSelect::setFilter( const OUString& sFilter )
{
m_sFilter = sFilter;
}
// read access to transported filter
-OUString SAL_CALL ContinuationFilterSelect::getFilter() throw( css::uno::RuntimeException, std::exception )
+OUString SAL_CALL ContinuationFilterSelect::getFilter()
{
return m_sFilter;
}
@@ -91,8 +91,8 @@ public:
OUString getFilter() const;
public:
- virtual css::uno::Any SAL_CALL getRequest() throw( css::uno::RuntimeException, std::exception ) override;
- virtual css::uno::Sequence< css::uno::Reference< css::task::XInteractionContinuation > > SAL_CALL getContinuations() throw( css::uno::RuntimeException, std::exception ) override;
+ virtual css::uno::Any SAL_CALL getRequest() override;
+ virtual css::uno::Sequence< css::uno::Reference< css::task::XInteractionContinuation > > SAL_CALL getContinuations() override;
private:
css::uno::Any m_aRequest;
@@ -135,7 +135,7 @@ OUString RequestFilterSelect_Impl::getFilter() const
// handler call it to get type of request
// Is hard coded to "please select filter" here. see ctor for further information.
-css::uno::Any SAL_CALL RequestFilterSelect_Impl::getRequest() throw( css::uno::RuntimeException, std::exception )
+css::uno::Any SAL_CALL RequestFilterSelect_Impl::getRequest()
{
return m_aRequest;
}
@@ -145,7 +145,7 @@ css::uno::Any SAL_CALL RequestFilterSelect_Impl::getRequest() throw( css::uno::R
// After interaction we support read access on these continuations on our c++ interface to
// return user decision.
-css::uno::Sequence< css::uno::Reference< css::task::XInteractionContinuation > > SAL_CALL RequestFilterSelect_Impl::getContinuations() throw( css::uno::RuntimeException, std::exception )
+css::uno::Sequence< css::uno::Reference< css::task::XInteractionContinuation > > SAL_CALL RequestFilterSelect_Impl::getContinuations()
{
return { m_xAbort.get(), m_xFilter.get() };
}
@@ -193,18 +193,16 @@ public:
m_lContinuations = lContinuations;
}
- virtual uno::Any SAL_CALL getRequest() throw( uno::RuntimeException, std::exception ) override;
- virtual uno::Sequence< uno::Reference< task::XInteractionContinuation > > SAL_CALL getContinuations()
- throw( uno::RuntimeException, std::exception ) override;
+ virtual uno::Any SAL_CALL getRequest() override;
+ virtual uno::Sequence< uno::Reference< task::XInteractionContinuation > > SAL_CALL getContinuations() override;
};
-uno::Any SAL_CALL InteractionRequest_Impl::getRequest() throw( uno::RuntimeException, std::exception )
+uno::Any SAL_CALL InteractionRequest_Impl::getRequest()
{
return m_aRequest;
}
uno::Sequence< uno::Reference< task::XInteractionContinuation > > SAL_CALL InteractionRequest_Impl::getContinuations()
- throw( uno::RuntimeException, std::exception )
{
return m_lContinuations;
}
diff --git a/framework/source/fwe/helper/actiontriggerhelper.cxx b/framework/source/fwe/helper/actiontriggerhelper.cxx
index 7fd256c133ee..ddf7c1d32a41 100644
--- a/framework/source/fwe/helper/actiontriggerhelper.cxx
+++ b/framework/source/fwe/helper/actiontriggerhelper.cxx
@@ -237,7 +237,7 @@ void InsertSubMenuItems( Menu* pSubMenu, sal_uInt16& nItemId, const Reference< X
// implementation helper ( ActionTrigger => menu )
/// @throws RuntimeException
-Reference< XPropertySet > CreateActionTrigger( sal_uInt16 nItemId, const Menu* pMenu, const Reference< XIndexContainer >& rActionTriggerContainer ) throw ( RuntimeException )
+Reference< XPropertySet > CreateActionTrigger( sal_uInt16 nItemId, const Menu* pMenu, const Reference< XIndexContainer >& rActionTriggerContainer )
{
Reference< XPropertySet > xPropSet;
@@ -284,7 +284,7 @@ Reference< XPropertySet > CreateActionTrigger( sal_uInt16 nItemId, const Menu* p
}
/// @throws RuntimeException
-Reference< XPropertySet > CreateActionTriggerSeparator( const Reference< XIndexContainer >& rActionTriggerContainer ) throw ( RuntimeException )
+Reference< XPropertySet > CreateActionTriggerSeparator( const Reference< XIndexContainer >& rActionTriggerContainer )
{
Reference< XMultiServiceFactory > xMultiServiceFactory( rActionTriggerContainer, UNO_QUERY );
if ( xMultiServiceFactory.is() )
@@ -298,7 +298,7 @@ Reference< XPropertySet > CreateActionTriggerSeparator( const Reference< XIndexC
}
/// @throws RuntimeException
-Reference< XIndexContainer > CreateActionTriggerContainer( const Reference< XIndexContainer >& rActionTriggerContainer ) throw ( RuntimeException )
+Reference< XIndexContainer > CreateActionTriggerContainer( const Reference< XIndexContainer >& rActionTriggerContainer )
{
Reference< XMultiServiceFactory > xMultiServiceFactory( rActionTriggerContainer, UNO_QUERY );
if ( xMultiServiceFactory.is() )
diff --git a/framework/source/fwe/helper/documentundoguard.cxx b/framework/source/fwe/helper/documentundoguard.cxx
index 94e9b3fb14ba..b51b3e283f58 100644
--- a/framework/source/fwe/helper/documentundoguard.cxx
+++ b/framework/source/fwe/helper/documentundoguard.cxx
@@ -77,20 +77,20 @@ namespace framework
}
// XUndoManagerListener
- virtual void SAL_CALL undoActionAdded( const UndoManagerEvent& i_event ) throw (RuntimeException, std::exception) override;
- virtual void SAL_CALL actionUndone( const UndoManagerEvent& i_event ) throw (RuntimeException, std::exception) override;
- virtual void SAL_CALL actionRedone( const UndoManagerEvent& i_event ) throw (RuntimeException, std::exception) override;
- virtual void SAL_CALL allActionsCleared( const EventObject& i_event ) throw (RuntimeException, std::exception) override;
- virtual void SAL_CALL redoActionsCleared( const EventObject& i_event ) throw (RuntimeException, std::exception) override;
- virtual void SAL_CALL resetAll( const EventObject& i_event ) throw (RuntimeException, std::exception) override;
- virtual void SAL_CALL enteredContext( const UndoManagerEvent& i_event ) throw (RuntimeException, std::exception) override;
- virtual void SAL_CALL enteredHiddenContext( const UndoManagerEvent& i_event ) throw (RuntimeException, std::exception) override;
- virtual void SAL_CALL leftContext( const UndoManagerEvent& i_event ) throw (RuntimeException, std::exception) override;
- virtual void SAL_CALL leftHiddenContext( const UndoManagerEvent& i_event ) throw (RuntimeException, std::exception) override;
- virtual void SAL_CALL cancelledContext( const UndoManagerEvent& i_event ) throw (RuntimeException, std::exception) override;
+ virtual void SAL_CALL undoActionAdded( const UndoManagerEvent& i_event ) override;
+ virtual void SAL_CALL actionUndone( const UndoManagerEvent& i_event ) override;
+ virtual void SAL_CALL actionRedone( const UndoManagerEvent& i_event ) override;
+ virtual void SAL_CALL allActionsCleared( const EventObject& i_event ) override;
+ virtual void SAL_CALL redoActionsCleared( const EventObject& i_event ) override;
+ virtual void SAL_CALL resetAll( const EventObject& i_event ) override;
+ virtual void SAL_CALL enteredContext( const UndoManagerEvent& i_event ) override;
+ virtual void SAL_CALL enteredHiddenContext( const UndoManagerEvent& i_event ) override;
+ virtual void SAL_CALL leftContext( const UndoManagerEvent& i_event ) override;
+ virtual void SAL_CALL leftHiddenContext( const UndoManagerEvent& i_event ) override;
+ virtual void SAL_CALL cancelledContext( const UndoManagerEvent& i_event ) override;
// XEventListener
- virtual void SAL_CALL disposing( const EventObject& i_event ) throw (RuntimeException, std::exception) override;
+ virtual void SAL_CALL disposing( const EventObject& i_event ) override;
private:
Reference< XUndoManager > const m_xUndoManager;
@@ -98,73 +98,73 @@ namespace framework
bool m_documentDisposed;
};
- void SAL_CALL UndoManagerContextListener::undoActionAdded( const UndoManagerEvent& i_event ) throw (RuntimeException, std::exception)
+ void SAL_CALL UndoManagerContextListener::undoActionAdded( const UndoManagerEvent& i_event )
{
(void)i_event;
// not interested in
}
- void SAL_CALL UndoManagerContextListener::actionUndone( const UndoManagerEvent& i_event ) throw (RuntimeException, std::exception)
+ void SAL_CALL UndoManagerContextListener::actionUndone( const UndoManagerEvent& i_event )
{
(void)i_event;
// not interested in
}
- void SAL_CALL UndoManagerContextListener::actionRedone( const UndoManagerEvent& i_event ) throw (RuntimeException, std::exception)
+ void SAL_CALL UndoManagerContextListener::actionRedone( const UndoManagerEvent& i_event )
{
(void)i_event;
// not interested in
}
- void SAL_CALL UndoManagerContextListener::allActionsCleared( const EventObject& i_event ) throw (RuntimeException, std::exception)
+ void SAL_CALL UndoManagerContextListener::allActionsCleared( const EventObject& i_event )
{
(void)i_event;
// not interested in
}
- void SAL_CALL UndoManagerContextListener::redoActionsCleared( const EventObject& i_event ) throw (RuntimeException, std::exception)
+ void SAL_CALL UndoManagerContextListener::redoActionsCleared( const EventObject& i_event )
{
(void)i_event;
// not interested in
}
- void SAL_CALL UndoManagerContextListener::resetAll( const EventObject& i_event ) throw (RuntimeException, std::exception)
+ void SAL_CALL UndoManagerContextListener::resetAll( const EventObject& i_event )
{
(void)i_event;
m_nRelativeContextDepth = 0;
}
- void SAL_CALL UndoManagerContextListener::enteredContext( const UndoManagerEvent& i_event ) throw (RuntimeException, std::exception)
+ void SAL_CALL UndoManagerContextListener::enteredContext( const UndoManagerEvent& i_event )
{
(void)i_event;
osl_atomic_increment( &m_nRelativeContextDepth );
}
- void SAL_CALL UndoManagerContextListener::enteredHiddenContext( const UndoManagerEvent& i_event ) throw (RuntimeException, std::exception)
+ void SAL_CALL UndoManagerContextListener::enteredHiddenContext( const UndoManagerEvent& i_event )
{
(void)i_event;
osl_atomic_increment( &m_nRelativeContextDepth );
}
- void SAL_CALL UndoManagerContextListener::leftContext( const UndoManagerEvent& i_event ) throw (RuntimeException, std::exception)
+ void SAL_CALL UndoManagerContextListener::leftContext( const UndoManagerEvent& i_event )
{
(void)i_event;
osl_atomic_decrement( &m_nRelativeContextDepth );
}
- void SAL_CALL UndoManagerContextListener::leftHiddenContext( const UndoManagerEvent& i_event ) throw (RuntimeException, std::exception)
+ void SAL_CALL UndoManagerContextListener::leftHiddenContext( const UndoManagerEvent& i_event )
{
(void)i_event;
osl_atomic_decrement( &m_nRelativeContextDepth );
}
- void SAL_CALL UndoManagerContextListener::cancelledContext( const UndoManagerEvent& i_event ) throw (RuntimeException, std::exception)
+ void SAL_CALL UndoManagerContextListener::cancelledContext( const UndoManagerEvent& i_event )
{
(void)i_event;
osl_atomic_decrement( &m_nRelativeContextDepth );
}
- void SAL_CALL UndoManagerContextListener::disposing( const EventObject& i_event ) throw (RuntimeException, std::exception)
+ void SAL_CALL UndoManagerContextListener::disposing( const EventObject& i_event )
{
(void)i_event;
m_documentDisposed = true;
diff --git a/framework/source/fwe/helper/propertysetcontainer.cxx b/framework/source/fwe/helper/propertysetcontainer.cxx
index 7b867d1df361..641e98792324 100644
--- a/framework/source/fwe/helper/propertysetcontainer.cxx
+++ b/framework/source/fwe/helper/propertysetcontainer.cxx
@@ -55,7 +55,6 @@ void SAL_CALL PropertySetContainer::release() throw ()
}
Any SAL_CALL PropertySetContainer::queryInterface( const Type& rType )
-throw ( RuntimeException, std::exception )
{
Any a = ::cppu::queryInterface(
rType ,
@@ -74,7 +73,6 @@ throw ( RuntimeException, std::exception )
// XIndexContainer
void SAL_CALL PropertySetContainer::insertByIndex( sal_Int32 Index, const css::uno::Any& Element )
- throw ( IllegalArgumentException, IndexOutOfBoundsException, WrappedTargetException, RuntimeException, std::exception )
{
SolarMutexGuard g;
@@ -107,7 +105,6 @@ void SAL_CALL PropertySetContainer::insertByIndex( sal_Int32 Index, const css::u
}
void SAL_CALL PropertySetContainer::removeByIndex( sal_Int32 nIndex )
- throw ( IndexOutOfBoundsException, WrappedTargetException, RuntimeException, std::exception )
{
SolarMutexGuard g;
@@ -121,7 +118,6 @@ void SAL_CALL PropertySetContainer::removeByIndex( sal_Int32 nIndex )
// XIndexReplace
void SAL_CALL PropertySetContainer::replaceByIndex( sal_Int32 Index, const css::uno::Any& Element )
- throw ( IllegalArgumentException, IndexOutOfBoundsException, WrappedTargetException, RuntimeException, std::exception)
{
if ( (sal_Int32)m_aPropertySetVector.size() > Index )
{
@@ -144,7 +140,6 @@ void SAL_CALL PropertySetContainer::replaceByIndex( sal_Int32 Index, const css::
// XIndexAccess
sal_Int32 SAL_CALL PropertySetContainer::getCount()
- throw ( RuntimeException, std::exception )
{
SolarMutexGuard g;
@@ -152,7 +147,6 @@ sal_Int32 SAL_CALL PropertySetContainer::getCount()
}
Any SAL_CALL PropertySetContainer::getByIndex( sal_Int32 Index )
- throw ( IndexOutOfBoundsException, WrappedTargetException, RuntimeException, std::exception )
{
SolarMutexGuard g;
@@ -169,7 +163,6 @@ Any SAL_CALL PropertySetContainer::getByIndex( sal_Int32 Index )
// XElementAccess
sal_Bool SAL_CALL PropertySetContainer::hasElements()
- throw (css::uno::RuntimeException, std::exception)
{
SolarMutexGuard g;
diff --git a/framework/source/fwe/helper/titlehelper.cxx b/framework/source/fwe/helper/titlehelper.cxx
index 16ad4b3dafb4..818a4595a4d4 100644
--- a/framework/source/fwe/helper/titlehelper.cxx
+++ b/framework/source/fwe/helper/titlehelper.cxx
@@ -91,7 +91,6 @@ void TitleHelper::setOwner(const css::uno::Reference< css::uno::XInterface >& xO
}
OUString SAL_CALL TitleHelper::getTitle()
- throw (css::uno::RuntimeException, std::exception)
{
// SYNCHRONIZED ->
::osl::ResettableMutexGuard aLock(m_aMutex);
@@ -125,7 +124,6 @@ void TitleHelper::connectWithUntitledNumbers (const css::uno::Reference< css::fr
}
void SAL_CALL TitleHelper::setTitle(const OUString& sTitle)
- throw (css::uno::RuntimeException, std::exception)
{
// SYNCHRONIZED ->
::osl::ResettableMutexGuard aLock(m_aMutex);
@@ -140,21 +138,18 @@ void SAL_CALL TitleHelper::setTitle(const OUString& sTitle)
}
void SAL_CALL TitleHelper::addTitleChangeListener(const css::uno::Reference< css::frame::XTitleChangeListener >& xListener)
- throw (css::uno::RuntimeException, std::exception)
{
// container is threadsafe by himself
m_aListener.addInterface( cppu::UnoType<css::frame::XTitleChangeListener>::get(), xListener );
}
void SAL_CALL TitleHelper::removeTitleChangeListener(const css::uno::Reference< css::frame::XTitleChangeListener >& xListener)
- throw (css::uno::RuntimeException, std::exception)
{
// container is threadsafe by himself
m_aListener.removeInterface( cppu::UnoType<css::frame::XTitleChangeListener>::get(), xListener );
}
void SAL_CALL TitleHelper::titleChanged(const css::frame::TitleChangedEvent& aEvent)
- throw (css::uno::RuntimeException, std::exception)
{
// SYNCHRONIZED ->
::osl::ResettableMutexGuard aLock(m_aMutex);
@@ -171,7 +166,6 @@ void SAL_CALL TitleHelper::titleChanged(const css::frame::TitleChangedEvent& aEv
}
void SAL_CALL TitleHelper::documentEventOccured(const css::document::DocumentEvent& aEvent)
- throw (css::uno::RuntimeException, std::exception)
{
if ( ! aEvent.EventName.equalsIgnoreAsciiCase("OnSaveAsDone")
&& ! aEvent.EventName.equalsIgnoreAsciiCase("OnModeChanged")
@@ -198,7 +192,6 @@ void SAL_CALL TitleHelper::documentEventOccured(const css::document::DocumentEve
}
void SAL_CALL TitleHelper::frameAction(const css::frame::FrameActionEvent& aEvent)
- throw(css::uno::RuntimeException, std::exception)
{
// SYNCHRONIZED ->
::osl::ResettableMutexGuard aLock(m_aMutex);
@@ -225,7 +218,6 @@ void SAL_CALL TitleHelper::frameAction(const css::frame::FrameActionEvent& aEven
}
void SAL_CALL TitleHelper::disposing(const css::lang::EventObject& aEvent)
- throw (css::uno::RuntimeException, std::exception)
{
// SYNCHRONIZED ->
::osl::ResettableMutexGuard aLock(m_aMutex);
diff --git a/framework/source/fwe/interaction/preventduplicateinteraction.cxx b/framework/source/fwe/interaction/preventduplicateinteraction.cxx
index 818fdfe2122a..a019094d1484 100644
--- a/framework/source/fwe/interaction/preventduplicateinteraction.cxx
+++ b/framework/source/fwe/interaction/preventduplicateinteraction.cxx
@@ -63,7 +63,6 @@ void PreventDuplicateInteraction::useDefaultUUIHandler()
}
css::uno::Any SAL_CALL PreventDuplicateInteraction::queryInterface( const css::uno::Type& aType )
- throw (css::uno::RuntimeException, std::exception)
{
if ( aType.equals( cppu::UnoType<XInteractionHandler2>::get() ) )
{
@@ -76,7 +75,6 @@ css::uno::Any SAL_CALL PreventDuplicateInteraction::queryInterface( const css::u
}
void SAL_CALL PreventDuplicateInteraction::handle(const css::uno::Reference< css::task::XInteractionRequest >& xRequest)
- throw(css::uno::RuntimeException, std::exception)
{
css::uno::Any aRequest = xRequest->getRequest();
bool bHandleIt = true;
@@ -130,7 +128,6 @@ void SAL_CALL PreventDuplicateInteraction::handle(const css::uno::Reference< css
}
sal_Bool SAL_CALL PreventDuplicateInteraction::handleInteractionRequest( const css::uno::Reference< css::task::XInteractionRequest >& xRequest )
- throw (css::uno::RuntimeException, std::exception)
{
css::uno::Any aRequest = xRequest->getRequest();
bool bHandleIt = true;
diff --git a/framework/source/fwe/xml/menuconfiguration.cxx b/framework/source/fwe/xml/menuconfiguration.cxx
index fcda2ed2f1d4..9ed762ce2d59 100644
--- a/framework/source/fwe/xml/menuconfiguration.cxx
+++ b/framework/source/fwe/xml/menuconfiguration.cxx
@@ -54,7 +54,6 @@ MenuConfiguration::~MenuConfiguration()
Reference< XIndexAccess > MenuConfiguration::CreateMenuBarConfigurationFromXML(
Reference< XInputStream >& rInputStream )
- throw (WrappedTargetException, RuntimeException)
{
Reference< XParser > xParser = Parser::create( m_xContext );
@@ -102,7 +101,6 @@ Reference< XIndexAccess > MenuConfiguration::CreateMenuBarConfigurationFromXML(
void MenuConfiguration::StoreMenuBarConfigurationToXML(
Reference< XIndexAccess >& rMenuBarConfiguration,
Reference< XOutputStream >& rOutputStream, bool bIsMenuBar )
- throw (WrappedTargetException, RuntimeException)
{
Reference< XWriter > xWriter = Writer::create(m_xContext);
xWriter->setOutputStream( rOutputStream );
diff --git a/framework/source/fwe/xml/menudocumenthandler.cxx b/framework/source/fwe/xml/menudocumenthandler.cxx
index 759244db6c54..485717088a00 100644
--- a/framework/source/fwe/xml/menudocumenthandler.cxx
+++ b/framework/source/fwe/xml/menudocumenthandler.cxx
@@ -163,19 +163,16 @@ ReadMenuDocumentHandlerBase::~ReadMenuDocumentHandlerBase()
void SAL_CALL ReadMenuDocumentHandlerBase::ignorableWhitespace(
const OUString& )
-throw( SAXException, RuntimeException, std::exception )
{
}
void SAL_CALL ReadMenuDocumentHandlerBase::processingInstruction(
const OUString& /*aTarget*/, const OUString& /*aData*/ )
-throw( SAXException, RuntimeException, std::exception )
{
}
void SAL_CALL ReadMenuDocumentHandlerBase::setDocumentLocator(
const Reference< XLocator > &xLocator)
-throw( SAXException, RuntimeException, std::exception )
{
m_xLocator = xLocator;
}
@@ -226,12 +223,10 @@ OReadMenuDocumentHandler::~OReadMenuDocumentHandler()
}
void SAL_CALL OReadMenuDocumentHandler::startDocument()
- throw ( SAXException, RuntimeException, std::exception )
{
}
void SAL_CALL OReadMenuDocumentHandler::endDocument()
- throw( SAXException, RuntimeException, std::exception )
{
if ( m_nElementDepth > 0 )
{
@@ -243,7 +238,6 @@ void SAL_CALL OReadMenuDocumentHandler::endDocument()
void SAL_CALL OReadMenuDocumentHandler::startElement(
const OUString& aName, const Reference< XAttributeList > &xAttrList )
-throw( SAXException, RuntimeException, std::exception )
{
if ( m_eReaderMode != ReaderMode::None )
{
@@ -268,12 +262,10 @@ throw( SAXException, RuntimeException, std::exception )
}
void SAL_CALL OReadMenuDocumentHandler::characters(const OUString&)
-throw( SAXException, RuntimeException, std::exception )
{
}
void SAL_CALL OReadMenuDocumentHandler::endElement( const OUString& aName )
- throw( SAXException, RuntimeException, std::exception )
{
if ( m_eReaderMode != ReaderMode::None )
{
@@ -315,18 +307,15 @@ OReadMenuBarHandler::~OReadMenuBarHandler()
}
void SAL_CALL OReadMenuBarHandler::startDocument()
- throw ( SAXException, RuntimeException, std::exception )
{
}
void SAL_CALL OReadMenuBarHandler::endDocument()
- throw( SAXException, RuntimeException, std::exception )
{
}
void SAL_CALL OReadMenuBarHandler::startElement(
const OUString& rName, const Reference< XAttributeList > &xAttrList )
-throw( SAXException, RuntimeException, std::exception )
{
if ( m_bMenuMode )
{
@@ -413,12 +402,10 @@ throw( SAXException, RuntimeException, std::exception )
}
void SAL_CALL OReadMenuBarHandler::characters(const OUString&)
-throw( SAXException, RuntimeException, std::exception )
{
}
void OReadMenuBarHandler::endElement( const OUString& aName )
- throw( SAXException, RuntimeException, std::exception )
{
if ( m_bMenuMode )
{
@@ -455,18 +442,15 @@ OReadMenuHandler::~OReadMenuHandler()
}
void SAL_CALL OReadMenuHandler::startDocument()
- throw ( SAXException, RuntimeException, std::exception )
{
}
void SAL_CALL OReadMenuHandler::endDocument()
- throw( SAXException, RuntimeException, std::exception)
{
}
void SAL_CALL OReadMenuHandler::startElement(
const OUString& aName, const Reference< XAttributeList > &xAttrList )
-throw( SAXException, RuntimeException, std::exception )
{
if ( m_bMenuPopupMode )
{
@@ -489,12 +473,10 @@ throw( SAXException, RuntimeException, std::exception )
}
void SAL_CALL OReadMenuHandler::characters(const OUString&)
-throw( SAXException, RuntimeException, std::exception )
{
}
void SAL_CALL OReadMenuHandler::endElement( const OUString& aName )
- throw( SAXException, RuntimeException, std::exception )
{
if ( m_bMenuPopupMode )
{
@@ -533,18 +515,15 @@ OReadMenuPopupHandler::~OReadMenuPopupHandler()
}
void SAL_CALL OReadMenuPopupHandler::startDocument()
- throw ( SAXException, RuntimeException, std::exception )
{
}
void SAL_CALL OReadMenuPopupHandler::endDocument()
- throw( SAXException, RuntimeException, std::exception)
{
}
void SAL_CALL OReadMenuPopupHandler::startElement(
const OUString& rName, const Reference< XAttributeList > &xAttrList )
-throw( SAXException, RuntimeException, std::exception )
{
++m_nElementDepth;
@@ -682,12 +661,10 @@ throw( SAXException, RuntimeException, std::exception )
}
void SAL_CALL OReadMenuPopupHandler::characters(const OUString&)
-throw( SAXException, RuntimeException, std::exception )
{
}
void SAL_CALL OReadMenuPopupHandler::endElement( const OUString& aName )
- throw( SAXException, RuntimeException, std::exception )
{
--m_nElementDepth;
if ( m_bMenuMode )
@@ -752,7 +729,6 @@ OWriteMenuDocumentHandler::~OWriteMenuDocumentHandler()
}
void OWriteMenuDocumentHandler::WriteMenuDocument()
-throw ( SAXException, RuntimeException )
{
::comphelper::AttributeList* pList = new ::comphelper::AttributeList;
Reference< XAttributeList > rList( static_cast<XAttributeList *>(pList) , UNO_QUERY );
@@ -793,7 +769,6 @@ throw ( SAXException, RuntimeException )
}
void OWriteMenuDocumentHandler::WriteMenu( const Reference< XIndexAccess >& rMenuContainer )
-throw ( SAXException, RuntimeException )
{
sal_Int32 nItemCount = rMenuContainer->getCount();
bool bSeparator = false;
diff --git a/framework/source/fwe/xml/saxnamespacefilter.cxx b/framework/source/fwe/xml/saxnamespacefilter.cxx
index 4e4b1bf122b7..f2f8169b3258 100644
--- a/framework/source/fwe/xml/saxnamespacefilter.cxx
+++ b/framework/source/fwe/xml/saxnamespacefilter.cxx
@@ -49,18 +49,15 @@ SaxNamespaceFilter::~SaxNamespaceFilter()
// XDocumentHandler
void SAL_CALL SaxNamespaceFilter::startDocument()
- throw ( SAXException, RuntimeException, std::exception )
{
}
void SAL_CALL SaxNamespaceFilter::endDocument()
- throw( SAXException, RuntimeException, std::exception )
{
}
void SAL_CALL SaxNamespaceFilter::startElement(
const OUString& rName, const Reference< XAttributeList > &xAttribs )
- throw( SAXException, RuntimeException, std::exception )
{
XMLNamespaces aXMLNamespaces;
if ( !m_aNamespaceStack.empty() )
@@ -119,7 +116,6 @@ void SAL_CALL SaxNamespaceFilter::startElement(
}
void SAL_CALL SaxNamespaceFilter::endElement(const OUString& aName)
- throw( SAXException, RuntimeException, std::exception )
{
XMLNamespaces& aXMLNamespaces = m_aNamespaceStack.top();
OUString aNamespaceElementName;
@@ -139,27 +135,23 @@ void SAL_CALL SaxNamespaceFilter::endElement(const OUString& aName)
}
void SAL_CALL SaxNamespaceFilter::characters(const OUString& aChars)
- throw( SAXException, RuntimeException, std::exception )
{
xDocumentHandler->characters( aChars );
}
void SAL_CALL SaxNamespaceFilter::ignorableWhitespace(const OUString& aWhitespaces)
- throw( SAXException, RuntimeException, std::exception )
{
xDocumentHandler->ignorableWhitespace( aWhitespaces );
}
void SAL_CALL SaxNamespaceFilter::processingInstruction(
const OUString& aTarget, const OUString& aData)
- throw( SAXException, RuntimeException, std::exception )
{
xDocumentHandler->processingInstruction( aTarget, aData );
}
void SAL_CALL SaxNamespaceFilter::setDocumentLocator(
const Reference< XLocator > &xLocator)
- throw( SAXException, RuntimeException, std::exception )
{
m_xLocator = xLocator;
xDocumentHandler->setDocumentLocator( xLocator );
diff --git a/framework/source/fwe/xml/statusbardocumenthandler.cxx b/framework/source/fwe/xml/statusbardocumenthandler.cxx
index 4d7e66a06ca8..190877c78546 100644
--- a/framework/source/fwe/xml/statusbardocumenthandler.cxx
+++ b/framework/source/fwe/xml/statusbardocumenthandler.cxx
@@ -179,12 +179,10 @@ OReadStatusBarDocumentHandler::~OReadStatusBarDocumentHandler()
// XDocumentHandler
void SAL_CALL OReadStatusBarDocumentHandler::startDocument()
-throw ( SAXException, RuntimeException, std::exception )
{
}
void SAL_CALL OReadStatusBarDocumentHandler::endDocument()
-throw( SAXException, RuntimeException, std::exception )
{
SolarMutexGuard g;
@@ -198,7 +196,6 @@ throw( SAXException, RuntimeException, std::exception )
void SAL_CALL OReadStatusBarDocumentHandler::startElement(
const OUString& aName, const Reference< XAttributeList > &xAttribs )
-throw( SAXException, RuntimeException, std::exception )
{
SolarMutexGuard g;
@@ -397,7 +394,6 @@ throw( SAXException, RuntimeException, std::exception )
}
void SAL_CALL OReadStatusBarDocumentHandler::endElement(const OUString& aName)
-throw( SAXException, RuntimeException, std::exception )
{
SolarMutexGuard g;
@@ -439,24 +435,20 @@ throw( SAXException, RuntimeException, std::exception )
}
void SAL_CALL OReadStatusBarDocumentHandler::characters(const OUString&)
-throw( SAXException, RuntimeException, std::exception )
{
}
void SAL_CALL OReadStatusBarDocumentHandler::ignorableWhitespace(const OUString&)
-throw( SAXException, RuntimeException, std::exception )
{
}
void SAL_CALL OReadStatusBarDocumentHandler::processingInstruction(
const OUString& /*aTarget*/, const OUString& /*aData*/ )
-throw( SAXException, RuntimeException, std::exception )
{
}
void SAL_CALL OReadStatusBarDocumentHandler::setDocumentLocator(
const Reference< XLocator > &xLocator)
-throw( SAXException, RuntimeException, std::exception )
{
SolarMutexGuard g;
@@ -496,8 +488,7 @@ OWriteStatusBarDocumentHandler::~OWriteStatusBarDocumentHandler()
{
}
-void OWriteStatusBarDocumentHandler::WriteStatusBarDocument() throw
-( SAXException, RuntimeException )
+void OWriteStatusBarDocumentHandler::WriteStatusBarDocument()
{
SolarMutexGuard g;
@@ -567,7 +558,6 @@ void OWriteStatusBarDocumentHandler::WriteStatusBarItem(
sal_Int16 nOffset,
sal_Int16 nStyle,
sal_Int16 nWidth )
-throw ( SAXException, RuntimeException )
{
::comphelper::AttributeList* pList = new ::comphelper::AttributeList;
Reference< XAttributeList > xList( static_cast<XAttributeList *>(pList) , UNO_QUERY );
diff --git a/framework/source/fwe/xml/toolboxdocumenthandler.cxx b/framework/source/fwe/xml/toolboxdocumenthandler.cxx
index e31da549bfe8..fad320b13108 100644
--- a/framework/source/fwe/xml/toolboxdocumenthandler.cxx
+++ b/framework/source/fwe/xml/toolboxdocumenthandler.cxx
@@ -178,12 +178,10 @@ OReadToolBoxDocumentHandler::~OReadToolBoxDocumentHandler()
// XDocumentHandler
void SAL_CALL OReadToolBoxDocumentHandler::startDocument()
-throw ( SAXException, RuntimeException, std::exception )
{
}
void SAL_CALL OReadToolBoxDocumentHandler::endDocument()
-throw( SAXException, RuntimeException, std::exception )
{
SolarMutexGuard g;
@@ -197,7 +195,6 @@ throw( SAXException, RuntimeException, std::exception )
void SAL_CALL OReadToolBoxDocumentHandler::startElement(
const OUString& aName, const Reference< XAttributeList > &xAttribs )
-throw( SAXException, RuntimeException, std::exception )
{
SolarMutexGuard g;
@@ -491,7 +488,6 @@ throw( SAXException, RuntimeException, std::exception )
}
void SAL_CALL OReadToolBoxDocumentHandler::endElement(const OUString& aName)
-throw( SAXException, RuntimeException, std::exception )
{
SolarMutexGuard g;
@@ -572,24 +568,20 @@ throw( SAXException, RuntimeException, std::exception )
}
void SAL_CALL OReadToolBoxDocumentHandler::characters(const OUString&)
-throw( SAXException, RuntimeException, std::exception )
{
}
void SAL_CALL OReadToolBoxDocumentHandler::ignorableWhitespace(const OUString&)
-throw( SAXException, RuntimeException, std::exception )
{
}
void SAL_CALL OReadToolBoxDocumentHandler::processingInstruction(
const OUString& /*aTarget*/, const OUString& /*aData*/ )
-throw( SAXException, RuntimeException, std::exception )
{
}
void SAL_CALL OReadToolBoxDocumentHandler::setDocumentLocator(
const Reference< XLocator > &xLocator)
-throw( SAXException, RuntimeException, std::exception )
{
SolarMutexGuard g;
@@ -629,8 +621,7 @@ OWriteToolBoxDocumentHandler::~OWriteToolBoxDocumentHandler()
{
}
-void OWriteToolBoxDocumentHandler::WriteToolBoxDocument() throw
-( SAXException, RuntimeException )
+void OWriteToolBoxDocumentHandler::WriteToolBoxDocument()
{
SolarMutexGuard g;
@@ -718,7 +709,6 @@ void OWriteToolBoxDocumentHandler::WriteToolBoxItem(
const OUString& rHelpURL,
sal_Int16 nStyle,
bool bVisible )
-throw ( SAXException, RuntimeException )
{
::comphelper::AttributeList* pList = new ::comphelper::AttributeList;
Reference< XAttributeList > xList( static_cast<XAttributeList *>(pList) , UNO_QUERY );
@@ -777,8 +767,7 @@ throw ( SAXException, RuntimeException )
m_xWriteDocumentHandler->endElement( ELEMENT_NS_TOOLBARITEM );
}
-void OWriteToolBoxDocumentHandler::WriteToolBoxSpace() throw
-( SAXException, RuntimeException )
+void OWriteToolBoxDocumentHandler::WriteToolBoxSpace()
{
m_xWriteDocumentHandler->ignorableWhitespace( OUString() );
m_xWriteDocumentHandler->startElement( ELEMENT_NS_TOOLBARSPACE, m_xEmptyList );
@@ -786,8 +775,7 @@ void OWriteToolBoxDocumentHandler::WriteToolBoxSpace() throw
m_xWriteDocumentHandler->endElement( ELEMENT_NS_TOOLBARSPACE );
}
-void OWriteToolBoxDocumentHandler::WriteToolBoxBreak() throw
-( SAXException, RuntimeException )
+void OWriteToolBoxDocumentHandler::WriteToolBoxBreak()
{
m_xWriteDocumentHandler->ignorableWhitespace( OUString() );
m_xWriteDocumentHandler->startElement( ELEMENT_NS_TOOLBARBREAK, m_xEmptyList );
@@ -795,8 +783,7 @@ void OWriteToolBoxDocumentHandler::WriteToolBoxBreak() throw
m_xWriteDocumentHandler->endElement( ELEMENT_NS_TOOLBARBREAK );
}
-void OWriteToolBoxDocumentHandler::WriteToolBoxSeparator() throw
-( SAXException, RuntimeException )
+void OWriteToolBoxDocumentHandler::WriteToolBoxSeparator()
{
m_xWriteDocumentHandler->ignorableWhitespace( OUString() );
m_xWriteDocumentHandler->startElement( ELEMENT_NS_TOOLBARSEPARATOR, m_xEmptyList );
diff --git a/framework/source/fwe/xml/xmlnamespaces.cxx b/framework/source/fwe/xml/xmlnamespaces.cxx
index a208e440a3b4..7b103eae24c5 100644
--- a/framework/source/fwe/xml/xmlnamespaces.cxx
+++ b/framework/source/fwe/xml/xmlnamespaces.cxx
@@ -40,7 +40,7 @@ XMLNamespaces::~XMLNamespaces()
{
}
-void XMLNamespaces::addNamespace( const OUString& aName, const OUString& aValue ) throw( SAXException )
+void XMLNamespaces::addNamespace( const OUString& aName, const OUString& aValue )
{
NamespaceMap::iterator p;
OUString aNamespaceName( aName );
@@ -93,7 +93,7 @@ void XMLNamespaces::addNamespace( const OUString& aName, const OUString& aValue
}
}
-OUString XMLNamespaces::applyNSToAttributeName( const OUString& aName ) const throw( SAXException, std::exception )
+OUString XMLNamespaces::applyNSToAttributeName( const OUString& aName ) const
{
// xml draft: there is no default namespace for attributes!
@@ -118,7 +118,7 @@ OUString XMLNamespaces::applyNSToAttributeName( const OUString& aName ) const th
return aName;
}
-OUString XMLNamespaces::applyNSToElementName( const OUString& aName ) const throw( SAXException, std::exception )
+OUString XMLNamespaces::applyNSToElementName( const OUString& aName ) const
{
// xml draft: element names can have a default namespace
@@ -156,7 +156,7 @@ OUString XMLNamespaces::applyNSToElementName( const OUString& aName ) const th
return aElementName;
}
-OUString XMLNamespaces::getNamespaceValue( const OUString& aNamespace ) const throw( SAXException )
+OUString XMLNamespaces::getNamespaceValue( const OUString& aNamespace ) const
{
if ( aNamespace.isEmpty() )
return m_aDefaultNamespace;