diff options
Diffstat (limited to 'scripting')
33 files changed, 401 insertions, 873 deletions
diff --git a/scripting/source/basprov/baslibnode.cxx b/scripting/source/basprov/baslibnode.cxx index b39368ee03ce..16b4ded791a8 100644 --- a/scripting/source/basprov/baslibnode.cxx +++ b/scripting/source/basprov/baslibnode.cxx @@ -66,7 +66,7 @@ namespace basprov // XBrowseNode - OUString BasicLibraryNodeImpl::getName( ) throw (RuntimeException, std::exception) + OUString BasicLibraryNodeImpl::getName( ) { SolarMutexGuard aGuard; @@ -74,7 +74,7 @@ namespace basprov } - Sequence< Reference< browse::XBrowseNode > > BasicLibraryNodeImpl::getChildNodes( ) throw (RuntimeException, std::exception) + Sequence< Reference< browse::XBrowseNode > > BasicLibraryNodeImpl::getChildNodes( ) { SolarMutexGuard aGuard; @@ -106,7 +106,7 @@ namespace basprov } - sal_Bool BasicLibraryNodeImpl::hasChildNodes( ) throw (RuntimeException, std::exception) + sal_Bool BasicLibraryNodeImpl::hasChildNodes( ) { SolarMutexGuard aGuard; @@ -118,7 +118,7 @@ namespace basprov } - sal_Int16 BasicLibraryNodeImpl::getType( ) throw (RuntimeException, std::exception) + sal_Int16 BasicLibraryNodeImpl::getType( ) { SolarMutexGuard aGuard; diff --git a/scripting/source/basprov/baslibnode.hxx b/scripting/source/basprov/baslibnode.hxx index 1f7bd0e7aec4..c23dcaa8a475 100644 --- a/scripting/source/basprov/baslibnode.hxx +++ b/scripting/source/basprov/baslibnode.hxx @@ -60,14 +60,10 @@ namespace basprov virtual ~BasicLibraryNodeImpl() override; // XBrowseNode - virtual OUString SAL_CALL getName( ) - throw (css::uno::RuntimeException, std::exception) override; - virtual css::uno::Sequence< css::uno::Reference< css::script::browse::XBrowseNode > > SAL_CALL getChildNodes( ) - throw (css::uno::RuntimeException, std::exception) override; - virtual sal_Bool SAL_CALL hasChildNodes( ) - throw (css::uno::RuntimeException, std::exception) override; - virtual sal_Int16 SAL_CALL getType( ) - throw (css::uno::RuntimeException, std::exception) override; + virtual OUString SAL_CALL getName( ) override; + virtual css::uno::Sequence< css::uno::Reference< css::script::browse::XBrowseNode > > SAL_CALL getChildNodes( ) override; + virtual sal_Bool SAL_CALL hasChildNodes( ) override; + virtual sal_Int16 SAL_CALL getType( ) override; }; diff --git a/scripting/source/basprov/basmethnode.cxx b/scripting/source/basprov/basmethnode.cxx index a67a8f766432..e9da25e5cfe3 100644 --- a/scripting/source/basprov/basmethnode.cxx +++ b/scripting/source/basprov/basmethnode.cxx @@ -114,7 +114,7 @@ namespace basprov // XBrowseNode - OUString BasicMethodNodeImpl::getName( ) throw (RuntimeException, std::exception) + OUString BasicMethodNodeImpl::getName( ) { SolarMutexGuard aGuard; @@ -126,19 +126,19 @@ namespace basprov } - Sequence< Reference< browse::XBrowseNode > > BasicMethodNodeImpl::getChildNodes( ) throw (RuntimeException, std::exception) + Sequence< Reference< browse::XBrowseNode > > BasicMethodNodeImpl::getChildNodes( ) { return Sequence< Reference< browse::XBrowseNode > >(); } - sal_Bool BasicMethodNodeImpl::hasChildNodes( ) throw (RuntimeException, std::exception) + sal_Bool BasicMethodNodeImpl::hasChildNodes( ) { return false; } - sal_Int16 BasicMethodNodeImpl::getType( ) throw (RuntimeException, std::exception) + sal_Int16 BasicMethodNodeImpl::getType( ) { return browse::BrowseNodeTypes::SCRIPT; } @@ -167,7 +167,7 @@ namespace basprov // XPropertySet - Reference< XPropertySetInfo > BasicMethodNodeImpl::getPropertySetInfo( ) throw (RuntimeException, std::exception) + Reference< XPropertySetInfo > BasicMethodNodeImpl::getPropertySetInfo( ) { Reference< XPropertySetInfo > xInfo( createPropertySetInfo( getInfoHelper() ) ); return xInfo; @@ -177,7 +177,7 @@ namespace basprov // XInvocation - Reference< XIntrospectionAccess > BasicMethodNodeImpl::getIntrospection( ) throw (RuntimeException, std::exception) + Reference< XIntrospectionAccess > BasicMethodNodeImpl::getIntrospection( ) { return Reference< XIntrospectionAccess >(); } @@ -185,8 +185,6 @@ namespace basprov Any BasicMethodNodeImpl::invoke( const OUString& aFunctionName, const Sequence< Any >& aParams, Sequence< sal_Int16 >& aOutParamIndex, Sequence< Any >& aOutParam ) - throw (IllegalArgumentException, script::CannotConvertException, - reflection::InvocationTargetException, RuntimeException, std::exception) { (void)aParams; (void)aOutParamIndex; @@ -272,8 +270,6 @@ namespace basprov void BasicMethodNodeImpl::setValue( const OUString& aPropertyName, const Any& aValue ) - throw (UnknownPropertyException, script::CannotConvertException, - reflection::InvocationTargetException, RuntimeException, std::exception) { (void)aPropertyName; (void)aValue; @@ -283,7 +279,7 @@ namespace basprov } - Any BasicMethodNodeImpl::getValue( const OUString& aPropertyName ) throw (UnknownPropertyException, RuntimeException, std::exception) + Any BasicMethodNodeImpl::getValue( const OUString& aPropertyName ) { (void)aPropertyName; @@ -292,7 +288,7 @@ namespace basprov } - sal_Bool BasicMethodNodeImpl::hasMethod( const OUString& aName ) throw (RuntimeException, std::exception) + sal_Bool BasicMethodNodeImpl::hasMethod( const OUString& aName ) { bool bReturn = false; if ( aName == BASPROV_PROPERTY_EDITABLE ) @@ -302,7 +298,7 @@ namespace basprov } - sal_Bool BasicMethodNodeImpl::hasProperty( const OUString& aName ) throw (RuntimeException, std::exception) + sal_Bool BasicMethodNodeImpl::hasProperty( const OUString& aName ) { (void)aName; diff --git a/scripting/source/basprov/basmethnode.hxx b/scripting/source/basprov/basmethnode.hxx index 5afb2ae7cee9..132c6df7fb8c 100644 --- a/scripting/source/basprov/basmethnode.hxx +++ b/scripting/source/basprov/basmethnode.hxx @@ -81,38 +81,25 @@ namespace basprov DECLARE_XTYPEPROVIDER() // XBrowseNode - virtual OUString SAL_CALL getName( ) - throw (css::uno::RuntimeException, std::exception) override; - virtual css::uno::Sequence< css::uno::Reference< css::script::browse::XBrowseNode > > SAL_CALL getChildNodes( ) - throw (css::uno::RuntimeException, std::exception) override; - virtual sal_Bool SAL_CALL hasChildNodes( ) - throw (css::uno::RuntimeException, std::exception) override; - virtual sal_Int16 SAL_CALL getType( ) - throw (css::uno::RuntimeException, std::exception) override; + virtual OUString SAL_CALL getName( ) override; + virtual css::uno::Sequence< css::uno::Reference< css::script::browse::XBrowseNode > > SAL_CALL getChildNodes( ) override; + virtual sal_Bool SAL_CALL hasChildNodes( ) override; + virtual sal_Int16 SAL_CALL getType( ) override; // XPropertySet - virtual css::uno::Reference< css::beans::XPropertySetInfo > SAL_CALL getPropertySetInfo( ) - throw (css::uno::RuntimeException, std::exception) override; + virtual css::uno::Reference< css::beans::XPropertySetInfo > SAL_CALL getPropertySetInfo( ) override; // XInvocation - virtual css::uno::Reference< css::beans::XIntrospectionAccess > SAL_CALL getIntrospection( ) - throw (css::uno::RuntimeException, std::exception) override; + virtual css::uno::Reference< css::beans::XIntrospectionAccess > SAL_CALL getIntrospection( ) override; virtual css::uno::Any SAL_CALL invoke( const OUString& aFunctionName, const css::uno::Sequence< css::uno::Any >& aParams, css::uno::Sequence< sal_Int16 >& aOutParamIndex, - css::uno::Sequence< css::uno::Any >& aOutParam ) - throw (css::lang::IllegalArgumentException, css::script::CannotConvertException, - css::reflection::InvocationTargetException, css::uno::RuntimeException, std::exception) override; - virtual void SAL_CALL setValue( const OUString& aPropertyName, const css::uno::Any& aValue ) - throw (css::beans::UnknownPropertyException, css::script::CannotConvertException, - css::reflection::InvocationTargetException, css::uno::RuntimeException, std::exception) override; - virtual css::uno::Any SAL_CALL getValue( const OUString& aPropertyName ) - throw (css::beans::UnknownPropertyException, css::uno::RuntimeException, std::exception) override; - virtual sal_Bool SAL_CALL hasMethod( const OUString& aName ) - throw (css::uno::RuntimeException, std::exception) override; - virtual sal_Bool SAL_CALL hasProperty( const OUString& aName ) - throw (css::uno::RuntimeException, std::exception) override; + css::uno::Sequence< css::uno::Any >& aOutParam ) override; + virtual void SAL_CALL setValue( const OUString& aPropertyName, const css::uno::Any& aValue ) override; + virtual css::uno::Any SAL_CALL getValue( const OUString& aPropertyName ) override; + virtual sal_Bool SAL_CALL hasMethod( const OUString& aName ) override; + virtual sal_Bool SAL_CALL hasProperty( const OUString& aName ) override; }; diff --git a/scripting/source/basprov/basmodnode.cxx b/scripting/source/basprov/basmodnode.cxx index b1ee7d495790..145dda2b6e54 100644 --- a/scripting/source/basprov/basmodnode.cxx +++ b/scripting/source/basprov/basmodnode.cxx @@ -59,7 +59,7 @@ namespace basprov // XBrowseNode - OUString BasicModuleNodeImpl::getName( ) throw (RuntimeException, std::exception) + OUString BasicModuleNodeImpl::getName( ) { SolarMutexGuard aGuard; @@ -71,7 +71,7 @@ namespace basprov } - Sequence< Reference< browse::XBrowseNode > > BasicModuleNodeImpl::getChildNodes( ) throw (RuntimeException, std::exception) + Sequence< Reference< browse::XBrowseNode > > BasicModuleNodeImpl::getChildNodes( ) { SolarMutexGuard aGuard; @@ -107,7 +107,7 @@ namespace basprov } - sal_Bool BasicModuleNodeImpl::hasChildNodes( ) throw (RuntimeException, std::exception) + sal_Bool BasicModuleNodeImpl::hasChildNodes( ) { SolarMutexGuard aGuard; @@ -123,7 +123,7 @@ namespace basprov } - sal_Int16 BasicModuleNodeImpl::getType( ) throw (RuntimeException, std::exception) + sal_Int16 BasicModuleNodeImpl::getType( ) { SolarMutexGuard aGuard; diff --git a/scripting/source/basprov/basmodnode.hxx b/scripting/source/basprov/basmodnode.hxx index 122337bf320f..e317df2272f1 100644 --- a/scripting/source/basprov/basmodnode.hxx +++ b/scripting/source/basprov/basmodnode.hxx @@ -54,14 +54,10 @@ namespace basprov virtual ~BasicModuleNodeImpl() override; // XBrowseNode - virtual OUString SAL_CALL getName( ) - throw (css::uno::RuntimeException, std::exception) override; - virtual css::uno::Sequence< css::uno::Reference< css::script::browse::XBrowseNode > > SAL_CALL getChildNodes( ) - throw (css::uno::RuntimeException, std::exception) override; - virtual sal_Bool SAL_CALL hasChildNodes( ) - throw (css::uno::RuntimeException, std::exception) override; - virtual sal_Int16 SAL_CALL getType( ) - throw (css::uno::RuntimeException, std::exception) override; + virtual OUString SAL_CALL getName( ) override; + virtual css::uno::Sequence< css::uno::Reference< css::script::browse::XBrowseNode > > SAL_CALL getChildNodes( ) override; + virtual sal_Bool SAL_CALL hasChildNodes( ) override; + virtual sal_Int16 SAL_CALL getType( ) override; }; diff --git a/scripting/source/basprov/basprov.cxx b/scripting/source/basprov/basprov.cxx index a166b2cf8efa..39a95bd5da4a 100644 --- a/scripting/source/basprov/basprov.cxx +++ b/scripting/source/basprov/basprov.cxx @@ -168,17 +168,17 @@ namespace basprov } // XServiceInfo - OUString BasicProviderImpl::getImplementationName( ) throw (RuntimeException, std::exception) + OUString BasicProviderImpl::getImplementationName( ) { return getImplementationName_BasicProviderImpl(); } - sal_Bool BasicProviderImpl::supportsService( const OUString& rServiceName ) throw (RuntimeException, std::exception) + sal_Bool BasicProviderImpl::supportsService( const OUString& rServiceName ) { return cppu::supportsService(this, rServiceName); } - Sequence< OUString > BasicProviderImpl::getSupportedServiceNames( ) throw (RuntimeException, std::exception) + Sequence< OUString > BasicProviderImpl::getSupportedServiceNames( ) { return getSupportedServiceNames_BasicProviderImpl(); } @@ -187,7 +187,7 @@ namespace basprov // XInitialization - void BasicProviderImpl::initialize( const Sequence< Any >& aArguments ) throw (Exception, RuntimeException, std::exception) + void BasicProviderImpl::initialize( const Sequence< Any >& aArguments ) { // TODO @@ -278,7 +278,6 @@ namespace basprov Reference < provider::XScript > BasicProviderImpl::getScript( const OUString& scriptURI ) - throw ( provider::ScriptFrameworkErrorException, RuntimeException, std::exception) { // TODO @@ -394,13 +393,13 @@ namespace basprov // XBrowseNode - OUString BasicProviderImpl::getName( ) throw (RuntimeException, std::exception) + OUString BasicProviderImpl::getName( ) { return OUString("Basic"); } - Sequence< Reference< browse::XBrowseNode > > BasicProviderImpl::getChildNodes( ) throw (RuntimeException, std::exception) + Sequence< Reference< browse::XBrowseNode > > BasicProviderImpl::getChildNodes( ) { SolarMutexGuard aGuard; @@ -457,7 +456,7 @@ namespace basprov } - sal_Bool BasicProviderImpl::hasChildNodes( ) throw (RuntimeException, std::exception) + sal_Bool BasicProviderImpl::hasChildNodes( ) { SolarMutexGuard aGuard; @@ -478,7 +477,7 @@ namespace basprov } - sal_Int16 BasicProviderImpl::getType( ) throw (RuntimeException, std::exception) + sal_Int16 BasicProviderImpl::getType( ) { return browse::BrowseNodeTypes::CONTAINER; } diff --git a/scripting/source/basprov/basprov.hxx b/scripting/source/basprov/basprov.hxx index 8026a5c034ca..b3ba2617982c 100644 --- a/scripting/source/basprov/basprov.hxx +++ b/scripting/source/basprov/basprov.hxx @@ -70,31 +70,22 @@ namespace basprov virtual ~BasicProviderImpl() 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; // XInitialization - virtual void SAL_CALL initialize( const css::uno::Sequence< css::uno::Any >& aArguments ) - throw (css::uno::Exception, css::uno::RuntimeException, std::exception) override; + virtual void SAL_CALL initialize( const css::uno::Sequence< css::uno::Any >& aArguments ) override; // XScriptProvider virtual css::uno::Reference < css::script::provider::XScript > SAL_CALL getScript( - const OUString& scriptURI ) - throw ( css::script::provider::ScriptFrameworkErrorException, css::uno::RuntimeException, std::exception) override; + const OUString& scriptURI ) override; // XBrowseNode - virtual OUString SAL_CALL getName( ) - throw (css::uno::RuntimeException, std::exception) override; - virtual css::uno::Sequence< css::uno::Reference< css::script::browse::XBrowseNode > > SAL_CALL getChildNodes( ) - throw (css::uno::RuntimeException, std::exception) override; - virtual sal_Bool SAL_CALL hasChildNodes( ) - throw (css::uno::RuntimeException, std::exception) override; - virtual sal_Int16 SAL_CALL getType( ) - throw (css::uno::RuntimeException, std::exception) override; + virtual OUString SAL_CALL getName( ) override; + virtual css::uno::Sequence< css::uno::Reference< css::script::browse::XBrowseNode > > SAL_CALL getChildNodes( ) override; + virtual sal_Bool SAL_CALL hasChildNodes( ) override; + virtual sal_Int16 SAL_CALL getType( ) override; }; diff --git a/scripting/source/basprov/basscript.cxx b/scripting/source/basprov/basscript.cxx index 1c991dbf8d48..dd098d42b9cd 100644 --- a/scripting/source/basprov/basscript.cxx +++ b/scripting/source/basprov/basscript.cxx @@ -143,7 +143,7 @@ namespace basprov // XPropertySet - Reference< XPropertySetInfo > BasicScriptImpl::getPropertySetInfo( ) throw (RuntimeException, std::exception) + Reference< XPropertySetInfo > BasicScriptImpl::getPropertySetInfo( ) { Reference< XPropertySetInfo > xInfo( createPropertySetInfo( getInfoHelper() ) ); return xInfo; @@ -154,7 +154,6 @@ namespace basprov Any BasicScriptImpl::invoke( const Sequence< Any >& aParams, Sequence< sal_Int16 >& aOutParamIndex, Sequence< Any >& aOutParam ) - throw ( provider::ScriptFrameworkErrorException, reflection::InvocationTargetException, uno::RuntimeException, std::exception) { // TODO: throw CannotConvertException // TODO: check length of aOutParamIndex, aOutParam diff --git a/scripting/source/basprov/basscript.hxx b/scripting/source/basprov/basscript.hxx index cf530d69f22b..71aae465ad7b 100644 --- a/scripting/source/basprov/basscript.hxx +++ b/scripting/source/basprov/basscript.hxx @@ -89,14 +89,9 @@ namespace basprov virtual css::uno::Any SAL_CALL invoke( const css::uno::Sequence< css::uno::Any >& aParams, css::uno::Sequence< sal_Int16 >& aOutParamIndex, - css::uno::Sequence< css::uno::Any >& aOutParam ) - throw ( - css::script::provider::ScriptFrameworkErrorException, - css::reflection::InvocationTargetException, - css::uno::RuntimeException, std::exception ) override; + css::uno::Sequence< css::uno::Any >& aOutParam ) override; // XPropertySet - virtual css::uno::Reference< css::beans::XPropertySetInfo > SAL_CALL getPropertySetInfo( ) - throw (css::uno::RuntimeException, std::exception) override; + virtual css::uno::Reference< css::beans::XPropertySetInfo > SAL_CALL getPropertySetInfo( ) override; // SfxListener virtual void Notify( SfxBroadcaster& rBC, const SfxHint& rHint ) override; diff --git a/scripting/source/dlgprov/DialogModelProvider.cxx b/scripting/source/dlgprov/DialogModelProvider.cxx index d3e4aa5ef4f2..afd4628e9ed1 100644 --- a/scripting/source/dlgprov/DialogModelProvider.cxx +++ b/scripting/source/dlgprov/DialogModelProvider.cxx @@ -40,7 +40,7 @@ DialogModelProvider::DialogModelProvider(Reference< XComponentContext > const & {} // lang::XInitialization: -void SAL_CALL DialogModelProvider::initialize(const css::uno::Sequence< uno::Any > & aArguments) throw (css::uno::RuntimeException, css::uno::Exception, std::exception) +void SAL_CALL DialogModelProvider::initialize(const css::uno::Sequence< uno::Any > & aArguments) { if ( aArguments.getLength() == 1 ) { @@ -72,84 +72,84 @@ void SAL_CALL DialogModelProvider::initialize(const css::uno::Sequence< uno::Any } // container::XElementAccess: -uno::Type SAL_CALL DialogModelProvider::getElementType() throw (css::uno::RuntimeException, std::exception) +uno::Type SAL_CALL DialogModelProvider::getElementType() { return m_xDialogModel->getElementType(); } -sal_Bool SAL_CALL DialogModelProvider::hasElements() throw (css::uno::RuntimeException, std::exception) +sal_Bool SAL_CALL DialogModelProvider::hasElements() { return m_xDialogModel->hasElements(); } // container::XNameAccess: -uno::Any SAL_CALL DialogModelProvider::getByName(const OUString & aName) throw (css::uno::RuntimeException, css::container::NoSuchElementException, css::lang::WrappedTargetException, std::exception) +uno::Any SAL_CALL DialogModelProvider::getByName(const OUString & aName) { return m_xDialogModel->getByName(aName); } -css::uno::Sequence< OUString > SAL_CALL DialogModelProvider::getElementNames() throw (css::uno::RuntimeException, std::exception) +css::uno::Sequence< OUString > SAL_CALL DialogModelProvider::getElementNames() { return m_xDialogModel->getElementNames(); } -sal_Bool SAL_CALL DialogModelProvider::hasByName(const OUString & aName) throw (css::uno::RuntimeException, std::exception) +sal_Bool SAL_CALL DialogModelProvider::hasByName(const OUString & aName) { return m_xDialogModel->hasByName(aName); } // container::XNameReplace: -void SAL_CALL DialogModelProvider::replaceByName(const OUString & aName, const uno::Any & aElement) throw (css::uno::RuntimeException, css::lang::IllegalArgumentException, css::container::NoSuchElementException, css::lang::WrappedTargetException, std::exception) +void SAL_CALL DialogModelProvider::replaceByName(const OUString & aName, const uno::Any & aElement) { m_xDialogModel->replaceByName(aName,aElement); } // container::XNameContainer: -void SAL_CALL DialogModelProvider::insertByName(const OUString & aName, const uno::Any & aElement) throw (css::uno::RuntimeException, css::lang::IllegalArgumentException, css::container::ElementExistException, css::lang::WrappedTargetException, std::exception) +void SAL_CALL DialogModelProvider::insertByName(const OUString & aName, const uno::Any & aElement) { m_xDialogModel->insertByName(aName,aElement); } -void SAL_CALL DialogModelProvider::removeByName(const OUString & aName) throw (css::uno::RuntimeException, css::container::NoSuchElementException, css::lang::WrappedTargetException, std::exception) +void SAL_CALL DialogModelProvider::removeByName(const OUString & aName) { m_xDialogModel->removeByName(aName); } -uno::Reference< beans::XPropertySetInfo > SAL_CALL DialogModelProvider::getPropertySetInfo( ) throw (uno::RuntimeException, std::exception) +uno::Reference< beans::XPropertySetInfo > SAL_CALL DialogModelProvider::getPropertySetInfo( ) { return m_xDialogModelProp->getPropertySetInfo(); } -void SAL_CALL DialogModelProvider::setPropertyValue( const OUString&, const uno::Any& ) throw (beans::UnknownPropertyException, beans::PropertyVetoException, lang::IllegalArgumentException, lang::WrappedTargetException, uno::RuntimeException, std::exception) +void SAL_CALL DialogModelProvider::setPropertyValue( const OUString&, const uno::Any& ) { } -uno::Any SAL_CALL DialogModelProvider::getPropertyValue( const OUString& PropertyName ) throw (beans::UnknownPropertyException, lang::WrappedTargetException, uno::RuntimeException, std::exception) +uno::Any SAL_CALL DialogModelProvider::getPropertyValue( const OUString& PropertyName ) { return m_xDialogModelProp->getPropertyValue(PropertyName); } -void SAL_CALL DialogModelProvider::addPropertyChangeListener( const OUString& , const uno::Reference< beans::XPropertyChangeListener >& ) throw (beans::UnknownPropertyException, lang::WrappedTargetException, uno::RuntimeException, std::exception) +void SAL_CALL DialogModelProvider::addPropertyChangeListener( const OUString& , const uno::Reference< beans::XPropertyChangeListener >& ) { } -void SAL_CALL DialogModelProvider::removePropertyChangeListener( const OUString& , const uno::Reference< beans::XPropertyChangeListener >& ) throw (beans::UnknownPropertyException, lang::WrappedTargetException, uno::RuntimeException, std::exception) +void SAL_CALL DialogModelProvider::removePropertyChangeListener( const OUString& , const uno::Reference< beans::XPropertyChangeListener >& ) { } -void SAL_CALL DialogModelProvider::addVetoableChangeListener( const OUString& , const uno::Reference< beans::XVetoableChangeListener >& ) throw (beans::UnknownPropertyException, lang::WrappedTargetException, uno::RuntimeException, std::exception) +void SAL_CALL DialogModelProvider::addVetoableChangeListener( const OUString& , const uno::Reference< beans::XVetoableChangeListener >& ) { } -void SAL_CALL DialogModelProvider::removeVetoableChangeListener( const OUString& ,const uno::Reference< beans::XVetoableChangeListener >& ) throw (beans::UnknownPropertyException, lang::WrappedTargetException, uno::RuntimeException, std::exception) +void SAL_CALL DialogModelProvider::removeVetoableChangeListener( const OUString& ,const uno::Reference< beans::XVetoableChangeListener >& ) { } // com.sun.star.uno.XServiceInfo: -OUString SAL_CALL DialogModelProvider::getImplementationName() throw (css::uno::RuntimeException, std::exception) +OUString SAL_CALL DialogModelProvider::getImplementationName() { return comp_DialogModelProvider::_getImplementationName(); } -sal_Bool SAL_CALL DialogModelProvider::supportsService(OUString const & serviceName) throw (css::uno::RuntimeException, std::exception) +sal_Bool SAL_CALL DialogModelProvider::supportsService(OUString const & serviceName) { return cppu::supportsService(this, serviceName); } -css::uno::Sequence< OUString > SAL_CALL DialogModelProvider::getSupportedServiceNames() throw (css::uno::RuntimeException, std::exception) +css::uno::Sequence< OUString > SAL_CALL DialogModelProvider::getSupportedServiceNames() { return comp_DialogModelProvider::_getSupportedServiceNames(); } diff --git a/scripting/source/dlgprov/DialogModelProvider.hxx b/scripting/source/dlgprov/DialogModelProvider.hxx index ccf04a80d16d..9de4469a0d38 100644 --- a/scripting/source/dlgprov/DialogModelProvider.hxx +++ b/scripting/source/dlgprov/DialogModelProvider.hxx @@ -42,36 +42,36 @@ public: explicit DialogModelProvider(css::uno::Reference< css::uno::XComponentContext > const & context); private: // css::lang::XInitialization: - virtual void SAL_CALL initialize(const css::uno::Sequence< css::uno::Any > & aArguments) throw (css::uno::RuntimeException, css::uno::Exception, std::exception) override; + virtual void SAL_CALL initialize(const css::uno::Sequence< css::uno::Any > & aArguments) override; // css::container::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; // css::container::XNameAccess: - virtual css::uno::Any SAL_CALL getByName(const OUString & aName) throw (css::uno::RuntimeException, css::container::NoSuchElementException, css::lang::WrappedTargetException, 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; // css::container::XNameReplace: - virtual void SAL_CALL replaceByName(const OUString & aName, const css::uno::Any & aElement) throw (css::uno::RuntimeException, css::lang::IllegalArgumentException, css::container::NoSuchElementException, css::lang::WrappedTargetException, std::exception) override; + virtual void SAL_CALL replaceByName(const OUString & aName, const css::uno::Any & aElement) override; // css::container::XNameContainer: - virtual void SAL_CALL insertByName(const OUString & aName, const css::uno::Any & aElement) throw (css::uno::RuntimeException, css::lang::IllegalArgumentException, css::container::ElementExistException, css::lang::WrappedTargetException, std::exception) override; - virtual void SAL_CALL removeByName(const OUString & Name) throw (css::uno::RuntimeException, css::container::NoSuchElementException, css::lang::WrappedTargetException, 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; // css::lang::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; - virtual css::uno::Reference< css::beans::XPropertySetInfo > SAL_CALL getPropertySetInfo( ) throw (css::uno::RuntimeException, std::exception) override; - virtual void SAL_CALL setPropertyValue( const OUString& aPropertyName, const css::uno::Any& aValue ) throw (css::beans::UnknownPropertyException, css::beans::PropertyVetoException, css::lang::IllegalArgumentException, css::lang::WrappedTargetException, css::uno::RuntimeException, std::exception) override; - virtual css::uno::Any SAL_CALL getPropertyValue( const OUString& PropertyName ) throw (css::beans::UnknownPropertyException, css::lang::WrappedTargetException, css::uno::RuntimeException, std::exception) override; - virtual void SAL_CALL addPropertyChangeListener( const OUString& aPropertyName, const css::uno::Reference< css::beans::XPropertyChangeListener >& xListener ) throw (css::beans::UnknownPropertyException, css::lang::WrappedTargetException, css::uno::RuntimeException, std::exception) override; - virtual void SAL_CALL removePropertyChangeListener( const OUString& aPropertyName, const css::uno::Reference< css::beans::XPropertyChangeListener >& aListener ) throw (css::beans::UnknownPropertyException, css::lang::WrappedTargetException, css::uno::RuntimeException, std::exception) override; - virtual void SAL_CALL addVetoableChangeListener( const OUString& PropertyName, const css::uno::Reference< css::beans::XVetoableChangeListener >& aListener ) throw (css::beans::UnknownPropertyException, css::lang::WrappedTargetException, css::uno::RuntimeException, std::exception) override; - virtual void SAL_CALL removeVetoableChangeListener( const OUString& PropertyName, const css::uno::Reference< css::beans::XVetoableChangeListener >& aListener ) throw (css::beans::UnknownPropertyException, css::lang::WrappedTargetException, css::uno::RuntimeException, std::exception) override; + virtual css::uno::Reference< css::beans::XPropertySetInfo > SAL_CALL getPropertySetInfo( ) override; + virtual void SAL_CALL setPropertyValue( const OUString& aPropertyName, const css::uno::Any& aValue ) override; + virtual css::uno::Any SAL_CALL getPropertyValue( const OUString& PropertyName ) override; + virtual void SAL_CALL addPropertyChangeListener( const OUString& aPropertyName, const css::uno::Reference< css::beans::XPropertyChangeListener >& xListener ) override; + virtual void SAL_CALL removePropertyChangeListener( const OUString& aPropertyName, const css::uno::Reference< css::beans::XPropertyChangeListener >& aListener ) override; + virtual void SAL_CALL addVetoableChangeListener( const OUString& PropertyName, const css::uno::Reference< css::beans::XVetoableChangeListener >& aListener ) override; + virtual void SAL_CALL removeVetoableChangeListener( const OUString& PropertyName, const css::uno::Reference< css::beans::XVetoableChangeListener >& aListener ) override; private: DialogModelProvider(const DialogModelProvider &) = delete; diff --git a/scripting/source/dlgprov/dlgevtatt.cxx b/scripting/source/dlgprov/dlgevtatt.cxx index ca25c1458f78..b19512a2a296 100644 --- a/scripting/source/dlgprov/dlgevtatt.cxx +++ b/scripting/source/dlgprov/dlgevtatt.cxx @@ -185,7 +185,7 @@ namespace dlgprov Reference< script::XScriptListener > - DialogEventsAttacherImpl::getScriptListenerForKey( const OUString& sKey ) throw ( RuntimeException ) + DialogEventsAttacherImpl::getScriptListenerForKey( const OUString& sKey ) { ListenerHash::iterator it = listenersForTypes.find( sKey ); if ( it == listenersForTypes.end() ) @@ -325,8 +325,6 @@ namespace dlgprov void SAL_CALL DialogEventsAttacherImpl::attachEvents( const Sequence< Reference< XInterface > >& Objects, const css::uno::Reference<css::script::XScriptListener>&, const Any& Helper ) - throw (IllegalArgumentException, IntrospectionException, CannotCreateAdapterException, - ServiceNotRegisteredException, RuntimeException, std::exception) { // get EventAttacher { @@ -408,7 +406,7 @@ namespace dlgprov // XEventListener - void DialogAllListenerImpl::disposing(const EventObject& ) throw ( RuntimeException, std::exception ) + void DialogAllListenerImpl::disposing(const EventObject& ) { } @@ -416,7 +414,7 @@ namespace dlgprov // XAllListener - void DialogAllListenerImpl::firing( const AllEventObject& Event ) throw ( RuntimeException, std::exception ) + void DialogAllListenerImpl::firing( const AllEventObject& Event ) { //::osl::MutexGuard aGuard( getMutex() ); @@ -425,7 +423,6 @@ namespace dlgprov Any DialogAllListenerImpl::approveFiring( const AllEventObject& Event ) - throw ( reflection::InvocationTargetException, RuntimeException, std::exception ) { //::osl::MutexGuard aGuard( getMutex() ); @@ -642,7 +639,7 @@ namespace dlgprov // XEventListener - void DialogScriptListenerImpl::disposing(const EventObject& ) throw ( RuntimeException, std::exception ) + void DialogScriptListenerImpl::disposing(const EventObject& ) { } @@ -650,7 +647,7 @@ namespace dlgprov // XScriptListener - void DialogScriptListenerImpl::firing( const ScriptEvent& aScriptEvent ) throw ( RuntimeException, std::exception ) + void DialogScriptListenerImpl::firing( const ScriptEvent& aScriptEvent ) { //::osl::MutexGuard aGuard( getMutex() ); @@ -659,7 +656,6 @@ namespace dlgprov Any DialogScriptListenerImpl::approveFiring( const ScriptEvent& aScriptEvent ) - throw ( reflection::InvocationTargetException, RuntimeException, std::exception ) { //::osl::MutexGuard aGuard( getMutex() ); diff --git a/scripting/source/dlgprov/dlgevtatt.hxx b/scripting/source/dlgprov/dlgevtatt.hxx index 34a2d9a888aa..392ffcdc9c70 100644 --- a/scripting/source/dlgprov/dlgevtatt.hxx +++ b/scripting/source/dlgprov/dlgevtatt.hxx @@ -53,7 +53,7 @@ namespace dlgprov css::uno::Reference< css::uno::XComponentContext > m_xContext; css::uno::Reference< css::script::XEventAttacher > m_xEventAttacher; /// @throws css::uno::RuntimeException - css::uno::Reference< css::script::XScriptListener > getScriptListenerForKey( const OUString& sScriptName ) throw ( css::uno::RuntimeException ); + css::uno::Reference< css::script::XScriptListener > getScriptListenerForKey( const OUString& sScriptName ); css::uno::Reference< css::script::XScriptEventsSupplier > getFakeVbaEventsSupplier( const css::uno::Reference< css::awt::XControl>& xControl, OUString& sCodeName ); void nestedAttachEvents( const css::uno::Sequence< css::uno::Reference< css::uno::XInterface > >& Objects, const css::uno::Any& Helper, OUString& sDialogCodeName ); void attachEventsToControl( const css::uno::Reference< css::awt::XControl>& xControl, const css::uno::Reference< css::script::XScriptEventsSupplier >& events, const css::uno::Any& Helper ); @@ -71,12 +71,7 @@ namespace dlgprov virtual void SAL_CALL attachEvents( const css::uno::Sequence< css::uno::Reference< css::uno::XInterface > >& Objects, const css::uno::Reference<css::script::XScriptListener>&, - const css::uno::Any& Helper ) - throw (css::lang::IllegalArgumentException, - css::beans::IntrospectionException, - css::script::CannotCreateAdapterException, - css::lang::ServiceNotRegisteredException, - css::uno::RuntimeException, std::exception) override; + const css::uno::Any& Helper ) override; }; @@ -102,14 +97,11 @@ namespace dlgprov virtual ~DialogAllListenerImpl() override; // XEventListener - virtual void SAL_CALL disposing( const css::lang::EventObject& Source ) - throw (css::uno::RuntimeException, std::exception) override; + virtual void SAL_CALL disposing( const css::lang::EventObject& Source ) override; // XAllListener - virtual void SAL_CALL firing( const css::script::AllEventObject& Event ) - throw (css::uno::RuntimeException, std::exception) override; - virtual css::uno::Any SAL_CALL approveFiring( const css::script::AllEventObject& Event ) - throw (css::reflection::InvocationTargetException, css::uno::RuntimeException, std::exception) override; + virtual void SAL_CALL firing( const css::script::AllEventObject& Event ) override; + virtual css::uno::Any SAL_CALL approveFiring( const css::script::AllEventObject& Event ) override; }; @@ -130,14 +122,11 @@ namespace dlgprov virtual ~DialogScriptListenerImpl() override; // XEventListener - virtual void SAL_CALL disposing( const css::lang::EventObject& Source ) - throw (css::uno::RuntimeException, std::exception) override; + virtual void SAL_CALL disposing( const css::lang::EventObject& Source ) override; // XScriptListener - virtual void SAL_CALL firing( const css::script::ScriptEvent& aScriptEvent ) - throw (css::uno::RuntimeException, std::exception) override; - virtual css::uno::Any SAL_CALL approveFiring( const css::script::ScriptEvent& aScriptEvent ) - throw (css::reflection::InvocationTargetException, css::uno::RuntimeException, std::exception) override; + virtual void SAL_CALL firing( const css::script::ScriptEvent& aScriptEvent ) override; + virtual css::uno::Any SAL_CALL approveFiring( const css::script::ScriptEvent& aScriptEvent ) override; }; diff --git a/scripting/source/dlgprov/dlgprov.cxx b/scripting/source/dlgprov/dlgprov.cxx index 8267d5f3b965..9c7433133d08 100644 --- a/scripting/source/dlgprov/dlgprov.cxx +++ b/scripting/source/dlgprov/dlgprov.cxx @@ -128,7 +128,7 @@ namespace dlgprov const Reference< io::XInputStream >& xInput, const Reference< frame::XModel >& xModel, const Reference< resource::XStringResourceManager >& xStringResourceManager, - const Any &aDialogSourceURL) throw ( Exception ) + const Any &aDialogSourceURL) { Reference< container::XNameContainer > xDialogModel( lcl_createControlModel(i_xContext) ); @@ -231,12 +231,12 @@ namespace dlgprov Reference< container::XNameContainer > DialogProviderImpl::createDialogModel( const Reference< io::XInputStream >& xInput, const Reference< resource::XStringResourceManager >& xStringResourceManager, - const Any &aDialogSourceURL) throw ( Exception ) + const Any &aDialogSourceURL) { return lcl_createDialogModel(m_xContext,xInput,m_xModel,xStringResourceManager,aDialogSourceURL); } - Reference< XControlModel > DialogProviderImpl::createDialogModelForBasic() throw ( Exception ) + Reference< XControlModel > DialogProviderImpl::createDialogModelForBasic() { if ( !m_BasicInfo.get() ) // shouln't get here @@ -553,17 +553,17 @@ namespace dlgprov // XServiceInfo - OUString DialogProviderImpl::getImplementationName( ) throw (RuntimeException, std::exception) + OUString DialogProviderImpl::getImplementationName( ) { return getImplementationName_DialogProviderImpl(); } - sal_Bool DialogProviderImpl::supportsService( const OUString& rServiceName ) throw (RuntimeException, std::exception) + sal_Bool DialogProviderImpl::supportsService( const OUString& rServiceName ) { return cppu::supportsService(this, rServiceName); } - Sequence< OUString > DialogProviderImpl::getSupportedServiceNames( ) throw (RuntimeException, std::exception) + Sequence< OUString > DialogProviderImpl::getSupportedServiceNames( ) { return getSupportedServiceNames_DialogProviderImpl(); } @@ -572,7 +572,7 @@ namespace dlgprov // XInitialization - void DialogProviderImpl::initialize( const Sequence< Any >& aArguments ) throw (Exception, RuntimeException, std::exception) + void DialogProviderImpl::initialize( const Sequence< Any >& aArguments ) { ::osl::MutexGuard aGuard( getMutex() ); @@ -615,7 +615,6 @@ namespace dlgprov Reference < XControl > DialogProviderImpl::createDialogImpl( const OUString& URL, const Reference< XInterface >& xHandler, const Reference< XWindowPeer >& xParent, bool bDialogProviderMode ) - throw (IllegalArgumentException, RuntimeException, std::exception) { // if the dialog is located in a document, the document must already be open! @@ -680,7 +679,6 @@ namespace dlgprov } Reference < XDialog > DialogProviderImpl::createDialog( const OUString& URL ) - throw (IllegalArgumentException, RuntimeException, std::exception) { Reference< XInterface > xDummyHandler; Reference< XWindowPeer > xDummyPeer; @@ -691,7 +689,6 @@ namespace dlgprov Reference < XDialog > DialogProviderImpl::createDialogWithHandler( const OUString& URL, const Reference< XInterface >& xHandler ) - throw (IllegalArgumentException, RuntimeException, std::exception) { if( !xHandler.is() ) { @@ -707,7 +704,6 @@ namespace dlgprov Reference < XDialog > DialogProviderImpl::createDialogWithArguments( const OUString& URL, const Sequence< NamedValue >& Arguments ) - throw (IllegalArgumentException, RuntimeException, std::exception) { ::comphelper::NamedValueCollection aArguments( Arguments ); @@ -733,7 +729,6 @@ namespace dlgprov Reference< XWindow > DialogProviderImpl::createContainerWindow( const OUString& URL, const OUString& WindowType, const Reference< XWindowPeer >& xParent, const Reference< XInterface >& xHandler ) - throw (lang::IllegalArgumentException, RuntimeException, std::exception) { (void)WindowType; // for future use if( !xParent.is() ) diff --git a/scripting/source/dlgprov/dlgprov.hxx b/scripting/source/dlgprov/dlgprov.hxx index b554e531aa38..6277bba85b3e 100644 --- a/scripting/source/dlgprov/dlgprov.hxx +++ b/scripting/source/dlgprov/dlgprov.hxx @@ -60,7 +60,7 @@ namespace dlgprov const css::uno::Reference< css::io::XInputStream >& xInput, const css::uno::Reference< css::frame::XModel >& xModel, const css::uno::Reference< css::resource::XStringResourceManager >& xStringResourceManager, - const css::uno::Any &aDialogSourceURL) throw ( css::uno::Exception ); + const css::uno::Any &aDialogSourceURL); typedef ::cppu::WeakImplHelper< css::lang::XServiceInfo, @@ -99,9 +99,9 @@ namespace dlgprov css::uno::Reference< css::container::XNameContainer > createDialogModel( const css::uno::Reference< css::io::XInputStream >& xInput, const css::uno::Reference< css::resource::XStringResourceManager >& xStringResourceManager, - const css::uno::Any &aDialogSourceURL) throw ( css::uno::Exception ); + const css::uno::Any &aDialogSourceURL); /// @throws css::uno::Exception - css::uno::Reference< css::awt::XControlModel > createDialogModelForBasic() throw ( css::uno::Exception ); + css::uno::Reference< css::awt::XControlModel > createDialogModelForBasic(); // XDialogProvider / XDialogProvider2 impl method /// @throws css::lang::IllegalArgumentException @@ -110,8 +110,7 @@ namespace dlgprov const OUString& URL, const css::uno::Reference< css::uno::XInterface >& xHandler, const css::uno::Reference< css::awt::XWindowPeer >& xParent, - bool bDialogProviderMode ) - throw (css::lang::IllegalArgumentException, css::uno::RuntimeException, std::exception); + bool bDialogProviderMode ); public: explicit DialogProviderImpl( @@ -119,38 +118,30 @@ namespace dlgprov virtual ~DialogProviderImpl() 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; // XInitialization - virtual void SAL_CALL initialize( const css::uno::Sequence< css::uno::Any >& aArguments ) - throw (css::uno::Exception, css::uno::RuntimeException, std::exception) override; + virtual void SAL_CALL initialize( const css::uno::Sequence< css::uno::Any >& aArguments ) override; // XDialogProvider virtual css::uno::Reference < css::awt::XDialog > SAL_CALL createDialog( - const OUString& URL ) - throw (css::lang::IllegalArgumentException, css::uno::RuntimeException, std::exception) override; + const OUString& URL ) override; // XDialogProvider2 virtual css::uno::Reference < css::awt::XDialog > SAL_CALL createDialogWithHandler( const OUString& URL, - const css::uno::Reference< css::uno::XInterface >& xHandler ) - throw (css::lang::IllegalArgumentException, css::uno::RuntimeException, std::exception) override; + const css::uno::Reference< css::uno::XInterface >& xHandler ) override; virtual css::uno::Reference < css::awt::XDialog > SAL_CALL createDialogWithArguments( const OUString& URL, - const css::uno::Sequence< css::beans::NamedValue >& Arguments ) - throw (css::lang::IllegalArgumentException, css::uno::RuntimeException, std::exception) override; + const css::uno::Sequence< css::beans::NamedValue >& Arguments ) override; virtual css::uno::Reference< css::awt::XWindow > SAL_CALL createContainerWindow( const OUString& URL, const OUString& WindowType, const css::uno::Reference< css::awt::XWindowPeer >& xParent, - const css::uno::Reference< css::uno::XInterface >& xHandler ) - throw (css::lang::IllegalArgumentException, css::uno::RuntimeException, std::exception) override; + const css::uno::Reference< css::uno::XInterface >& xHandler ) override; }; diff --git a/scripting/source/protocolhandler/scripthandler.cxx b/scripting/source/protocolhandler/scripthandler.cxx index 2dff3383e348..28064c02fe48 100644 --- a/scripting/source/protocolhandler/scripthandler.cxx +++ b/scripting/source/protocolhandler/scripthandler.cxx @@ -69,7 +69,6 @@ namespace scripting_protocolhandler void SAL_CALL ScriptProtocolHandler::initialize( const css::uno::Sequence < css::uno::Any >& aArguments ) - throw ( css::uno::Exception, std::exception ) { if ( m_bInitialised ) { @@ -90,7 +89,6 @@ void SAL_CALL ScriptProtocolHandler::initialize( Reference< XDispatch > SAL_CALL ScriptProtocolHandler::queryDispatch( const URL& aURL, const OUString& sTargetFrameName, sal_Int32 nSearchFlags ) - throw( css::uno::RuntimeException, std::exception ) { (void)sTargetFrameName; (void)nSearchFlags; @@ -115,7 +113,6 @@ Reference< XDispatch > SAL_CALL ScriptProtocolHandler::queryDispatch( Sequence< Reference< XDispatch > > SAL_CALL ScriptProtocolHandler::queryDispatches( const Sequence < DispatchDescriptor >& seqDescriptor ) -throw( RuntimeException, std::exception ) { sal_Int32 nCount = seqDescriptor.getLength(); Sequence< Reference< XDispatch > > lDispatcher( nCount ); @@ -131,7 +128,6 @@ throw( RuntimeException, std::exception ) void SAL_CALL ScriptProtocolHandler::dispatchWithNotification( const URL& aURL, const Sequence < PropertyValue >& lArgs, const Reference< XDispatchResultListener >& xListener ) - throw ( RuntimeException, std::exception ) { bool bSuccess = false; @@ -309,14 +305,12 @@ void SAL_CALL ScriptProtocolHandler::dispatchWithNotification( void SAL_CALL ScriptProtocolHandler::dispatch( const URL& aURL, const Sequence< PropertyValue >& lArgs ) -throw ( RuntimeException, std::exception ) { dispatchWithNotification( aURL, lArgs, Reference< XDispatchResultListener >() ); } void SAL_CALL ScriptProtocolHandler::addStatusListener( const Reference< XStatusListener >& xControl, const URL& aURL ) -throw ( RuntimeException, std::exception ) { (void)xControl; (void)aURL; @@ -326,7 +320,6 @@ throw ( RuntimeException, std::exception ) void SAL_CALL ScriptProtocolHandler::removeStatusListener( const Reference< XStatusListener >& xControl, const URL& aURL ) -throw ( RuntimeException, std::exception ) { (void)xControl; (void)aURL; @@ -440,21 +433,18 @@ ScriptProtocolHandler::~ScriptProtocolHandler() /* XServiceInfo */ OUString SAL_CALL ScriptProtocolHandler::getImplementationName( ) -throw( RuntimeException, std::exception ) { return impl_getStaticImplementationName(); } /* XServiceInfo */ sal_Bool SAL_CALL ScriptProtocolHandler::supportsService(const OUString& sServiceName ) -throw( RuntimeException, std::exception ) { return cppu::supportsService(this, sServiceName); } /* XServiceInfo */ Sequence< OUString > SAL_CALL ScriptProtocolHandler::getSupportedServiceNames() -throw( RuntimeException, std::exception ) { return impl_getStaticSupportedServiceNames(); } @@ -474,7 +464,6 @@ OUString ScriptProtocolHandler::impl_getStaticImplementationName() /* Helper for registry */ Reference< XInterface > SAL_CALL ScriptProtocolHandler::impl_createInstance( const Reference< css::lang::XMultiServiceFactory >& xServiceManager ) -throw( RuntimeException ) { return Reference< XInterface > ( *new ScriptProtocolHandler( comphelper::getComponentContext(xServiceManager) ) ); } diff --git a/scripting/source/protocolhandler/scripthandler.hxx b/scripting/source/protocolhandler/scripthandler.hxx index 70fe12843040..825f5ab75379 100644 --- a/scripting/source/protocolhandler/scripthandler.hxx +++ b/scripting/source/protocolhandler/scripthandler.hxx @@ -79,12 +79,9 @@ public: virtual ~ScriptProtocolHandler() override; /* XServiceInfo */ - virtual OUString SAL_CALL getImplementationName() - throw( css::uno::RuntimeException, std::exception ) override; - virtual sal_Bool SAL_CALL supportsService( const OUString& sServiceName ) - 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& sServiceName ) override; + virtual css::uno::Sequence < OUString > SAL_CALL getSupportedServiceNames() override; /* Helper for XServiceInfo */ static css::uno::Sequence < OUString > impl_getStaticSupportedServiceNames(); @@ -94,43 +91,36 @@ public: /// @throws css::uno::RuntimeException static css::uno::Reference < css::uno::XInterface > SAL_CALL impl_createInstance( - const css::uno::Reference< css::lang::XMultiServiceFactory >& xServiceManager ) - throw( css::uno::RuntimeException ); + const css::uno::Reference< css::lang::XMultiServiceFactory >& xServiceManager ); static css::uno::Reference < css::lang::XSingleServiceFactory > impl_createFactory( const css::uno::Reference< css::lang::XMultiServiceFactory >& xServiceManager ); /* Implementation for XDispatchProvider */ virtual css::uno::Reference < css::frame::XDispatch > SAL_CALL queryDispatch( const css::util::URL& aURL, const OUString& sTargetFrameName, - sal_Int32 eSearchFlags ) throw( css::uno::RuntimeException, std::exception ) override ; + sal_Int32 eSearchFlags ) override ; virtual css::uno::Sequence< css::uno::Reference < css::frame::XDispatch > > SAL_CALL queryDispatches( - const css::uno::Sequence < css::frame::DispatchDescriptor >& seqDescriptor ) - throw( css::uno::RuntimeException, std::exception ) override; + const css::uno::Sequence < css::frame::DispatchDescriptor >& seqDescriptor ) override; /* Implementation for X(Notifying)Dispatch */ virtual void SAL_CALL dispatchWithNotification( const css::util::URL& aURL, const css::uno::Sequence< css::beans::PropertyValue >& lArgs, - const css::uno::Reference< css::frame::XDispatchResultListener >& Listener ) - throw ( css::uno::RuntimeException, std::exception ) override; + const css::uno::Reference< css::frame::XDispatchResultListener >& Listener ) override; virtual void SAL_CALL dispatch( const css::util::URL& aURL, - const css::uno::Sequence< css::beans::PropertyValue >& lArgs ) - throw ( css::uno::RuntimeException, std::exception ) override; + const css::uno::Sequence< css::beans::PropertyValue >& lArgs ) override; virtual void SAL_CALL addStatusListener( const css::uno::Reference< css::frame::XStatusListener >& xControl, - const css::util::URL& aURL ) - throw ( css::uno::RuntimeException, std::exception ) override; + const css::util::URL& aURL ) override; virtual void SAL_CALL removeStatusListener( const css::uno::Reference< css::frame::XStatusListener >& xControl, - const css::util::URL& aURL ) - throw ( css::uno::RuntimeException, std::exception ) override; + const css::util::URL& aURL ) override; /* Implementation for XInitialization */ virtual void SAL_CALL initialize( - const css::uno::Sequence < css::uno::Any >& aArguments ) - throw ( css::uno::Exception, std::exception ) override; + const css::uno::Sequence < css::uno::Any >& aArguments ) override; }; } diff --git a/scripting/source/provider/ActiveMSPList.cxx b/scripting/source/provider/ActiveMSPList.cxx index 5859b4b6eef5..5ff52ea288d4 100644 --- a/scripting/source/provider/ActiveMSPList.cxx +++ b/scripting/source/provider/ActiveMSPList.cxx @@ -259,7 +259,6 @@ ActiveMSPList::addActiveMSP( const Reference< uno::XInterface >& xComponent, void SAL_CALL ActiveMSPList::disposing( const css::lang::EventObject& Source ) -throw ( css::uno::RuntimeException, std::exception ) { try diff --git a/scripting/source/provider/ActiveMSPList.hxx b/scripting/source/provider/ActiveMSPList.hxx index dffe00f4bb6b..0ce042baac07 100644 --- a/scripting/source/provider/ActiveMSPList.hxx +++ b/scripting/source/provider/ActiveMSPList.hxx @@ -72,8 +72,7 @@ public: //XEventListener - virtual void SAL_CALL disposing( const css::lang::EventObject& Source ) - throw ( css::uno::RuntimeException, std::exception ) override; + virtual void SAL_CALL disposing( const css::lang::EventObject& Source ) override; private: void addActiveMSP( const css::uno::Reference< css::uno::XInterface >& xComponent, diff --git a/scripting/source/provider/BrowseNodeFactoryImpl.cxx b/scripting/source/provider/BrowseNodeFactoryImpl.cxx index c6481a46d660..e74b9f90de99 100644 --- a/scripting/source/provider/BrowseNodeFactoryImpl.cxx +++ b/scripting/source/provider/BrowseNodeFactoryImpl.cxx @@ -72,15 +72,13 @@ public: } virtual OUString - SAL_CALL getName() - throw ( RuntimeException, std::exception ) override + SAL_CALL getName() override { return m_Name; } virtual Sequence< Reference< browse::XBrowseNode > > SAL_CALL - getChildNodes() - throw ( RuntimeException, std::exception ) override + getChildNodes() override { std::vector< Sequence< Reference < browse::XBrowseNode > > > seqs; seqs.reserve( m_Nodes.size() ); @@ -119,8 +117,7 @@ public: } virtual sal_Bool SAL_CALL - hasChildNodes() - throw ( RuntimeException, std::exception ) override + hasChildNodes() override { if ( !m_Nodes.empty() ) { @@ -144,8 +141,7 @@ public: return false; } - virtual sal_Int16 SAL_CALL getType() - throw ( RuntimeException, std::exception ) override + virtual sal_Int16 SAL_CALL getType() override { return browse::BrowseNodeTypes::CONTAINER; } @@ -194,15 +190,13 @@ public: // XBrowseNode - virtual OUString SAL_CALL getName() - throw ( RuntimeException, std::exception ) override + virtual OUString SAL_CALL getName() override { return m_sNodeName; } virtual Sequence< Reference< browse::XBrowseNode > > SAL_CALL - getChildNodes() - throw ( RuntimeException, std::exception ) override + getChildNodes() override { if ( m_hBNA == nullptr ) { @@ -222,14 +216,12 @@ public: return children; } - virtual sal_Bool SAL_CALL hasChildNodes() - throw ( RuntimeException, std::exception ) override + virtual sal_Bool SAL_CALL hasChildNodes() override { return true; } - virtual sal_Int16 SAL_CALL getType() - throw ( RuntimeException, std::exception ) override + virtual sal_Int16 SAL_CALL getType() override { return browse::BrowseNodeTypes::CONTAINER; } @@ -418,8 +410,7 @@ public: } virtual Sequence< Reference< browse::XBrowseNode > > SAL_CALL - getChildNodes() - throw ( RuntimeException, std::exception ) override + getChildNodes() override { if ( hasChildNodes() ) { @@ -452,29 +443,25 @@ public: } } - virtual sal_Int16 SAL_CALL getType() - throw ( RuntimeException, std::exception ) override + virtual sal_Int16 SAL_CALL getType() override { return m_xWrappedBrowseNode->getType(); } virtual OUString - SAL_CALL getName() - throw ( RuntimeException, std::exception ) override + SAL_CALL getName() override { return m_xWrappedBrowseNode->getName(); } virtual sal_Bool SAL_CALL - hasChildNodes() - throw ( RuntimeException, std::exception ) override + hasChildNodes() override { return m_xWrappedBrowseNode->hasChildNodes(); } // XInterface - virtual Any SAL_CALL queryInterface( const Type& aType ) - throw ( css::uno::RuntimeException, std::exception ) override + virtual Any SAL_CALL queryInterface( const Type& aType ) override { Any aRet = t_BrowseNodeBase::queryInterface( aType ); if ( aRet.hasValue() ) @@ -493,13 +480,11 @@ public: // XTypeProvider (implemnented by base, but needs to be overridden for // delegating to aggregate) - virtual Sequence< Type > SAL_CALL getTypes() - throw ( css::uno::RuntimeException, std::exception ) override + virtual Sequence< Type > SAL_CALL getTypes() override { return m_xWrappedTypeProv->getTypes(); } - virtual Sequence< sal_Int8 > SAL_CALL getImplementationId() - throw ( css::uno::RuntimeException, std::exception ) override + virtual Sequence< sal_Int8 > SAL_CALL getImplementationId() override { return css::uno::Sequence<sal_Int8>(); } @@ -527,8 +512,7 @@ public: } virtual Sequence< Reference< browse::XBrowseNode > > SAL_CALL - getChildNodes() - throw ( RuntimeException, std::exception ) override + getChildNodes() override { // no need to sort user, share, doc1...docN //::std::sort( m_vNodes.begin(), m_vNodes.end(), alphaSortForBNodes() ); @@ -541,22 +525,19 @@ public: return children; } - virtual sal_Int16 SAL_CALL getType() - throw ( RuntimeException, std::exception ) override + virtual sal_Int16 SAL_CALL getType() override { return browse::BrowseNodeTypes::ROOT; } virtual OUString - SAL_CALL getName() - throw ( RuntimeException, std::exception ) override + SAL_CALL getName() override { return m_Name; } virtual sal_Bool SAL_CALL - hasChildNodes() - throw ( RuntimeException, std::exception ) override + hasChildNodes() override { bool result = true; if ( m_vNodes.empty() ) @@ -580,15 +561,13 @@ public: { } - virtual OUString SAL_CALL getName() - throw ( RuntimeException, std::exception ) override + virtual OUString SAL_CALL getName() override { return OUString("Root"); } virtual Sequence< Reference< browse::XBrowseNode > > SAL_CALL - getChildNodes() - throw ( RuntimeException, std::exception ) override + getChildNodes() override { std::vector< Reference < browse::XBrowseNode > > locnBNs = getAllBrowseNodes( m_xComponentContext ); @@ -604,14 +583,12 @@ public: return children; } - virtual sal_Bool SAL_CALL hasChildNodes() - throw ( RuntimeException, std::exception ) override + virtual sal_Bool SAL_CALL hasChildNodes() override { return true; // will always be user and share } - virtual sal_Int16 SAL_CALL getType() - throw ( RuntimeException, std::exception ) override + virtual sal_Int16 SAL_CALL getType() override { return browse::BrowseNodeTypes::CONTAINER; } @@ -637,7 +614,6 @@ BrowseNodeFactoryImpl::~BrowseNodeFactoryImpl() */ Reference< browse::XBrowseNode > SAL_CALL BrowseNodeFactoryImpl::createView( sal_Int16 viewType ) - throw (RuntimeException, std::exception) { switch( viewType ) { @@ -652,7 +628,6 @@ BrowseNodeFactoryImpl::createView( sal_Int16 viewType ) Reference< browse::XBrowseNode > BrowseNodeFactoryImpl::getOrganizerHierarchy() - throw (RuntimeException) { Reference< browse::XBrowseNode > xRet = new DefaultRootBrowseNode( m_xComponentContext ); return xRet; @@ -693,20 +668,17 @@ bnf_create( Reference< XComponentContext > const & xComponentContext ) OUString SAL_CALL BrowseNodeFactoryImpl::getImplementationName() - throw (RuntimeException, std::exception) { return bnf_getImplementationName(); } Sequence< OUString > SAL_CALL BrowseNodeFactoryImpl::getSupportedServiceNames() - throw (RuntimeException, std::exception) { return bnf_getSupportedServiceNames(); } sal_Bool BrowseNodeFactoryImpl::supportsService(OUString const & serviceName ) - throw (RuntimeException, std::exception) { return cppu::supportsService(this, serviceName); } diff --git a/scripting/source/provider/BrowseNodeFactoryImpl.hxx b/scripting/source/provider/BrowseNodeFactoryImpl.hxx index db5f4a8ef233..45d0832f807c 100644 --- a/scripting/source/provider/BrowseNodeFactoryImpl.hxx +++ b/scripting/source/provider/BrowseNodeFactoryImpl.hxx @@ -51,26 +51,21 @@ public: css::uno::Reference< css::uno::XComponentContext > const & xComponentContext ); // XServiceInfo - virtual OUString SAL_CALL getImplementationName() - throw ( css::uno::RuntimeException, std::exception ) override; + virtual OUString SAL_CALL getImplementationName() override; virtual sal_Bool SAL_CALL - supportsService( OUString const & serviceName ) - throw ( css::uno::RuntimeException, std::exception ) override; + supportsService( OUString const & serviceName ) override; virtual css::uno::Sequence< OUString > SAL_CALL - getSupportedServiceNames() - throw ( css::uno::RuntimeException, std::exception ) override; + getSupportedServiceNames() override; // XBrowseNodeFactory virtual css::uno::Reference< css::script::browse::XBrowseNode > SAL_CALL - createView( sal_Int16 viewType ) - throw ( css::uno::RuntimeException, std::exception ) override; + createView( sal_Int16 viewType ) override; private: /// @throws css::uno::RuntimeException css::uno::Reference< css::script::browse::XBrowseNode > - getOrganizerHierarchy() - throw ( css::uno::RuntimeException ); + getOrganizerHierarchy(); }; diff --git a/scripting/source/provider/MasterScriptProvider.cxx b/scripting/source/provider/MasterScriptProvider.cxx index c18d278bfc1e..9eaca17f0bc9 100644 --- a/scripting/source/provider/MasterScriptProvider.cxx +++ b/scripting/source/provider/MasterScriptProvider.cxx @@ -72,7 +72,7 @@ bool endsWith( const OUString& target, // XScriptProvider implementation -MasterScriptProvider::MasterScriptProvider( const Reference< XComponentContext > & xContext ) throw ( RuntimeException ): +MasterScriptProvider::MasterScriptProvider( const Reference< XComponentContext > & xContext ): m_xContext( xContext ), m_bIsValid( false ), m_bInitialised( false ), m_bIsPkgMSP( false ), m_pPCache( nullptr ) { @@ -94,7 +94,6 @@ MasterScriptProvider::~MasterScriptProvider() void SAL_CALL MasterScriptProvider::initialize( const Sequence < Any >& args ) -throw ( Exception, RuntimeException, std::exception ) { if ( m_bInitialised ) return; @@ -229,8 +228,6 @@ void MasterScriptProvider::createPkgProvider() Reference< provider::XScript > MasterScriptProvider::getScript( const OUString& scriptURI ) -throw ( provider::ScriptFrameworkErrorException, - RuntimeException, std::exception ) { if ( !m_bIsValid ) { @@ -384,7 +381,6 @@ MasterScriptProvider::providerCache() OUString SAL_CALL MasterScriptProvider::getName() - throw ( css::uno::RuntimeException, std::exception ) { if ( !m_bIsPkgMSP ) { @@ -414,7 +410,6 @@ MasterScriptProvider::getName() Sequence< Reference< browse::XBrowseNode > > SAL_CALL MasterScriptProvider::getChildNodes() - throw ( css::uno::RuntimeException, std::exception ) { if ( !providerCache() ) throw RuntimeException( "MasterScriptProvider::getAllProviders, cache not initialised" ); @@ -445,7 +440,6 @@ MasterScriptProvider::getChildNodes() sal_Bool SAL_CALL MasterScriptProvider::hasChildNodes() - throw ( css::uno::RuntimeException, std::exception ) { return true; } @@ -453,7 +447,6 @@ MasterScriptProvider::hasChildNodes() sal_Int16 SAL_CALL MasterScriptProvider::getType() - throw ( css::uno::RuntimeException, std::exception ) { return browse::BrowseNodeTypes::CONTAINER; } @@ -474,7 +467,7 @@ MasterScriptProvider::parseLocationName( const OUString& location ) // Register Package void SAL_CALL -MasterScriptProvider::insertByName( const OUString& aName, const Any& aElement ) throw ( lang::IllegalArgumentException, container::ElementExistException, lang::WrappedTargetException, css::uno::RuntimeException, std::exception) +MasterScriptProvider::insertByName( const OUString& aName, const Any& aElement ) { if ( !m_bIsPkgMSP ) { @@ -553,7 +546,7 @@ MasterScriptProvider::insertByName( const OUString& aName, const Any& aElement ) // Revoke Package void SAL_CALL -MasterScriptProvider::removeByName( const OUString& Name ) throw ( container::NoSuchElementException, lang::WrappedTargetException, RuntimeException, std::exception) +MasterScriptProvider::removeByName( const OUString& Name ) { if ( !m_bIsPkgMSP ) { @@ -624,7 +617,7 @@ MasterScriptProvider::removeByName( const OUString& Name ) throw ( container::No void SAL_CALL -MasterScriptProvider::replaceByName( const OUString& aName, const Any& aElement ) throw ( lang::IllegalArgumentException, container::NoSuchElementException, lang::WrappedTargetException, RuntimeException, std::exception) +MasterScriptProvider::replaceByName( const OUString& aName, const Any& aElement ) { (void)aName; (void)aElement; @@ -637,7 +630,7 @@ MasterScriptProvider::replaceByName( const OUString& aName, const Any& aElement } Any SAL_CALL -MasterScriptProvider::getByName( const OUString& aName ) throw ( container::NoSuchElementException, lang::WrappedTargetException, RuntimeException, std::exception) +MasterScriptProvider::getByName( const OUString& aName ) { (void)aName; @@ -651,7 +644,7 @@ MasterScriptProvider::getByName( const OUString& aName ) throw ( container::NoSu } sal_Bool SAL_CALL -MasterScriptProvider::hasByName( const OUString& aName ) throw (RuntimeException, std::exception) +MasterScriptProvider::hasByName( const OUString& aName ) { bool result = false; if ( !m_bIsPkgMSP ) @@ -721,7 +714,7 @@ MasterScriptProvider::hasByName( const OUString& aName ) throw (RuntimeException Sequence< OUString > SAL_CALL -MasterScriptProvider::getElementNames( ) throw ( RuntimeException, std::exception) +MasterScriptProvider::getElementNames( ) { // TODO needs implementing Sequence< OUString > names; @@ -733,14 +726,14 @@ MasterScriptProvider::getElementNames( ) throw ( RuntimeException, std::excepti } Type SAL_CALL -MasterScriptProvider::getElementType( ) throw ( RuntimeException, std::exception) +MasterScriptProvider::getElementType( ) { // TODO needs implementing Type t; return t; } -sal_Bool SAL_CALL MasterScriptProvider::hasElements( ) throw ( RuntimeException, std::exception) +sal_Bool SAL_CALL MasterScriptProvider::hasElements( ) { // TODO needs implementing if ( true ) @@ -752,20 +745,17 @@ sal_Bool SAL_CALL MasterScriptProvider::hasElements( ) throw ( RuntimeException OUString SAL_CALL MasterScriptProvider::getImplementationName( ) -throw( RuntimeException, std::exception ) { return OUString( "com.sun.star.script.provider.MasterScriptProvider" ); } sal_Bool SAL_CALL MasterScriptProvider::supportsService( const OUString& serviceName ) -throw( RuntimeException, std::exception ) { return cppu::supportsService(this, serviceName); } Sequence< OUString > SAL_CALL MasterScriptProvider::getSupportedServiceNames( ) -throw( RuntimeException, std::exception ) { OUString names[3]; diff --git a/scripting/source/provider/MasterScriptProvider.hxx b/scripting/source/provider/MasterScriptProvider.hxx index 47ba9689ac8d..a77642587dd9 100644 --- a/scripting/source/provider/MasterScriptProvider.hxx +++ b/scripting/source/provider/MasterScriptProvider.hxx @@ -52,46 +52,37 @@ public: /// @throws css::uno::RuntimeException explicit MasterScriptProvider( const css::uno::Reference< css::uno::XComponentContext > - & xContext ) throw( css::uno::RuntimeException ); + & xContext ); virtual ~MasterScriptProvider() override; // XServiceInfo implementation - virtual OUString SAL_CALL getImplementationName( ) - throw( css::uno::RuntimeException, std::exception ) override; + virtual OUString SAL_CALL getImplementationName( ) override; // XBrowseNode implementation - virtual OUString SAL_CALL getName() - throw ( css::uno::RuntimeException, std::exception ) override; - virtual css::uno::Sequence< css::uno::Reference< css::script::browse::XBrowseNode > > SAL_CALL getChildNodes() - throw ( css::uno::RuntimeException, std::exception ) override; - virtual sal_Bool SAL_CALL hasChildNodes() - throw ( css::uno::RuntimeException, std::exception ) override; - virtual sal_Int16 SAL_CALL getType() - throw ( css::uno::RuntimeException, std::exception ) override; + virtual OUString SAL_CALL getName() override; + virtual css::uno::Sequence< css::uno::Reference< css::script::browse::XBrowseNode > > SAL_CALL getChildNodes() override; + virtual sal_Bool SAL_CALL hasChildNodes() override; + virtual sal_Int16 SAL_CALL getType() override; // 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 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 css::uno::Type SAL_CALL getElementType( ) override; + virtual sal_Bool SAL_CALL hasElements( ) override; + virtual sal_Bool SAL_CALL supportsService( const OUString& ServiceName ) override; + virtual css::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames( ) override; // XScriptProvider implementation virtual css::uno::Reference < css::script::provider::XScript > SAL_CALL - getScript( const OUString& scriptURI ) - throw( css::script::provider::ScriptFrameworkErrorException, - css::uno::RuntimeException, std::exception ) override; + getScript( const OUString& scriptURI ) override; /** * XInitialise implementation @@ -99,8 +90,7 @@ public: * @param args expected to contain a single OUString * containing the URI */ - virtual void SAL_CALL initialize( const css::uno::Sequence < css::uno::Any > & args ) - throw ( css::uno::Exception, css::uno::RuntimeException, std::exception) override; + virtual void SAL_CALL initialize( const css::uno::Sequence < css::uno::Any > & args ) override; // returns context string for this provider, eg const OUString& getContextString() { return m_sCtxString; } diff --git a/scripting/source/provider/MasterScriptProviderFactory.cxx b/scripting/source/provider/MasterScriptProviderFactory.cxx index d2d4493c0d35..a805015d0c3e 100644 --- a/scripting/source/provider/MasterScriptProviderFactory.cxx +++ b/scripting/source/provider/MasterScriptProviderFactory.cxx @@ -44,7 +44,7 @@ MasterScriptProviderFactory::~MasterScriptProviderFactory() } Reference< provider::XScriptProvider > SAL_CALL -MasterScriptProviderFactory::createScriptProvider( const Any& context ) throw ( lang::IllegalArgumentException, RuntimeException, std::exception) +MasterScriptProviderFactory::createScriptProvider( const Any& context ) { Reference< provider::XScriptProvider > xMsp( getActiveMSPList() ->getMSPFromAnyContext( context ), UNO_QUERY_THROW ); return xMsp; @@ -84,20 +84,17 @@ mspf_create( Reference< XComponentContext > const & xComponentContext ) } OUString SAL_CALL MasterScriptProviderFactory::getImplementationName() - throw (RuntimeException, std::exception) { return mspf_getImplementationName(); } Sequence< OUString > SAL_CALL MasterScriptProviderFactory::getSupportedServiceNames() - throw (RuntimeException, std::exception) { return mspf_getSupportedServiceNames(); } sal_Bool MasterScriptProviderFactory::supportsService( OUString const & serviceName ) - throw (RuntimeException, std::exception) { return cppu::supportsService(this, serviceName); } diff --git a/scripting/source/provider/MasterScriptProviderFactory.hxx b/scripting/source/provider/MasterScriptProviderFactory.hxx index 7a5245a30268..833e079e7f96 100644 --- a/scripting/source/provider/MasterScriptProviderFactory.hxx +++ b/scripting/source/provider/MasterScriptProviderFactory.hxx @@ -58,21 +58,17 @@ public: css::uno::Reference< css::uno::XComponentContext > const & xComponentContext ); // XServiceInfo - virtual OUString SAL_CALL getImplementationName() - throw ( css::uno::RuntimeException, std::exception ) override; + virtual OUString SAL_CALL getImplementationName() override; virtual sal_Bool SAL_CALL - supportsService( OUString const & serviceName ) - throw ( css::uno::RuntimeException, std::exception ) override; + supportsService( OUString const & serviceName ) override; virtual css::uno::Sequence< OUString > SAL_CALL - getSupportedServiceNames() - throw ( css::uno::RuntimeException, std::exception ) override; + getSupportedServiceNames() override; // XScriptProviderFactory virtual css::uno::Reference< css::script::provider::XScriptProvider > - SAL_CALL createScriptProvider( const css::uno::Any& context ) - throw ( css::lang::IllegalArgumentException, css::uno::RuntimeException, std::exception) override; + SAL_CALL createScriptProvider( const css::uno::Any& context ) override; }; diff --git a/scripting/source/provider/ProviderCache.cxx b/scripting/source/provider/ProviderCache.cxx index 57a2f924fbbe..65b4fa4f5f02 100644 --- a/scripting/source/provider/ProviderCache.cxx +++ b/scripting/source/provider/ProviderCache.cxx @@ -31,8 +31,7 @@ using namespace com::sun::star::script; namespace func_provider { -ProviderCache::ProviderCache( const Reference< XComponentContext >& xContext, const Sequence< Any >& scriptContext ) - throw ( RuntimeException ) : m_Sctx( scriptContext ), m_xContext( xContext ) +ProviderCache::ProviderCache( const Reference< XComponentContext >& xContext, const Sequence< Any >& scriptContext ) : m_Sctx( scriptContext ), m_xContext( xContext ) { // initialise m_hProviderDetailsCache with details of ScriptProviders // will use createContentEnumeration @@ -43,8 +42,7 @@ ProviderCache::ProviderCache( const Reference< XComponentContext >& xContext, co } -ProviderCache::ProviderCache( const Reference< XComponentContext >& xContext, const Sequence< Any >& scriptContext, const Sequence< OUString >& blackList ) - throw ( RuntimeException ) : m_sBlackList( blackList ), m_Sctx( scriptContext ), m_xContext( xContext ) +ProviderCache::ProviderCache( const Reference< XComponentContext >& xContext, const Sequence< Any >& scriptContext, const Sequence< OUString >& blackList ) : m_sBlackList( blackList ), m_Sctx( scriptContext ), m_xContext( xContext ) { // initialise m_hProviderDetailsCache with details of ScriptProviders @@ -81,7 +79,7 @@ ProviderCache::getProvider( const OUString& providerName ) } Sequence < Reference< provider::XScriptProvider > > -ProviderCache::getAllProviders() throw ( RuntimeException ) +ProviderCache::getAllProviders() { // need to create providers that haven't been created already // so check what providers exist and what ones don't @@ -131,7 +129,7 @@ ProviderCache::getAllProviders() throw ( RuntimeException ) } void -ProviderCache::populateCache() throw ( RuntimeException ) +ProviderCache::populateCache() { // wrong name in services.rdb OUString serviceName; @@ -179,7 +177,7 @@ ProviderCache::populateCache() throw ( RuntimeException ) } Reference< provider::XScriptProvider > -ProviderCache::createProvider( ProviderDetails& details ) throw ( RuntimeException ) +ProviderCache::createProvider( ProviderDetails& details ) { try { diff --git a/scripting/source/provider/ProviderCache.hxx b/scripting/source/provider/ProviderCache.hxx index 967f50cef269..7aacf487fb54 100644 --- a/scripting/source/provider/ProviderCache.hxx +++ b/scripting/source/provider/ProviderCache.hxx @@ -53,26 +53,23 @@ class ProviderCache public: /// @throws css::uno::RuntimeException - ProviderCache( const css::uno::Reference< css::uno::XComponentContext >& xContext, const css::uno::Sequence< css::uno::Any >& scriptContext ) - throw ( css::uno::RuntimeException ); + ProviderCache( const css::uno::Reference< css::uno::XComponentContext >& xContext, const css::uno::Sequence< css::uno::Any >& scriptContext ); /// @throws css::uno::RuntimeException ProviderCache( const css::uno::Reference< css::uno::XComponentContext >& xContext, const css::uno::Sequence< css::uno::Any >& scriptContext, - const css::uno::Sequence< OUString >& blackList ) - throw ( css::uno::RuntimeException ); + const css::uno::Sequence< OUString >& blackList ); ~ProviderCache(); css::uno::Reference< css::script::provider::XScriptProvider > getProvider( const OUString& providerName ); /// @throws css::uno::RuntimeException css::uno::Sequence < css::uno::Reference< css::script::provider::XScriptProvider > > - getAllProviders() throw ( css::uno::RuntimeException ); + getAllProviders(); private: /// @throws css::uno::RuntimeException - void populateCache() - throw ( css::uno::RuntimeException ); + void populateCache(); /// @throws css::uno::RuntimeException css::uno::Reference< css::script::provider::XScriptProvider > - createProvider( ProviderDetails& details ) throw ( css::uno::RuntimeException ); + createProvider( ProviderDetails& details ); bool isInBlackList( const OUString& serviceName ) { if ( m_sBlackList.getLength() > 0 ) diff --git a/scripting/source/provider/URIHelper.cxx b/scripting/source/provider/URIHelper.cxx index f205e6cb3582..233f0021ecab 100644 --- a/scripting/source/provider/URIHelper.cxx +++ b/scripting/source/provider/URIHelper.cxx @@ -47,7 +47,6 @@ static const char USER_URI[] = ScriptingFrameworkURIHelper::ScriptingFrameworkURIHelper( const uno::Reference< uno::XComponentContext >& xContext) - throw( uno::RuntimeException ) { try { @@ -76,7 +75,6 @@ ScriptingFrameworkURIHelper::~ScriptingFrameworkURIHelper() void SAL_CALL ScriptingFrameworkURIHelper::initialize( const uno::Sequence < uno::Any >& args ) -throw ( uno::Exception, uno::RuntimeException, std::exception ) { if ( args.getLength() != 2 || args[0].getValueType() != ::cppu::UnoType<OUString>::get() || @@ -194,7 +192,6 @@ ScriptingFrameworkURIHelper::getLanguagePath(const OUString& rLanguagePart) OUString SAL_CALL ScriptingFrameworkURIHelper::getScriptURI(const OUString& rStorageURI) - throw( lang::IllegalArgumentException, uno::RuntimeException, std::exception ) { OUStringBuffer buf(120); @@ -210,7 +207,6 @@ ScriptingFrameworkURIHelper::getScriptURI(const OUString& rStorageURI) OUString SAL_CALL ScriptingFrameworkURIHelper::getStorageURI(const OUString& rScriptURI) - throw( lang::IllegalArgumentException, uno::RuntimeException, std::exception ) { OUString sLanguagePart; try @@ -238,14 +234,12 @@ ScriptingFrameworkURIHelper::getStorageURI(const OUString& rScriptURI) OUString SAL_CALL ScriptingFrameworkURIHelper::getRootStorageURI() - throw( uno::RuntimeException, std::exception ) { return m_sBaseURI; } OUString SAL_CALL ScriptingFrameworkURIHelper::getImplementationName() - throw( uno::RuntimeException, std::exception ) { return OUString( "com.sun.star.script.provider.ScriptURIHelper" ); @@ -253,14 +247,12 @@ ScriptingFrameworkURIHelper::getImplementationName() sal_Bool SAL_CALL ScriptingFrameworkURIHelper::supportsService( const OUString& serviceName ) - throw( uno::RuntimeException, std::exception ) { return cppu::supportsService( this, serviceName ); } uno::Sequence< OUString > SAL_CALL ScriptingFrameworkURIHelper::getSupportedServiceNames() - throw( uno::RuntimeException, std::exception ) { OUString serviceNameList[] = { OUString( diff --git a/scripting/source/provider/URIHelper.hxx b/scripting/source/provider/URIHelper.hxx index 5cd5a3c7e47d..b1d26b572cd8 100644 --- a/scripting/source/provider/URIHelper.hxx +++ b/scripting/source/provider/URIHelper.hxx @@ -58,40 +58,30 @@ private: public: /// @throws css::uno::RuntimeException explicit ScriptingFrameworkURIHelper( - const css::uno::Reference< css::uno::XComponentContext >& xContext ) - throw( css::uno::RuntimeException ); + const css::uno::Reference< css::uno::XComponentContext >& xContext ); virtual ~ScriptingFrameworkURIHelper() override; virtual void SAL_CALL - initialize( const css::uno::Sequence < css::uno::Any > & args ) - throw ( css::uno::Exception, css::uno::RuntimeException, std::exception) override; + initialize( const css::uno::Sequence < css::uno::Any > & args ) override; virtual OUString SAL_CALL - getRootStorageURI() - throw ( css::uno::RuntimeException, std::exception ) override; + getRootStorageURI() override; virtual OUString SAL_CALL - getScriptURI( const OUString& rStorageURI ) - throw( css::lang::IllegalArgumentException, - css::uno::RuntimeException, std::exception ) override; + getScriptURI( const OUString& rStorageURI ) override; virtual OUString SAL_CALL - getStorageURI( const OUString& rScriptURI ) - throw( css::lang::IllegalArgumentException, - css::uno::RuntimeException, std::exception ) override; + getStorageURI( const OUString& rScriptURI ) override; virtual OUString SAL_CALL - getImplementationName() - throw( css::uno::RuntimeException, std::exception ) override; + getImplementationName() override; virtual sal_Bool SAL_CALL - supportsService( const OUString& ServiceName ) - throw( css::uno::RuntimeException, std::exception ) override; + supportsService( const OUString& ServiceName ) override; virtual css::uno::Sequence< OUString > SAL_CALL - getSupportedServiceNames() - throw( css::uno::RuntimeException, std::exception ) override; + getSupportedServiceNames() override; }; } // namespace func_provider diff --git a/scripting/source/stringresource/stringresource.cxx b/scripting/source/stringresource/stringresource.cxx index 49f7f823d451..190fabdde719 100644 --- a/scripting/source/stringresource/stringresource.cxx +++ b/scripting/source/stringresource/stringresource.cxx @@ -124,17 +124,17 @@ StringResourceImpl::~StringResourceImpl() // XServiceInfo -OUString StringResourceImpl::getImplementationName( ) throw (RuntimeException, std::exception) +OUString StringResourceImpl::getImplementationName( ) { return getImplementationName_StringResourceImpl(); } -sal_Bool StringResourceImpl::supportsService( const OUString& rServiceName ) throw (RuntimeException, std::exception) +sal_Bool StringResourceImpl::supportsService( const OUString& rServiceName ) { return cppu::supportsService(this, rServiceName); } -Sequence< OUString > StringResourceImpl::getSupportedServiceNames( ) throw (RuntimeException, std::exception) +Sequence< OUString > StringResourceImpl::getSupportedServiceNames( ) { return getSupportedServiceNames_StringResourceImpl(); } @@ -143,7 +143,6 @@ Sequence< OUString > StringResourceImpl::getSupportedServiceNames( ) throw (Run // XModifyBroadcaster void StringResourceImpl::addModifyListener( const Reference< XModifyListener >& aListener ) - throw (RuntimeException, std::exception) { if( !aListener.is() ) throw RuntimeException(); @@ -153,7 +152,6 @@ void StringResourceImpl::addModifyListener( const Reference< XModifyListener >& } void StringResourceImpl::removeModifyListener( const Reference< XModifyListener >& aListener ) - throw (RuntimeException, std::exception) { if( !aListener.is() ) throw RuntimeException(); @@ -167,7 +165,6 @@ void StringResourceImpl::removeModifyListener( const Reference< XModifyListener OUString StringResourceImpl::implResolveString ( const OUString& ResourceID, LocaleItem* pLocaleItem ) - throw (css::resource::MissingResourceException) { OUString aRetStr; bool bSuccess = false; @@ -190,14 +187,12 @@ OUString StringResourceImpl::implResolveString } OUString StringResourceImpl::resolveString( const OUString& ResourceID ) - throw (css::resource::MissingResourceException, RuntimeException, std::exception) { ::osl::MutexGuard aGuard( getMutex() ); return implResolveString( ResourceID, m_pCurrentLocaleItem ); } OUString StringResourceImpl::resolveStringForLocale( const OUString& ResourceID, const Locale& locale ) - throw ( css::resource::MissingResourceException, RuntimeException, std::exception) { ::osl::MutexGuard aGuard( getMutex() ); LocaleItem* pLocaleItem = getItemForLocale( locale, false ); @@ -217,7 +212,6 @@ bool StringResourceImpl::implHasEntryForId( const OUString& ResourceID, LocaleIt } sal_Bool StringResourceImpl::hasEntryForId( const OUString& ResourceID ) - throw (RuntimeException, std::exception) { ::osl::MutexGuard aGuard( getMutex() ); return implHasEntryForId( ResourceID, m_pCurrentLocaleItem ); @@ -225,7 +219,6 @@ sal_Bool StringResourceImpl::hasEntryForId( const OUString& ResourceID ) sal_Bool StringResourceImpl::hasEntryForIdAndLocale( const OUString& ResourceID, const Locale& locale ) - throw (RuntimeException, std::exception) { ::osl::MutexGuard aGuard( getMutex() ); LocaleItem* pLocaleItem = getItemForLocale( locale, false ); @@ -255,7 +248,7 @@ Sequence< OUString > StringResourceImpl::implGetResourceIDs( LocaleItem* pLocale } Sequence< OUString > StringResourceImpl::getResourceIDsForLocale - ( const Locale& locale ) throw (css::uno::RuntimeException, std::exception) + ( const Locale& locale ) { ::osl::MutexGuard aGuard( getMutex() ); LocaleItem* pLocaleItem = getItemForLocale( locale, false ); @@ -263,14 +256,12 @@ Sequence< OUString > StringResourceImpl::getResourceIDsForLocale } Sequence< OUString > StringResourceImpl::getResourceIDs( ) - throw (RuntimeException, std::exception) { ::osl::MutexGuard aGuard( getMutex() ); return implGetResourceIDs( m_pCurrentLocaleItem ); } Locale StringResourceImpl::getCurrentLocale() - throw (RuntimeException, std::exception) { ::osl::MutexGuard aGuard( getMutex() ); @@ -281,7 +272,6 @@ Locale StringResourceImpl::getCurrentLocale() } Locale StringResourceImpl::getDefaultLocale( ) - throw (RuntimeException, std::exception) { ::osl::MutexGuard aGuard( getMutex() ); @@ -292,7 +282,6 @@ Locale StringResourceImpl::getDefaultLocale( ) } Sequence< Locale > StringResourceImpl::getLocales( ) - throw (RuntimeException, std::exception) { ::osl::MutexGuard aGuard( getMutex() ); @@ -313,7 +302,6 @@ Sequence< Locale > StringResourceImpl::getLocales( ) // XStringResourceManager void StringResourceImpl::implCheckReadOnly( const sal_Char* pExceptionMsg ) - throw (NoSupportException) { if( m_bReadOnly ) { @@ -323,14 +311,12 @@ void StringResourceImpl::implCheckReadOnly( const sal_Char* pExceptionMsg ) } sal_Bool StringResourceImpl::isReadOnly() - throw (RuntimeException, std::exception) { return m_bReadOnly; } void StringResourceImpl::implSetCurrentLocale( const Locale& locale, bool FindClosestMatch, bool bUseDefaultIfNoMatch ) - throw (IllegalArgumentException, RuntimeException) { ::osl::MutexGuard aGuard( getMutex() ); @@ -354,14 +340,12 @@ void StringResourceImpl::implSetCurrentLocale( const Locale& locale, } void StringResourceImpl::setCurrentLocale( const Locale& locale, sal_Bool FindClosestMatch ) - throw (IllegalArgumentException, RuntimeException, std::exception) { bool bUseDefaultIfNoMatch = false; implSetCurrentLocale( locale, FindClosestMatch, bUseDefaultIfNoMatch ); } void StringResourceImpl::setDefaultLocale( const Locale& locale ) - throw (IllegalArgumentException, RuntimeException,NoSupportException, std::exception) { ::osl::MutexGuard aGuard( getMutex() ); implCheckReadOnly( "StringResourceImpl::setDefaultLocale(): Read only" ); @@ -403,7 +387,6 @@ void StringResourceImpl::implSetString( const OUString& ResourceID, } void StringResourceImpl::setString( const OUString& ResourceID, const OUString& Str ) - throw (NoSupportException, RuntimeException, std::exception) { ::osl::MutexGuard aGuard( getMutex() ); implCheckReadOnly( "StringResourceImpl::setString(): Read only" ); @@ -412,7 +395,6 @@ void StringResourceImpl::setString( const OUString& ResourceID, const OUString& void StringResourceImpl::setStringForLocale ( const OUString& ResourceID, const OUString& Str, const Locale& locale ) - throw (NoSupportException, RuntimeException, std::exception) { ::osl::MutexGuard aGuard( getMutex() ); implCheckReadOnly( "StringResourceImpl::setStringForLocale(): Read only" ); @@ -421,7 +403,6 @@ void StringResourceImpl::setStringForLocale } void StringResourceImpl::implRemoveId( const OUString& ResourceID, LocaleItem* pLocaleItem ) - throw (css::resource::MissingResourceException) { if( pLocaleItem != nullptr && loadLocale( pLocaleItem ) ) { @@ -440,7 +421,6 @@ void StringResourceImpl::implRemoveId( const OUString& ResourceID, LocaleItem* p } void StringResourceImpl::removeId( const OUString& ResourceID ) - throw (css::resource::MissingResourceException, RuntimeException, NoSupportException, std::exception) { ::osl::MutexGuard aGuard( getMutex() ); implCheckReadOnly( "StringResourceImpl::removeId(): Read only" ); @@ -448,7 +428,6 @@ void StringResourceImpl::removeId( const OUString& ResourceID ) } void StringResourceImpl::removeIdForLocale( const OUString& ResourceID, const Locale& locale ) - throw (css::resource::MissingResourceException, RuntimeException, NoSupportException, std::exception) { ::osl::MutexGuard aGuard( getMutex() ); implCheckReadOnly( "StringResourceImpl::removeIdForLocale(): Read only" ); @@ -457,7 +436,6 @@ void StringResourceImpl::removeIdForLocale( const OUString& ResourceID, const Lo } void StringResourceImpl::newLocale( const Locale& locale ) - throw (ElementExistException, IllegalArgumentException, RuntimeException, NoSupportException, std::exception) { ::osl::MutexGuard aGuard( getMutex() ); implCheckReadOnly( "StringResourceImpl::newLocale(): Read only" ); @@ -520,7 +498,6 @@ void StringResourceImpl::newLocale( const Locale& locale ) } void StringResourceImpl::removeLocale( const Locale& locale ) - throw (IllegalArgumentException, RuntimeException, NoSupportException, std::exception) { ::osl::MutexGuard aGuard( getMutex() ); implCheckReadOnly( "StringResourceImpl::removeLocale(): Read only" ); @@ -609,7 +586,6 @@ void StringResourceImpl::implScanIdForNumber( const OUString& ResourceID ) } sal_Int32 StringResourceImpl::getUniqueNumericId( ) - throw (RuntimeException, NoSupportException, std::exception) { if( m_nNextUniqueNumericId == UNIQUE_NUMBER_NEEDS_INITIALISATION ) { @@ -630,7 +606,6 @@ sal_Int32 StringResourceImpl::getUniqueNumericId( ) LocaleItem* StringResourceImpl::getItemForLocale ( const Locale& locale, bool bException ) - throw (css::lang::IllegalArgumentException) { LocaleItem* pRetItem = nullptr; @@ -740,21 +715,18 @@ StringResourcePersistenceImpl::~StringResourcePersistenceImpl() OUString StringResourcePersistenceImpl::getImplementationName( ) - throw (RuntimeException, std::exception) { return OUString( "com.sun.star.comp.scripting.StringResource"); } sal_Bool StringResourcePersistenceImpl::supportsService( const OUString& rServiceName ) - throw (RuntimeException, std::exception) { return cppu::supportsService( this, rServiceName ); } Sequence< OUString > StringResourcePersistenceImpl::getSupportedServiceNames( ) - throw (RuntimeException, std::exception) { return StringResourceImpl::getSupportedServiceNames(); } @@ -767,7 +739,6 @@ static const char aNameBaseDefaultStr[] = "strings"; void StringResourcePersistenceImpl::implInitializeCommonParameters ( const Sequence< Any >& aArguments ) - throw (Exception, RuntimeException) { bool bReadOnlyOk = (aArguments[1] >>= m_bReadOnly); if( !bReadOnlyOk ) @@ -812,113 +783,93 @@ void StringResourcePersistenceImpl::implInitializeCommonParameters // XModifyBroadcaster void StringResourcePersistenceImpl::addModifyListener( const Reference< XModifyListener >& aListener ) - throw (RuntimeException, std::exception) { StringResourceImpl::addModifyListener( aListener ); } void StringResourcePersistenceImpl::removeModifyListener( const Reference< XModifyListener >& aListener ) - throw (RuntimeException, std::exception) { StringResourceImpl::removeModifyListener( aListener ); } // XStringResourceResolver OUString StringResourcePersistenceImpl::resolveString( const OUString& ResourceID ) - throw (css::resource::MissingResourceException, RuntimeException, std::exception) { return StringResourceImpl::resolveString( ResourceID ) ; } OUString StringResourcePersistenceImpl::resolveStringForLocale( const OUString& ResourceID, const Locale& locale ) - throw ( css::resource::MissingResourceException, RuntimeException, std::exception) { return StringResourceImpl::resolveStringForLocale( ResourceID, locale ); } sal_Bool StringResourcePersistenceImpl::hasEntryForId( const OUString& ResourceID ) - throw (RuntimeException, std::exception) { return StringResourceImpl::hasEntryForId( ResourceID ) ; } sal_Bool StringResourcePersistenceImpl::hasEntryForIdAndLocale( const OUString& ResourceID, const Locale& locale ) - throw (RuntimeException, std::exception) { return StringResourceImpl::hasEntryForIdAndLocale( ResourceID, locale ); } Locale StringResourcePersistenceImpl::getCurrentLocale() - throw (RuntimeException, std::exception) { return StringResourceImpl::getCurrentLocale(); } Locale StringResourcePersistenceImpl::getDefaultLocale( ) - throw (RuntimeException, std::exception) { return StringResourceImpl::getDefaultLocale(); } Sequence< Locale > StringResourcePersistenceImpl::getLocales( ) - throw (RuntimeException, std::exception) { return StringResourceImpl::getLocales(); } // XStringResourceManager sal_Bool StringResourcePersistenceImpl::isReadOnly() - throw (RuntimeException, std::exception) { return StringResourceImpl::isReadOnly(); } void StringResourcePersistenceImpl::setCurrentLocale( const Locale& locale, sal_Bool FindClosestMatch ) - throw (IllegalArgumentException, RuntimeException, std::exception) { StringResourceImpl::setCurrentLocale( locale, FindClosestMatch ); } void StringResourcePersistenceImpl::setDefaultLocale( const Locale& locale ) - throw (IllegalArgumentException, RuntimeException,NoSupportException, std::exception) { StringResourceImpl::setDefaultLocale( locale ); } Sequence< OUString > StringResourcePersistenceImpl::getResourceIDs( ) - throw (RuntimeException, std::exception) { return StringResourceImpl::getResourceIDs(); } void StringResourcePersistenceImpl::setString( const OUString& ResourceID, const OUString& Str ) - throw (NoSupportException, RuntimeException, std::exception) { StringResourceImpl::setString( ResourceID, Str ); } void StringResourcePersistenceImpl::setStringForLocale ( const OUString& ResourceID, const OUString& Str, const Locale& locale ) - throw (NoSupportException, RuntimeException, std::exception) { StringResourceImpl::setStringForLocale( ResourceID, Str, locale ); } Sequence< OUString > StringResourcePersistenceImpl::getResourceIDsForLocale - ( const Locale& locale ) throw (css::uno::RuntimeException, std::exception) + ( const Locale& locale ) { return StringResourceImpl::getResourceIDsForLocale( locale ); } void StringResourcePersistenceImpl::removeId( const OUString& ResourceID ) - throw (css::resource::MissingResourceException, RuntimeException, NoSupportException, std::exception) { StringResourceImpl::removeId( ResourceID ); } void StringResourcePersistenceImpl::removeIdForLocale( const OUString& ResourceID, const Locale& locale ) - throw (css::resource::MissingResourceException, RuntimeException, NoSupportException, std::exception) { StringResourceImpl::removeIdForLocale( ResourceID, locale ); } void StringResourcePersistenceImpl::newLocale( const Locale& locale ) - throw (ElementExistException, IllegalArgumentException, RuntimeException, NoSupportException, std::exception) { StringResourceImpl::newLocale( locale ); } void StringResourcePersistenceImpl::removeLocale( const Locale& locale ) - throw (IllegalArgumentException, RuntimeException, NoSupportException, std::exception) { StringResourceImpl::removeLocale( locale ); } sal_Int32 StringResourcePersistenceImpl::getUniqueNumericId( ) - throw (RuntimeException, NoSupportException, std::exception) { return StringResourceImpl::getUniqueNumericId(); } @@ -927,12 +878,10 @@ sal_Int32 StringResourcePersistenceImpl::getUniqueNumericId( ) // XStringResourcePersistence void StringResourcePersistenceImpl::store() - throw (NoSupportException, Exception, RuntimeException, std::exception) { } sal_Bool StringResourcePersistenceImpl::isModified( ) - throw (RuntimeException, std::exception) { ::osl::MutexGuard aGuard( getMutex() ); @@ -940,14 +889,12 @@ sal_Bool StringResourcePersistenceImpl::isModified( ) } void StringResourcePersistenceImpl::setComment( const OUString& Comment ) - throw (css::uno::RuntimeException, std::exception) { m_aComment = Comment; } void StringResourcePersistenceImpl::storeToStorage( const Reference< XStorage >& Storage, const OUString& NameBase, const OUString& Comment ) - throw (Exception, RuntimeException, std::exception) { ::osl::MutexGuard aGuard( getMutex() ); @@ -964,7 +911,6 @@ void StringResourcePersistenceImpl::implStoreAtStorage bool bUsedForStore, bool bStoreAll ) - throw (Exception, RuntimeException, std::exception) { // Delete files for deleted locales if( bUsedForStore ) @@ -1072,7 +1018,6 @@ void StringResourcePersistenceImpl::implStoreAtStorage void StringResourcePersistenceImpl::storeToURL( const OUString& URL, const OUString& NameBase, const OUString& Comment, const Reference< css::task::XInteractionHandler >& Handler ) - throw (Exception, RuntimeException, std::exception) { ::osl::MutexGuard aGuard( getMutex() ); @@ -1092,7 +1037,6 @@ void StringResourcePersistenceImpl::implKillRemovedLocaleFiles const OUString& aNameBase, const css::uno::Reference< css::ucb::XSimpleFileAccess3 >& xFileAccess ) - throw (Exception, RuntimeException, std::exception) { // Delete files for deleted locales while( m_aDeletedLocaleItemVector.size() > 0 ) @@ -1118,7 +1062,6 @@ void StringResourcePersistenceImpl::implKillChangedDefaultFiles const OUString& aNameBase, const css::uno::Reference< css::ucb::XSimpleFileAccess3 >& xFileAccess ) - throw (Exception, RuntimeException, std::exception) { // Delete files for changed defaults for( LocaleItemVectorIt it = m_aChangedDefaultLocaleVector.begin(); @@ -1148,7 +1091,6 @@ void StringResourcePersistenceImpl::implStoreAtLocation bool bStoreAll, bool bKillAll ) - throw (Exception, RuntimeException, std::exception) { // Delete files for deleted locales if( bUsedForStore || bKillAll ) @@ -1339,7 +1281,6 @@ Sequence< ::sal_Int8 > BinaryOutput::closeAndGetData() // pos3 Properties file written by implWritePropertiesFile Sequence< sal_Int8 > StringResourcePersistenceImpl::exportBinary( ) - throw (RuntimeException, std::exception) { BinaryOutput aOut( m_xContext ); @@ -1546,7 +1487,6 @@ OUString BinaryInput::readString() } void StringResourcePersistenceImpl::importBinary( const Sequence< ::sal_Int8 >& Data ) - throw (IllegalArgumentException, RuntimeException, std::exception) { // Init: Remove all locales sal_Int32 nOldLocaleCount = 0; @@ -2239,17 +2179,17 @@ StringResourceWithStorageImpl::~StringResourceWithStorageImpl() // XServiceInfo -OUString StringResourceWithStorageImpl::getImplementationName( ) throw (RuntimeException, std::exception) +OUString StringResourceWithStorageImpl::getImplementationName( ) { return getImplementationName_StringResourceWithStorageImpl(); } -sal_Bool StringResourceWithStorageImpl::supportsService( const OUString& rServiceName ) throw (RuntimeException, std::exception) +sal_Bool StringResourceWithStorageImpl::supportsService( const OUString& rServiceName ) { return cppu::supportsService(this, rServiceName); } -Sequence< OUString > StringResourceWithStorageImpl::getSupportedServiceNames( ) throw (RuntimeException, std::exception) +Sequence< OUString > StringResourceWithStorageImpl::getSupportedServiceNames( ) { return getSupportedServiceNames_StringResourceWithStorageImpl(); } @@ -2259,7 +2199,6 @@ Sequence< OUString > StringResourceWithStorageImpl::getSupportedServiceNames( ) void StringResourceWithStorageImpl::initialize( const Sequence< Any >& aArguments ) - throw (Exception, RuntimeException, std::exception) { ::osl::MutexGuard aGuard( getMutex() ); @@ -2287,120 +2226,99 @@ void StringResourceWithStorageImpl::initialize( const Sequence< Any >& aArgument // XModifyBroadcaster void StringResourceWithStorageImpl::addModifyListener( const Reference< XModifyListener >& aListener ) - throw (RuntimeException, std::exception) { StringResourceImpl::addModifyListener( aListener ); } void StringResourceWithStorageImpl::removeModifyListener( const Reference< XModifyListener >& aListener ) - throw (RuntimeException, std::exception) { StringResourceImpl::removeModifyListener( aListener ); } // XStringResourceResolver OUString StringResourceWithStorageImpl::resolveString( const OUString& ResourceID ) - throw (css::resource::MissingResourceException, RuntimeException, std::exception) { return StringResourceImpl::resolveString( ResourceID ) ; } OUString StringResourceWithStorageImpl::resolveStringForLocale( const OUString& ResourceID, const Locale& locale ) - throw ( css::resource::MissingResourceException, RuntimeException, std::exception) { return StringResourceImpl::resolveStringForLocale( ResourceID, locale ); } sal_Bool StringResourceWithStorageImpl::hasEntryForId( const OUString& ResourceID ) - throw (RuntimeException, std::exception) { return StringResourceImpl::hasEntryForId( ResourceID ) ; } sal_Bool StringResourceWithStorageImpl::hasEntryForIdAndLocale( const OUString& ResourceID, const Locale& locale ) - throw (RuntimeException, std::exception) { return StringResourceImpl::hasEntryForIdAndLocale( ResourceID, locale ); } Sequence< OUString > StringResourceWithStorageImpl::getResourceIDs( ) - throw (RuntimeException, std::exception) { return StringResourceImpl::getResourceIDs(); } Sequence< OUString > StringResourceWithStorageImpl::getResourceIDsForLocale - ( const Locale& locale ) throw (css::uno::RuntimeException, std::exception) + ( const Locale& locale ) { return StringResourceImpl::getResourceIDsForLocale( locale ); } Locale StringResourceWithStorageImpl::getCurrentLocale() - throw (RuntimeException, std::exception) { return StringResourceImpl::getCurrentLocale(); } Locale StringResourceWithStorageImpl::getDefaultLocale( ) - throw (RuntimeException, std::exception) { return StringResourceImpl::getDefaultLocale(); } Sequence< Locale > StringResourceWithStorageImpl::getLocales( ) - throw (RuntimeException, std::exception) { return StringResourceImpl::getLocales(); } // XStringResourceManager sal_Bool StringResourceWithStorageImpl::isReadOnly() - throw (RuntimeException, std::exception) { return StringResourceImpl::isReadOnly(); } void StringResourceWithStorageImpl::setCurrentLocale( const Locale& locale, sal_Bool FindClosestMatch ) - throw (IllegalArgumentException, RuntimeException, std::exception) { StringResourceImpl::setCurrentLocale( locale, FindClosestMatch ); } void StringResourceWithStorageImpl::setDefaultLocale( const Locale& locale ) - throw (IllegalArgumentException, RuntimeException,NoSupportException, std::exception) { StringResourceImpl::setDefaultLocale( locale ); } void StringResourceWithStorageImpl::setString( const OUString& ResourceID, const OUString& Str ) - throw (NoSupportException, RuntimeException, std::exception) { StringResourceImpl::setString( ResourceID, Str ); } void StringResourceWithStorageImpl::setStringForLocale ( const OUString& ResourceID, const OUString& Str, const Locale& locale ) - throw (NoSupportException, RuntimeException, std::exception) { StringResourceImpl::setStringForLocale( ResourceID, Str, locale ); } void StringResourceWithStorageImpl::removeId( const OUString& ResourceID ) - throw (css::resource::MissingResourceException, RuntimeException, NoSupportException, std::exception) { StringResourceImpl::removeId( ResourceID ); } void StringResourceWithStorageImpl::removeIdForLocale( const OUString& ResourceID, const Locale& locale ) - throw (css::resource::MissingResourceException, RuntimeException, NoSupportException, std::exception) { StringResourceImpl::removeIdForLocale( ResourceID, locale ); } void StringResourceWithStorageImpl::newLocale( const Locale& locale ) - throw (ElementExistException, IllegalArgumentException, RuntimeException, NoSupportException, std::exception) { StringResourceImpl::newLocale( locale ); } void StringResourceWithStorageImpl::removeLocale( const Locale& locale ) - throw (IllegalArgumentException, RuntimeException, NoSupportException, std::exception) { StringResourceImpl::removeLocale( locale ); } sal_Int32 StringResourceWithStorageImpl::getUniqueNumericId( ) - throw (RuntimeException, NoSupportException, std::exception) { return StringResourceImpl::getUniqueNumericId(); } // XStringResourcePersistence void StringResourceWithStorageImpl::store() - throw (NoSupportException, Exception, RuntimeException, std::exception) { ::osl::MutexGuard aGuard( getMutex() ); implCheckReadOnly( "StringResourceWithStorageImpl::store(): Read only" ); @@ -2416,35 +2334,29 @@ void StringResourceWithStorageImpl::store() } sal_Bool StringResourceWithStorageImpl::isModified( ) - throw (RuntimeException, std::exception) { return StringResourcePersistenceImpl::isModified(); } void StringResourceWithStorageImpl::setComment( const OUString& Comment ) - throw (css::uno::RuntimeException, std::exception) { StringResourcePersistenceImpl::setComment( Comment ); } void StringResourceWithStorageImpl::storeToStorage( const Reference< XStorage >& Storage, const OUString& NameBase, const OUString& Comment ) - throw (Exception, RuntimeException, std::exception) { StringResourcePersistenceImpl::storeToStorage( Storage, NameBase, Comment ); } void StringResourceWithStorageImpl::storeToURL( const OUString& URL, const OUString& NameBase, const OUString& Comment, const Reference< css::task::XInteractionHandler >& Handler ) - throw (Exception, RuntimeException, std::exception) { StringResourcePersistenceImpl::storeToURL( URL, NameBase, Comment, Handler ); } Sequence< ::sal_Int8 > StringResourceWithStorageImpl::exportBinary( ) - throw (RuntimeException, std::exception) { return StringResourcePersistenceImpl::exportBinary(); } void StringResourceWithStorageImpl::importBinary( const Sequence< ::sal_Int8 >& Data ) - throw (IllegalArgumentException, RuntimeException, std::exception) { StringResourcePersistenceImpl::importBinary( Data ); } @@ -2453,14 +2365,12 @@ void StringResourceWithStorageImpl::importBinary( const Sequence< ::sal_Int8 >& // XStringResourceWithStorage void StringResourceWithStorageImpl::storeAsStorage( const Reference< XStorage >& Storage ) - throw (Exception, RuntimeException, std::exception) { setStorage( Storage ); store(); } void StringResourceWithStorageImpl::setStorage( const Reference< XStorage >& Storage ) - throw (IllegalArgumentException, RuntimeException, std::exception) { ::osl::MutexGuard aGuard( getMutex() ); @@ -2559,17 +2469,17 @@ StringResourceWithLocationImpl::~StringResourceWithLocationImpl() // XServiceInfo -OUString StringResourceWithLocationImpl::getImplementationName( ) throw (RuntimeException, std::exception) +OUString StringResourceWithLocationImpl::getImplementationName( ) { return getImplementationName_StringResourceWithLocationImpl(); } -sal_Bool StringResourceWithLocationImpl::supportsService( const OUString& rServiceName ) throw (RuntimeException, std::exception) +sal_Bool StringResourceWithLocationImpl::supportsService( const OUString& rServiceName ) { return cppu::supportsService(this, rServiceName); } -Sequence< OUString > StringResourceWithLocationImpl::getSupportedServiceNames( ) throw (RuntimeException, std::exception) +Sequence< OUString > StringResourceWithLocationImpl::getSupportedServiceNames( ) { return getSupportedServiceNames_StringResourceWithLocationImpl(); } @@ -2579,7 +2489,6 @@ Sequence< OUString > StringResourceWithLocationImpl::getSupportedServiceNames( void StringResourceWithLocationImpl::initialize( const Sequence< Any >& aArguments ) - throw (Exception, RuntimeException, std::exception) { ::osl::MutexGuard aGuard( getMutex() ); @@ -2623,120 +2532,99 @@ void StringResourceWithLocationImpl::initialize( const Sequence< Any >& aArgumen // XModifyBroadcaster void StringResourceWithLocationImpl::addModifyListener( const Reference< XModifyListener >& aListener ) - throw (RuntimeException, std::exception) { StringResourceImpl::addModifyListener( aListener ); } void StringResourceWithLocationImpl::removeModifyListener( const Reference< XModifyListener >& aListener ) - throw (RuntimeException, std::exception) { StringResourceImpl::removeModifyListener( aListener ); } // XStringResourceResolver OUString StringResourceWithLocationImpl::resolveString( const OUString& ResourceID ) - throw (css::resource::MissingResourceException, RuntimeException, std::exception) { return StringResourceImpl::resolveString( ResourceID ) ; } OUString StringResourceWithLocationImpl::resolveStringForLocale( const OUString& ResourceID, const Locale& locale ) - throw ( css::resource::MissingResourceException, RuntimeException, std::exception) { return StringResourceImpl::resolveStringForLocale( ResourceID, locale ); } sal_Bool StringResourceWithLocationImpl::hasEntryForId( const OUString& ResourceID ) - throw (RuntimeException, std::exception) { return StringResourceImpl::hasEntryForId( ResourceID ) ; } sal_Bool StringResourceWithLocationImpl::hasEntryForIdAndLocale( const OUString& ResourceID, const Locale& locale ) - throw (RuntimeException, std::exception) { return StringResourceImpl::hasEntryForIdAndLocale( ResourceID, locale ); } Sequence< OUString > StringResourceWithLocationImpl::getResourceIDs( ) - throw (RuntimeException, std::exception) { return StringResourceImpl::getResourceIDs(); } Sequence< OUString > StringResourceWithLocationImpl::getResourceIDsForLocale - ( const Locale& locale ) throw (css::uno::RuntimeException, std::exception) + ( const Locale& locale ) { return StringResourceImpl::getResourceIDsForLocale( locale ); } Locale StringResourceWithLocationImpl::getCurrentLocale() - throw (RuntimeException, std::exception) { return StringResourceImpl::getCurrentLocale(); } Locale StringResourceWithLocationImpl::getDefaultLocale( ) - throw (RuntimeException, std::exception) { return StringResourceImpl::getDefaultLocale(); } Sequence< Locale > StringResourceWithLocationImpl::getLocales( ) - throw (RuntimeException, std::exception) { return StringResourceImpl::getLocales(); } // XStringResourceManager sal_Bool StringResourceWithLocationImpl::isReadOnly() - throw (RuntimeException, std::exception) { return StringResourceImpl::isReadOnly(); } void StringResourceWithLocationImpl::setCurrentLocale( const Locale& locale, sal_Bool FindClosestMatch ) - throw (IllegalArgumentException, RuntimeException, std::exception) { StringResourceImpl::setCurrentLocale( locale, FindClosestMatch ); } void StringResourceWithLocationImpl::setDefaultLocale( const Locale& locale ) - throw (IllegalArgumentException, RuntimeException,NoSupportException, std::exception) { StringResourceImpl::setDefaultLocale( locale ); } void StringResourceWithLocationImpl::setString( const OUString& ResourceID, const OUString& Str ) - throw (NoSupportException, RuntimeException, std::exception) { StringResourceImpl::setString( ResourceID, Str ); } void StringResourceWithLocationImpl::setStringForLocale ( const OUString& ResourceID, const OUString& Str, const Locale& locale ) - throw (NoSupportException, RuntimeException, std::exception) { StringResourceImpl::setStringForLocale( ResourceID, Str, locale ); } void StringResourceWithLocationImpl::removeId( const OUString& ResourceID ) - throw (css::resource::MissingResourceException, RuntimeException, NoSupportException, std::exception) { StringResourceImpl::removeId( ResourceID ); } void StringResourceWithLocationImpl::removeIdForLocale( const OUString& ResourceID, const Locale& locale ) - throw (css::resource::MissingResourceException, RuntimeException, NoSupportException, std::exception) { StringResourceImpl::removeIdForLocale( ResourceID, locale ); } void StringResourceWithLocationImpl::newLocale( const Locale& locale ) - throw (ElementExistException, IllegalArgumentException, RuntimeException, NoSupportException, std::exception) { StringResourceImpl::newLocale( locale ); } void StringResourceWithLocationImpl::removeLocale( const Locale& locale ) - throw (IllegalArgumentException, RuntimeException, NoSupportException, std::exception) { StringResourceImpl::removeLocale( locale ); } sal_Int32 StringResourceWithLocationImpl::getUniqueNumericId( ) - throw (RuntimeException, NoSupportException, std::exception) { return StringResourceImpl::getUniqueNumericId(); } // XStringResourcePersistence void StringResourceWithLocationImpl::store() - throw (NoSupportException, Exception, RuntimeException, std::exception) { ::osl::MutexGuard aGuard( getMutex() ); implCheckReadOnly( "StringResourceWithLocationImpl::store(): Read only" ); @@ -2754,35 +2642,29 @@ void StringResourceWithLocationImpl::store() } sal_Bool StringResourceWithLocationImpl::isModified( ) - throw (RuntimeException, std::exception) { return StringResourcePersistenceImpl::isModified(); } void StringResourceWithLocationImpl::setComment( const OUString& Comment ) - throw (css::uno::RuntimeException, std::exception) { StringResourcePersistenceImpl::setComment( Comment ); } void StringResourceWithLocationImpl::storeToStorage( const Reference< XStorage >& Storage, const OUString& NameBase, const OUString& Comment ) - throw (Exception, RuntimeException, std::exception) { StringResourcePersistenceImpl::storeToStorage( Storage, NameBase, Comment ); } void StringResourceWithLocationImpl::storeToURL( const OUString& URL, const OUString& NameBase, const OUString& Comment, const Reference< css::task::XInteractionHandler >& Handler ) - throw (Exception, RuntimeException, std::exception) { StringResourcePersistenceImpl::storeToURL( URL, NameBase, Comment, Handler ); } Sequence< ::sal_Int8 > StringResourceWithLocationImpl::exportBinary( ) - throw (RuntimeException, std::exception) { return StringResourcePersistenceImpl::exportBinary(); } void StringResourceWithLocationImpl::importBinary( const Sequence< ::sal_Int8 >& Data ) - throw (IllegalArgumentException, RuntimeException, std::exception) { StringResourcePersistenceImpl::importBinary( Data ); } @@ -2792,16 +2674,12 @@ void StringResourceWithLocationImpl::importBinary( const Sequence< ::sal_Int8 >& // XStringResourceWithLocation void StringResourceWithLocationImpl::storeAsURL( const OUString& URL ) - throw (css::uno::Exception, css::uno::RuntimeException, std::exception) { setURL( URL ); store(); } void StringResourceWithLocationImpl::setURL( const OUString& URL ) - throw (css::lang::IllegalArgumentException, - css::lang::NoSupportException, - css::uno::RuntimeException, std::exception) { ::osl::MutexGuard aGuard( getMutex() ); implCheckReadOnly( "StringResourceWithLocationImpl::setURL(): Read only" ); diff --git a/scripting/source/stringresource/stringresource.hxx b/scripting/source/stringresource/stringresource.hxx index b67403937217..c4754b02864a 100644 --- a/scripting/source/stringresource/stringresource.hxx +++ b/scripting/source/stringresource/stringresource.hxx @@ -118,14 +118,12 @@ protected: // Checks read only status and throws exception if it's true /// @throws css::lang::NoSupportException - void implCheckReadOnly( const sal_Char* pExceptionMsg ) - throw (css::lang::NoSupportException); + void implCheckReadOnly( const sal_Char* pExceptionMsg ); // Returns the LocalItem for a given locale, if it exists, otherwise NULL // This method compares the locales exactly, no closest match search is performed /// @throws css::lang::IllegalArgumentException - LocaleItem* getItemForLocale( const css::lang::Locale& locale, bool bException ) - throw (css::lang::IllegalArgumentException); + LocaleItem* getItemForLocale( const css::lang::Locale& locale, bool bException ); // Returns the LocalItem for a given locale, if it exists, otherwise NULL // This method performs a closest match search, at least the language must match @@ -133,23 +131,20 @@ protected: /// @throws css::lang::IllegalArgumentException /// @throws css::uno::RuntimeException void implSetCurrentLocale( const css::lang::Locale& locale, - bool FindClosestMatch, bool bUseDefaultIfNoMatch ) - throw (css::lang::IllegalArgumentException, css::uno::RuntimeException); + bool FindClosestMatch, bool bUseDefaultIfNoMatch ); void implModified(); void implNotifyListeners(); //=== Impl methods for ...ForLocale methods === /// @throws css::resource::MissingResourceException - OUString SAL_CALL implResolveString( const OUString& ResourceID, LocaleItem* pLocaleItem ) - throw (css::resource::MissingResourceException); + OUString SAL_CALL implResolveString( const OUString& ResourceID, LocaleItem* pLocaleItem ); bool implHasEntryForId( const OUString& ResourceID, LocaleItem* pLocaleItem ); css::uno::Sequence< OUString > implGetResourceIDs( LocaleItem* pLocaleItem ); void implSetString( const OUString& ResourceID, const OUString& Str, LocaleItem* pLocaleItem ); /// @throws css::resource::MissingResourceException - void implRemoveId( const OUString& ResourceID, LocaleItem* pLocaleItem ) - throw (css::resource::MissingResourceException); + void implRemoveId( const OUString& ResourceID, LocaleItem* pLocaleItem ); // Method to load a locale if necessary, returns true if loading was // successful. Default implementation in base class just returns true. @@ -163,72 +158,41 @@ public: virtual ~StringResourceImpl() 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; // XModifyBroadcaster - virtual void SAL_CALL addModifyListener( const css::uno::Reference< css::util::XModifyListener >& aListener ) - throw (css::uno::RuntimeException, std::exception) override; - virtual void SAL_CALL removeModifyListener( const css::uno::Reference< css::util::XModifyListener >& aListener ) - throw (css::uno::RuntimeException, std::exception) override; + virtual void SAL_CALL addModifyListener( const css::uno::Reference< css::util::XModifyListener >& aListener ) override; + virtual void SAL_CALL removeModifyListener( const css::uno::Reference< css::util::XModifyListener >& aListener ) override; // XStringResourceResolver - virtual OUString SAL_CALL resolveString( const OUString& ResourceID ) - throw (css::resource::MissingResourceException, css::uno::RuntimeException, std::exception) override; + virtual OUString SAL_CALL resolveString( const OUString& ResourceID ) override; virtual OUString SAL_CALL resolveStringForLocale( const OUString& ResourceID, - const css::lang::Locale& locale ) - throw ( css::resource::MissingResourceException, - css::uno::RuntimeException, std::exception) override; - virtual sal_Bool SAL_CALL hasEntryForId( const OUString& ResourceID ) - throw (css::uno::RuntimeException, std::exception) override; + const css::lang::Locale& locale ) override; + virtual sal_Bool SAL_CALL hasEntryForId( const OUString& ResourceID ) override; virtual sal_Bool SAL_CALL hasEntryForIdAndLocale( const OUString& ResourceID, - const css::lang::Locale& locale ) - throw (css::uno::RuntimeException, std::exception) override; - virtual css::uno::Sequence< OUString > SAL_CALL getResourceIDs( ) - throw (css::uno::RuntimeException, std::exception) override; + const css::lang::Locale& locale ) override; + virtual css::uno::Sequence< OUString > SAL_CALL getResourceIDs( ) override; virtual css::uno::Sequence< OUString > SAL_CALL getResourceIDsForLocale - ( const css::lang::Locale& locale ) - throw (css::uno::RuntimeException, std::exception) override; - virtual css::lang::Locale SAL_CALL getCurrentLocale( ) - throw (css::uno::RuntimeException, std::exception) override; - virtual css::lang::Locale SAL_CALL getDefaultLocale( ) - throw (css::uno::RuntimeException, std::exception) override; - virtual css::uno::Sequence< css::lang::Locale > SAL_CALL getLocales( ) - throw (css::uno::RuntimeException, std::exception) override; + ( const css::lang::Locale& locale ) override; + virtual css::lang::Locale SAL_CALL getCurrentLocale( ) override; + virtual css::lang::Locale SAL_CALL getDefaultLocale( ) override; + virtual css::uno::Sequence< css::lang::Locale > SAL_CALL getLocales( ) override; // XStringResourceManager - virtual sal_Bool SAL_CALL isReadOnly() - throw (css::uno::RuntimeException, std::exception) override; - virtual void SAL_CALL setCurrentLocale( const css::lang::Locale& locale, sal_Bool FindClosestMatch ) - throw (css::lang::IllegalArgumentException, css::uno::RuntimeException, std::exception) override; - virtual void SAL_CALL setDefaultLocale( const css::lang::Locale& locale ) - throw (css::lang::IllegalArgumentException, css::uno::RuntimeException, - css::lang::NoSupportException, std::exception) override; - virtual void SAL_CALL setString( const OUString& ResourceID, const OUString& Str ) - throw (css::lang::NoSupportException, css::uno::RuntimeException, std::exception) override; + virtual sal_Bool SAL_CALL isReadOnly() override; + virtual void SAL_CALL setCurrentLocale( const css::lang::Locale& locale, sal_Bool FindClosestMatch ) override; + virtual void SAL_CALL setDefaultLocale( const css::lang::Locale& locale ) override; + virtual void SAL_CALL setString( const OUString& ResourceID, const OUString& Str ) override; virtual void SAL_CALL setStringForLocale( const OUString& ResourceID, const OUString& Str, - const css::lang::Locale& locale ) - throw (css::lang::NoSupportException, css::uno::RuntimeException, std::exception) override; - virtual void SAL_CALL removeId( const OUString& ResourceID ) - throw (css::resource::MissingResourceException, css::uno::RuntimeException, - css::lang::NoSupportException, std::exception) override; + const css::lang::Locale& locale ) override; + virtual void SAL_CALL removeId( const OUString& ResourceID ) override; virtual void SAL_CALL removeIdForLocale( const OUString& ResourceID, - const css::lang::Locale& locale ) - throw (css::resource::MissingResourceException, css::uno::RuntimeException, - css::lang::NoSupportException, std::exception) override; - virtual void SAL_CALL newLocale( const css::lang::Locale& locale ) - throw (css::container::ElementExistException, css::lang::IllegalArgumentException, - css::lang::NoSupportException, css::uno::RuntimeException, std::exception) override; - virtual void SAL_CALL removeLocale( const css::lang::Locale& locale ) - throw (css::lang::IllegalArgumentException, css::uno::RuntimeException, - css::lang::NoSupportException, std::exception) override; - virtual ::sal_Int32 SAL_CALL getUniqueNumericId( ) - throw (css::lang::NoSupportException, - css::uno::RuntimeException, std::exception) override; + const css::lang::Locale& locale ) override; + virtual void SAL_CALL newLocale( const css::lang::Locale& locale ) override; + virtual void SAL_CALL removeLocale( const css::lang::Locale& locale ) override; + virtual ::sal_Int32 SAL_CALL getUniqueNumericId( ) override; }; typedef ::cppu::ImplInheritanceHelper< @@ -245,8 +209,7 @@ protected: /// @throws css::uno::Exception /// @throws css::uno::RuntimeException - void SAL_CALL implInitializeCommonParameters( const css::uno::Sequence< css::uno::Any >& aArguments ) - throw (css::uno::Exception, css::uno::RuntimeException); + void SAL_CALL implInitializeCommonParameters( const css::uno::Sequence< css::uno::Any >& aArguments ); // Scan locale properties files virtual void implScanLocales(); @@ -282,8 +245,7 @@ protected: const css::uno::Reference< css::embed::XStorage >& Storage, bool bUsedForStore, bool bStoreAll - ) - throw (css::uno::Exception, css::uno::RuntimeException, std::exception); + ); /// @throws css::uno::Exception /// @throws css::uno::RuntimeException @@ -292,8 +254,7 @@ protected: const OUString& Location, const OUString& aNameBase, const css::uno::Reference< css::ucb::XSimpleFileAccess3 >& xFileAccess - ) - throw (css::uno::Exception, css::uno::RuntimeException, std::exception); + ); /// @throws css::uno::Exception /// @throws css::uno::RuntimeException @@ -302,8 +263,7 @@ protected: const OUString& Location, const OUString& aNameBase, const css::uno::Reference< css::ucb::XSimpleFileAccess3 >& xFileAccess - ) - throw (css::uno::Exception, css::uno::RuntimeException, std::exception); + ); /// @throws css::uno::Exception /// @throws css::uno::RuntimeException @@ -316,8 +276,7 @@ protected: bool bUsedForStore, bool bStoreAll, bool bKillAll = false - ) - throw (css::uno::Exception, css::uno::RuntimeException, std::exception); + ); public: explicit StringResourcePersistenceImpl( @@ -325,94 +284,54 @@ public: virtual ~StringResourcePersistenceImpl() 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; // XModifyBroadcaster - virtual void SAL_CALL addModifyListener( const css::uno::Reference< css::util::XModifyListener >& aListener ) - throw (css::uno::RuntimeException, std::exception) override; - virtual void SAL_CALL removeModifyListener( const css::uno::Reference< css::util::XModifyListener >& aListener ) - throw (css::uno::RuntimeException, std::exception) override; + virtual void SAL_CALL addModifyListener( const css::uno::Reference< css::util::XModifyListener >& aListener ) override; + virtual void SAL_CALL removeModifyListener( const css::uno::Reference< css::util::XModifyListener >& aListener ) override; // XStringResourceResolver - virtual OUString SAL_CALL resolveString( const OUString& ResourceID ) - throw (css::resource::MissingResourceException, css::uno::RuntimeException, std::exception) override; + virtual OUString SAL_CALL resolveString( const OUString& ResourceID ) override; virtual OUString SAL_CALL resolveStringForLocale( const OUString& ResourceID, - const css::lang::Locale& locale ) - throw ( css::resource::MissingResourceException, - css::uno::RuntimeException, std::exception) override; - virtual sal_Bool SAL_CALL hasEntryForId( const OUString& ResourceID ) - throw (css::uno::RuntimeException, std::exception) override; + const css::lang::Locale& locale ) override; + virtual sal_Bool SAL_CALL hasEntryForId( const OUString& ResourceID ) override; virtual sal_Bool SAL_CALL hasEntryForIdAndLocale( const OUString& ResourceID, - const css::lang::Locale& locale ) - throw (css::uno::RuntimeException, std::exception) override; - virtual css::uno::Sequence< OUString > SAL_CALL getResourceIDs( ) - throw (css::uno::RuntimeException, std::exception) override; + const css::lang::Locale& locale ) override; + virtual css::uno::Sequence< OUString > SAL_CALL getResourceIDs( ) override; virtual css::uno::Sequence< OUString > SAL_CALL getResourceIDsForLocale - ( const css::lang::Locale& locale ) - throw (css::uno::RuntimeException, std::exception) override; - virtual css::lang::Locale SAL_CALL getCurrentLocale( ) - throw (css::uno::RuntimeException, std::exception) override; - virtual css::lang::Locale SAL_CALL getDefaultLocale( ) - throw (css::uno::RuntimeException, std::exception) override; - virtual css::uno::Sequence< css::lang::Locale > SAL_CALL getLocales( ) - throw (css::uno::RuntimeException, std::exception) override; + ( const css::lang::Locale& locale ) override; + virtual css::lang::Locale SAL_CALL getCurrentLocale( ) override; + virtual css::lang::Locale SAL_CALL getDefaultLocale( ) override; + virtual css::uno::Sequence< css::lang::Locale > SAL_CALL getLocales( ) override; // XStringResourceManager - virtual sal_Bool SAL_CALL isReadOnly() - throw (css::uno::RuntimeException, std::exception) override; - virtual void SAL_CALL setCurrentLocale( const css::lang::Locale& locale, sal_Bool FindClosestMatch ) - throw (css::lang::IllegalArgumentException, css::uno::RuntimeException, std::exception) override; - virtual void SAL_CALL setDefaultLocale( const css::lang::Locale& locale ) - throw (css::lang::IllegalArgumentException, css::uno::RuntimeException, - css::lang::NoSupportException, std::exception) override; - virtual void SAL_CALL setString( const OUString& ResourceID, const OUString& Str ) - throw (css::lang::NoSupportException, css::uno::RuntimeException, std::exception) override; + virtual sal_Bool SAL_CALL isReadOnly() override; + virtual void SAL_CALL setCurrentLocale( const css::lang::Locale& locale, sal_Bool FindClosestMatch ) override; + virtual void SAL_CALL setDefaultLocale( const css::lang::Locale& locale ) override; + virtual void SAL_CALL setString( const OUString& ResourceID, const OUString& Str ) override; virtual void SAL_CALL setStringForLocale( const OUString& ResourceID, const OUString& Str, - const css::lang::Locale& locale ) - throw (css::lang::NoSupportException, css::uno::RuntimeException, std::exception) override; - virtual void SAL_CALL removeId( const OUString& ResourceID ) - throw (css::resource::MissingResourceException, css::uno::RuntimeException, - css::lang::NoSupportException, std::exception) override; + const css::lang::Locale& locale ) override; + virtual void SAL_CALL removeId( const OUString& ResourceID ) override; virtual void SAL_CALL removeIdForLocale( const OUString& ResourceID, - const css::lang::Locale& locale ) - throw (css::resource::MissingResourceException, css::uno::RuntimeException, - css::lang::NoSupportException, std::exception) override; - virtual void SAL_CALL newLocale( const css::lang::Locale& locale ) - throw (css::container::ElementExistException, css::lang::IllegalArgumentException, - css::lang::NoSupportException, css::uno::RuntimeException, std::exception) override; - virtual void SAL_CALL removeLocale( const css::lang::Locale& locale ) - throw (css::lang::IllegalArgumentException, css::uno::RuntimeException, - css::lang::NoSupportException, std::exception) override; - virtual ::sal_Int32 SAL_CALL getUniqueNumericId( ) - throw (css::lang::NoSupportException, - css::uno::RuntimeException, std::exception) override; + const css::lang::Locale& locale ) override; + virtual void SAL_CALL newLocale( const css::lang::Locale& locale ) override; + virtual void SAL_CALL removeLocale( const css::lang::Locale& locale ) override; + virtual ::sal_Int32 SAL_CALL getUniqueNumericId( ) override; // XStringResourcePersistence - virtual void SAL_CALL store( ) - throw (css::lang::NoSupportException, - css::uno::Exception, - css::uno::RuntimeException, std::exception) override; - virtual sal_Bool SAL_CALL isModified( ) - throw (css::uno::RuntimeException, std::exception) override; - virtual void SAL_CALL setComment( const OUString& Comment ) - throw (css::uno::RuntimeException, std::exception) override; + virtual void SAL_CALL store( ) override; + virtual sal_Bool SAL_CALL isModified( ) override; + virtual void SAL_CALL setComment( const OUString& Comment ) override; virtual void SAL_CALL storeToStorage ( const css::uno::Reference< css::embed::XStorage >& Storage, - const OUString& NameBase, const OUString& Comment ) - throw (css::uno::Exception, css::uno::RuntimeException, std::exception) override; + const OUString& NameBase, const OUString& Comment ) override; virtual void SAL_CALL storeToURL( const OUString& URL, const OUString& NameBase, const OUString& Comment, const css::uno::Reference - < css::task::XInteractionHandler >& Handler ) - throw (css::uno::Exception, css::uno::RuntimeException, std::exception) override; - virtual css::uno::Sequence< ::sal_Int8 > SAL_CALL exportBinary( ) - throw (css::uno::RuntimeException, std::exception) override; - virtual void SAL_CALL importBinary( const css::uno::Sequence< ::sal_Int8 >& Data ) - throw (css::lang::IllegalArgumentException, css::uno::RuntimeException, std::exception) override; + < css::task::XInteractionHandler >& Handler ) override; + virtual css::uno::Sequence< ::sal_Int8 > SAL_CALL exportBinary( ) override; + virtual void SAL_CALL importBinary( const css::uno::Sequence< ::sal_Int8 >& Data ) override; }; @@ -434,106 +353,63 @@ public: virtual ~StringResourceWithStorageImpl() 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; // XInitialization - virtual void SAL_CALL initialize( const css::uno::Sequence< css::uno::Any >& aArguments ) - throw (css::uno::Exception, css::uno::RuntimeException, std::exception) override; + virtual void SAL_CALL initialize( const css::uno::Sequence< css::uno::Any >& aArguments ) override; // XModifyBroadcaster - virtual void SAL_CALL addModifyListener( const css::uno::Reference< css::util::XModifyListener >& aListener ) - throw (css::uno::RuntimeException, std::exception) override; - virtual void SAL_CALL removeModifyListener( const css::uno::Reference< css::util::XModifyListener >& aListener ) - throw (css::uno::RuntimeException, std::exception) override; + virtual void SAL_CALL addModifyListener( const css::uno::Reference< css::util::XModifyListener >& aListener ) override; + virtual void SAL_CALL removeModifyListener( const css::uno::Reference< css::util::XModifyListener >& aListener ) override; // XStringResourceResolver - virtual OUString SAL_CALL resolveString( const OUString& ResourceID ) - throw (css::resource::MissingResourceException, css::uno::RuntimeException, std::exception) override; + virtual OUString SAL_CALL resolveString( const OUString& ResourceID ) override; virtual OUString SAL_CALL resolveStringForLocale( const OUString& ResourceID, - const css::lang::Locale& locale ) - throw ( css::resource::MissingResourceException, - css::uno::RuntimeException, std::exception) override; - virtual sal_Bool SAL_CALL hasEntryForId( const OUString& ResourceID ) - throw (css::uno::RuntimeException, std::exception) override; + const css::lang::Locale& locale ) override; + virtual sal_Bool SAL_CALL hasEntryForId( const OUString& ResourceID ) override; virtual sal_Bool SAL_CALL hasEntryForIdAndLocale( const OUString& ResourceID, - const css::lang::Locale& locale ) - throw (css::uno::RuntimeException, std::exception) override; - virtual css::uno::Sequence< OUString > SAL_CALL getResourceIDs( ) - throw (css::uno::RuntimeException, std::exception) override; + const css::lang::Locale& locale ) override; + virtual css::uno::Sequence< OUString > SAL_CALL getResourceIDs( ) override; virtual css::uno::Sequence< OUString > SAL_CALL getResourceIDsForLocale - ( const css::lang::Locale& locale ) - throw (css::uno::RuntimeException, std::exception) override; - virtual css::lang::Locale SAL_CALL getCurrentLocale( ) - throw (css::uno::RuntimeException, std::exception) override; - virtual css::lang::Locale SAL_CALL getDefaultLocale( ) - throw (css::uno::RuntimeException, std::exception) override; - virtual css::uno::Sequence< css::lang::Locale > SAL_CALL getLocales( ) - throw (css::uno::RuntimeException, std::exception) override; + ( const css::lang::Locale& locale ) override; + virtual css::lang::Locale SAL_CALL getCurrentLocale( ) override; + virtual css::lang::Locale SAL_CALL getDefaultLocale( ) override; + virtual css::uno::Sequence< css::lang::Locale > SAL_CALL getLocales( ) override; // XStringResourceManager - virtual sal_Bool SAL_CALL isReadOnly() - throw (css::uno::RuntimeException, std::exception) override; - virtual void SAL_CALL setCurrentLocale( const css::lang::Locale& locale, sal_Bool FindClosestMatch ) - throw (css::lang::IllegalArgumentException, css::uno::RuntimeException, std::exception) override; - virtual void SAL_CALL setDefaultLocale( const css::lang::Locale& locale ) - throw (css::lang::IllegalArgumentException, css::uno::RuntimeException, - css::lang::NoSupportException, std::exception) override; - virtual void SAL_CALL setString( const OUString& ResourceID, const OUString& Str ) - throw (css::lang::NoSupportException, css::uno::RuntimeException, std::exception) override; + virtual sal_Bool SAL_CALL isReadOnly() override; + virtual void SAL_CALL setCurrentLocale( const css::lang::Locale& locale, sal_Bool FindClosestMatch ) override; + virtual void SAL_CALL setDefaultLocale( const css::lang::Locale& locale ) override; + virtual void SAL_CALL setString( const OUString& ResourceID, const OUString& Str ) override; virtual void SAL_CALL setStringForLocale( const OUString& ResourceID, const OUString& Str, - const css::lang::Locale& locale ) - throw (css::lang::NoSupportException, css::uno::RuntimeException, std::exception) override; - virtual void SAL_CALL removeId( const OUString& ResourceID ) - throw (css::resource::MissingResourceException, css::uno::RuntimeException, - css::lang::NoSupportException, std::exception) override; + const css::lang::Locale& locale ) override; + virtual void SAL_CALL removeId( const OUString& ResourceID ) override; virtual void SAL_CALL removeIdForLocale( const OUString& ResourceID, - const css::lang::Locale& locale ) - throw (css::resource::MissingResourceException, css::uno::RuntimeException, - css::lang::NoSupportException, std::exception) override; - virtual void SAL_CALL newLocale( const css::lang::Locale& locale ) - throw (css::container::ElementExistException, css::lang::IllegalArgumentException, - css::lang::NoSupportException, css::uno::RuntimeException, std::exception) override; - virtual void SAL_CALL removeLocale( const css::lang::Locale& locale ) - throw (css::lang::IllegalArgumentException, css::uno::RuntimeException, - css::lang::NoSupportException, std::exception) override; - virtual ::sal_Int32 SAL_CALL getUniqueNumericId( ) - throw (css::lang::NoSupportException, - css::uno::RuntimeException, std::exception) override; + const css::lang::Locale& locale ) override; + virtual void SAL_CALL newLocale( const css::lang::Locale& locale ) override; + virtual void SAL_CALL removeLocale( const css::lang::Locale& locale ) override; + virtual ::sal_Int32 SAL_CALL getUniqueNumericId( ) override; // XStringResourcePersistence - virtual void SAL_CALL store( ) - throw (css::lang::NoSupportException, - css::uno::Exception, - css::uno::RuntimeException, std::exception) override; - virtual sal_Bool SAL_CALL isModified( ) - throw (css::uno::RuntimeException, std::exception) override; - virtual void SAL_CALL setComment( const OUString& Comment ) - throw (css::uno::RuntimeException, std::exception) override; + virtual void SAL_CALL store( ) override; + virtual sal_Bool SAL_CALL isModified( ) override; + virtual void SAL_CALL setComment( const OUString& Comment ) override; virtual void SAL_CALL storeToStorage ( const css::uno::Reference< css::embed::XStorage >& Storage, - const OUString& NameBase, const OUString& Comment ) - throw (css::uno::Exception, css::uno::RuntimeException, std::exception) override; + const OUString& NameBase, const OUString& Comment ) override; virtual void SAL_CALL storeToURL( const OUString& URL, const OUString& NameBase, const OUString& Comment, const css::uno::Reference - < css::task::XInteractionHandler >& Handler ) - throw (css::uno::Exception, css::uno::RuntimeException, std::exception) override; - virtual css::uno::Sequence< ::sal_Int8 > SAL_CALL exportBinary( ) - throw (css::uno::RuntimeException, std::exception) override; - virtual void SAL_CALL importBinary( const css::uno::Sequence< ::sal_Int8 >& Data ) - throw (css::lang::IllegalArgumentException, css::uno::RuntimeException, std::exception) override; + < css::task::XInteractionHandler >& Handler ) override; + virtual css::uno::Sequence< ::sal_Int8 > SAL_CALL exportBinary( ) override; + virtual void SAL_CALL importBinary( const css::uno::Sequence< ::sal_Int8 >& Data ) override; // XStringResourceWithStorage virtual void SAL_CALL storeAsStorage - ( const css::uno::Reference< css::embed::XStorage >& Storage ) - throw (css::uno::Exception, css::uno::RuntimeException, std::exception) override; + ( const css::uno::Reference< css::embed::XStorage >& Storage ) override; virtual void SAL_CALL setStorage - ( const css::uno::Reference< css::embed::XStorage >& Storage ) - throw (css::lang::IllegalArgumentException, css::uno::RuntimeException, std::exception) override; + ( const css::uno::Reference< css::embed::XStorage >& Storage ) override; }; @@ -559,105 +435,61 @@ public: virtual ~StringResourceWithLocationImpl() 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; // XInitialization - virtual void SAL_CALL initialize( const css::uno::Sequence< css::uno::Any >& aArguments ) - throw (css::uno::Exception, css::uno::RuntimeException, std::exception) override; + virtual void SAL_CALL initialize( const css::uno::Sequence< css::uno::Any >& aArguments ) override; // XModifyBroadcaster - virtual void SAL_CALL addModifyListener( const css::uno::Reference< css::util::XModifyListener >& aListener ) - throw (css::uno::RuntimeException, std::exception) override; - virtual void SAL_CALL removeModifyListener( const css::uno::Reference< css::util::XModifyListener >& aListener ) - throw (css::uno::RuntimeException, std::exception) override; + virtual void SAL_CALL addModifyListener( const css::uno::Reference< css::util::XModifyListener >& aListener ) override; + virtual void SAL_CALL removeModifyListener( const css::uno::Reference< css::util::XModifyListener >& aListener ) override; // XStringResourceResolver - virtual OUString SAL_CALL resolveString( const OUString& ResourceID ) - throw (css::resource::MissingResourceException, css::uno::RuntimeException, std::exception) override; + virtual OUString SAL_CALL resolveString( const OUString& ResourceID ) override; virtual OUString SAL_CALL resolveStringForLocale( const OUString& ResourceID, - const css::lang::Locale& locale ) - throw ( css::resource::MissingResourceException, - css::uno::RuntimeException, std::exception) override; - virtual sal_Bool SAL_CALL hasEntryForId( const OUString& ResourceID ) - throw (css::uno::RuntimeException, std::exception) override; + const css::lang::Locale& locale ) override; + virtual sal_Bool SAL_CALL hasEntryForId( const OUString& ResourceID ) override; virtual sal_Bool SAL_CALL hasEntryForIdAndLocale( const OUString& ResourceID, - const css::lang::Locale& locale ) - throw (css::uno::RuntimeException, std::exception) override; - virtual css::uno::Sequence< OUString > SAL_CALL getResourceIDs( ) - throw (css::uno::RuntimeException, std::exception) override; + const css::lang::Locale& locale ) override; + virtual css::uno::Sequence< OUString > SAL_CALL getResourceIDs( ) override; virtual css::uno::Sequence< OUString > SAL_CALL getResourceIDsForLocale - ( const css::lang::Locale& locale ) - throw (css::uno::RuntimeException, std::exception) override; - virtual css::lang::Locale SAL_CALL getCurrentLocale( ) - throw (css::uno::RuntimeException, std::exception) override; - virtual css::lang::Locale SAL_CALL getDefaultLocale( ) - throw (css::uno::RuntimeException, std::exception) override; - virtual css::uno::Sequence< css::lang::Locale > SAL_CALL getLocales( ) - throw (css::uno::RuntimeException, std::exception) override; + ( const css::lang::Locale& locale ) override; + virtual css::lang::Locale SAL_CALL getCurrentLocale( ) override; + virtual css::lang::Locale SAL_CALL getDefaultLocale( ) override; + virtual css::uno::Sequence< css::lang::Locale > SAL_CALL getLocales( ) override; // XStringResourceManager - virtual sal_Bool SAL_CALL isReadOnly() - throw (css::uno::RuntimeException, std::exception) override; - virtual void SAL_CALL setCurrentLocale( const css::lang::Locale& locale, sal_Bool FindClosestMatch ) - throw (css::lang::IllegalArgumentException, css::uno::RuntimeException, std::exception) override; - virtual void SAL_CALL setDefaultLocale( const css::lang::Locale& locale ) - throw (css::lang::IllegalArgumentException, css::uno::RuntimeException, - css::lang::NoSupportException, std::exception) override; - virtual void SAL_CALL setString( const OUString& ResourceID, const OUString& Str ) - throw (css::lang::NoSupportException, css::uno::RuntimeException, std::exception) override; + virtual sal_Bool SAL_CALL isReadOnly() override; + virtual void SAL_CALL setCurrentLocale( const css::lang::Locale& locale, sal_Bool FindClosestMatch ) override; + virtual void SAL_CALL setDefaultLocale( const css::lang::Locale& locale ) override; + virtual void SAL_CALL setString( const OUString& ResourceID, const OUString& Str ) override; virtual void SAL_CALL setStringForLocale( const OUString& ResourceID, const OUString& Str, - const css::lang::Locale& locale ) - throw (css::lang::NoSupportException, css::uno::RuntimeException, std::exception) override; - virtual void SAL_CALL removeId( const OUString& ResourceID ) - throw (css::resource::MissingResourceException, css::uno::RuntimeException, - css::lang::NoSupportException, std::exception) override; + const css::lang::Locale& locale ) override; + virtual void SAL_CALL removeId( const OUString& ResourceID ) override; virtual void SAL_CALL removeIdForLocale( const OUString& ResourceID, - const css::lang::Locale& locale ) - throw (css::resource::MissingResourceException, css::uno::RuntimeException, - css::lang::NoSupportException, std::exception) override; - virtual void SAL_CALL newLocale( const css::lang::Locale& locale ) - throw (css::container::ElementExistException, css::lang::IllegalArgumentException, - css::lang::NoSupportException, css::uno::RuntimeException, std::exception) override; - virtual void SAL_CALL removeLocale( const css::lang::Locale& locale ) - throw (css::lang::IllegalArgumentException, css::uno::RuntimeException, - css::lang::NoSupportException, std::exception) override; - virtual ::sal_Int32 SAL_CALL getUniqueNumericId( ) - throw (css::lang::NoSupportException, - css::uno::RuntimeException, std::exception) override; + const css::lang::Locale& locale ) override; + virtual void SAL_CALL newLocale( const css::lang::Locale& locale ) override; + virtual void SAL_CALL removeLocale( const css::lang::Locale& locale ) override; + virtual ::sal_Int32 SAL_CALL getUniqueNumericId( ) override; // XStringResourcePersistence - virtual void SAL_CALL store( ) - throw (css::lang::NoSupportException, - css::uno::Exception, - css::uno::RuntimeException, std::exception) override; - virtual sal_Bool SAL_CALL isModified( ) - throw (css::uno::RuntimeException, std::exception) override; - virtual void SAL_CALL setComment( const OUString& Comment ) - throw (css::uno::RuntimeException, std::exception) override; + virtual void SAL_CALL store( ) override; + virtual sal_Bool SAL_CALL isModified( ) override; + virtual void SAL_CALL setComment( const OUString& Comment ) override; virtual void SAL_CALL storeToStorage ( const css::uno::Reference< css::embed::XStorage >& Storage, - const OUString& NameBase, const OUString& Comment ) - throw (css::uno::Exception, css::uno::RuntimeException, std::exception) override; + const OUString& NameBase, const OUString& Comment ) override; virtual void SAL_CALL storeToURL( const OUString& URL, const OUString& NameBase, const OUString& Comment, const css::uno::Reference - < css::task::XInteractionHandler >& Handler ) - throw (css::uno::Exception, css::uno::RuntimeException, std::exception) override; - virtual css::uno::Sequence< ::sal_Int8 > SAL_CALL exportBinary( ) - throw (css::uno::RuntimeException, std::exception) override; - virtual void SAL_CALL importBinary( const css::uno::Sequence< ::sal_Int8 >& Data ) - throw (css::lang::IllegalArgumentException, css::uno::RuntimeException, std::exception) override; + < css::task::XInteractionHandler >& Handler ) override; + virtual css::uno::Sequence< ::sal_Int8 > SAL_CALL exportBinary( ) override; + virtual void SAL_CALL importBinary( const css::uno::Sequence< ::sal_Int8 >& Data ) override; // XStringResourceWithLocation - virtual void SAL_CALL storeAsURL( const OUString& URL ) - throw (css::uno::Exception, css::uno::RuntimeException, std::exception) override; - virtual void SAL_CALL setURL( const OUString& URL ) - throw (css::lang::IllegalArgumentException, css::lang::NoSupportException, - css::uno::RuntimeException, std::exception) override; + virtual void SAL_CALL storeAsURL( const OUString& URL ) override; + virtual void SAL_CALL setURL( const OUString& URL ) override; }; diff --git a/scripting/source/vbaevents/eventhelper.cxx b/scripting/source/vbaevents/eventhelper.cxx index 017bc3999e11..96b4ee53ba7a 100644 --- a/scripting/source/vbaevents/eventhelper.cxx +++ b/scripting/source/vbaevents/eventhelper.cxx @@ -449,32 +449,32 @@ public: ReadOnlyEventsNameContainer( const Sequence< OUString >& eventMethods, const OUString& sCodeName ); // XNameContainer - virtual void SAL_CALL insertByName( const OUString&, const Any& ) throw (lang::IllegalArgumentException, container::ElementExistException, lang::WrappedTargetException, RuntimeException, std::exception) override + virtual void SAL_CALL insertByName( const OUString&, const Any& ) override { throw RuntimeException("ReadOnly container" ); } - virtual void SAL_CALL removeByName( const OUString& ) throw (css::container::NoSuchElementException, lang::WrappedTargetException, RuntimeException, std::exception) override + virtual void SAL_CALL removeByName( const OUString& ) override { throw RuntimeException("ReadOnly container" ); } // XNameReplace - virtual void SAL_CALL replaceByName( const OUString&, const Any& ) throw (lang::IllegalArgumentException, container::NoSuchElementException, lang::WrappedTargetException, RuntimeException, std::exception) override + virtual void SAL_CALL replaceByName( const OUString&, const Any& ) override { throw RuntimeException("ReadOnly container" ); } // XNameAccess - virtual Any SAL_CALL getByName( const OUString& aName ) 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( const OUString& aName ) throw (RuntimeException, std::exception) override; + virtual Any SAL_CALL getByName( const OUString& aName ) override; + virtual Sequence< OUString > SAL_CALL getElementNames( ) override; + virtual sal_Bool SAL_CALL hasByName( const OUString& aName ) override; // XElementAccess - virtual Type SAL_CALL getElementType( ) throw (RuntimeException, std::exception) override + virtual Type SAL_CALL getElementType( ) override { return cppu::UnoType<OUString>::get(); } - virtual sal_Bool SAL_CALL hasElements( ) throw (RuntimeException, std::exception) override + virtual sal_Bool SAL_CALL hasElements( ) override { return !m_hEvents.empty(); } private: @@ -500,7 +500,7 @@ ReadOnlyEventsNameContainer::ReadOnlyEventsNameContainer( const Sequence< OUStri } Any SAL_CALL -ReadOnlyEventsNameContainer::getByName( const OUString& aName ) throw (container::NoSuchElementException, lang::WrappedTargetException, RuntimeException, std::exception){ +ReadOnlyEventsNameContainer::getByName( const OUString& aName ){ EventSupplierHash::const_iterator it = m_hEvents.find( aName ); if ( it == m_hEvents.end() ) throw container::NoSuchElementException(); @@ -508,13 +508,13 @@ ReadOnlyEventsNameContainer::getByName( const OUString& aName ) throw (container } Sequence< OUString > SAL_CALL -ReadOnlyEventsNameContainer::getElementNames( ) throw (RuntimeException, std::exception) +ReadOnlyEventsNameContainer::getElementNames( ) { return comphelper::mapKeysToSequence(m_hEvents); } sal_Bool SAL_CALL -ReadOnlyEventsNameContainer::hasByName( const OUString& aName ) throw (RuntimeException, std::exception) +ReadOnlyEventsNameContainer::hasByName( const OUString& aName ) { EventSupplierHash::const_iterator it = m_hEvents.find( aName ); if ( it == m_hEvents.end() ) @@ -529,7 +529,7 @@ public: { m_xNameContainer = new ReadOnlyEventsNameContainer( eventMethods, sCodeName ); } // XScriptEventSupplier - virtual Reference< container::XNameContainer > SAL_CALL getEvents( ) throw (RuntimeException, std::exception) override { return m_xNameContainer; } + virtual Reference< container::XNameContainer > SAL_CALL getEvents( ) override { return m_xNameContainer; } private: Reference< container::XNameContainer > m_xNameContainer; }; @@ -548,25 +548,25 @@ class EventListener : public EventListener_BASE public: EventListener(); // XEventListener - virtual void SAL_CALL disposing(const lang::EventObject& Source) throw( RuntimeException, std::exception ) override; + virtual void SAL_CALL disposing(const lang::EventObject& Source) override; using cppu::OPropertySetHelper::disposing; // XScriptListener - virtual void SAL_CALL firing(const ScriptEvent& evt) throw(RuntimeException, std::exception) override; - virtual Any SAL_CALL approveFiring(const ScriptEvent& evt) throw(reflection::InvocationTargetException, RuntimeException, std::exception) override; + virtual void SAL_CALL firing(const ScriptEvent& evt) override; + virtual Any SAL_CALL approveFiring(const ScriptEvent& evt) override; // XCloseListener - virtual void SAL_CALL queryClosing( const lang::EventObject& Source, sal_Bool GetsOwnership ) throw (util::CloseVetoException, uno::RuntimeException, std::exception) override; - virtual void SAL_CALL notifyClosing( const lang::EventObject& Source ) throw (uno::RuntimeException, std::exception) override; + virtual void SAL_CALL queryClosing( const lang::EventObject& Source, sal_Bool GetsOwnership ) override; + virtual void SAL_CALL notifyClosing( const lang::EventObject& Source ) override; // XPropertySet - virtual css::uno::Reference< css::beans::XPropertySetInfo > SAL_CALL getPropertySetInfo( ) throw (css::uno::RuntimeException, std::exception) override; + virtual css::uno::Reference< css::beans::XPropertySetInfo > SAL_CALL getPropertySetInfo( ) 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; // XInterface DECLARE_XINTERFACE() // XTypeProvider DECLARE_XTYPEPROVIDER() - virtual void SAL_CALL setFastPropertyValue( sal_Int32 nHandle, const css::uno::Any& rValue ) throw(css::beans::UnknownPropertyException, css::beans::PropertyVetoException, css::lang::IllegalArgumentException, css::lang::WrappedTargetException, css::uno::RuntimeException, std::exception) override + virtual void SAL_CALL setFastPropertyValue( sal_Int32 nHandle, const css::uno::Any& rValue ) override { if ( nHandle == EVENTLSTNR_PROPERTY_ID_MODEL ) { @@ -592,20 +592,17 @@ public: setShellFromModel(); } - OUString SAL_CALL getImplementationName() - throw (css::uno::RuntimeException, std::exception) override + OUString SAL_CALL getImplementationName() override { return OUString( "ooo.vba.EventListener" ); } - sal_Bool SAL_CALL supportsService(OUString const & ServiceName) - throw (css::uno::RuntimeException, std::exception) override + sal_Bool SAL_CALL supportsService(OUString const & ServiceName) override { return cppu::supportsService(this, ServiceName); } - css::uno::Sequence<OUString> SAL_CALL getSupportedServiceNames() - throw (css::uno::RuntimeException, std::exception) override + css::uno::Sequence<OUString> SAL_CALL getSupportedServiceNames() override { const OUString strName( getImplementationName() ); return Sequence< OUString >( &strName, 1 ); @@ -621,7 +618,7 @@ protected: private: void setShellFromModel(); /// @throws RuntimeException - void firing_Impl( const ScriptEvent& evt, Any *pSyncRet ) throw( RuntimeException, std::exception ); + void firing_Impl( const ScriptEvent& evt, Any *pSyncRet ); Reference< frame::XModel > m_xModel; bool m_bDocClosed; @@ -664,20 +661,20 @@ EventListener::setShellFromModel() //XEventListener void -EventListener::disposing(const lang::EventObject&) throw( RuntimeException, std::exception ) +EventListener::disposing(const lang::EventObject&) { } //XScriptListener void SAL_CALL -EventListener::firing(const ScriptEvent& evt) throw(RuntimeException, std::exception) +EventListener::firing(const ScriptEvent& evt) { firing_Impl( evt, nullptr ); } Any SAL_CALL -EventListener::approveFiring(const ScriptEvent& evt) throw(reflection::InvocationTargetException, RuntimeException, std::exception) +EventListener::approveFiring(const ScriptEvent& evt) { Any ret; firing_Impl( evt, &ret ); @@ -686,13 +683,13 @@ EventListener::approveFiring(const ScriptEvent& evt) throw(reflection::Invocatio // XCloseListener void SAL_CALL -EventListener::queryClosing( const lang::EventObject& /*Source*/, sal_Bool /*GetsOwnership*/ ) throw (util::CloseVetoException, uno::RuntimeException, std::exception) +EventListener::queryClosing( const lang::EventObject& /*Source*/, sal_Bool /*GetsOwnership*/ ) { //Nothing to do } void SAL_CALL -EventListener::notifyClosing( const lang::EventObject& /*Source*/ ) throw (uno::RuntimeException, std::exception) +EventListener::notifyClosing( const lang::EventObject& /*Source*/ ) { m_bDocClosed = true; uno::Reference< util::XCloseBroadcaster > xCloseBroadcaster( m_xModel, uno::UNO_QUERY ); @@ -704,7 +701,7 @@ EventListener::notifyClosing( const lang::EventObject& /*Source*/ ) throw (uno:: // XInitialization void SAL_CALL -EventListener::initialize( const Sequence< Any >& aArguments ) throw (Exception, RuntimeException, std::exception) +EventListener::initialize( const Sequence< Any >& aArguments ) { if ( aArguments.getLength() == 1 ) aArguments[0] >>= m_xModel; @@ -741,7 +738,7 @@ EventListener::createArrayHelper( ) const // XPropertySet Reference< beans::XPropertySetInfo > -EventListener::getPropertySetInfo( ) throw (RuntimeException, std::exception) +EventListener::getPropertySetInfo( ) { Reference< beans::XPropertySetInfo > xInfo( createPropertySetInfo( getInfoHelper() ) ); return xInfo; @@ -810,7 +807,7 @@ bool DenyMouseDrag(const ScriptEvent& evt, void const * ) // EventListener void -EventListener::firing_Impl(const ScriptEvent& evt, Any* pRet ) throw(RuntimeException, std::exception) +EventListener::firing_Impl(const ScriptEvent& evt, Any* pRet ) { // let default handlers deal with non vba stuff if ( evt.ScriptType != "VBAInterop" ) @@ -964,23 +961,20 @@ public: VBAToOOEventDescGen(); // XVBAToOOEventDescGen - virtual Sequence< ScriptEventDescriptor > SAL_CALL getEventDescriptions( const OUString& sCtrlServiceName, const OUString& sCodeName ) throw (RuntimeException, std::exception) override; - virtual Reference< XScriptEventsSupplier > SAL_CALL getEventSupplier( const Reference< XInterface >& xControl, const OUString& sCodeName ) throw (css::uno::RuntimeException, std::exception) override; + virtual Sequence< ScriptEventDescriptor > SAL_CALL getEventDescriptions( const OUString& sCtrlServiceName, const OUString& sCodeName ) override; + virtual Reference< XScriptEventsSupplier > SAL_CALL getEventSupplier( const Reference< XInterface >& xControl, const OUString& sCodeName ) override; - OUString SAL_CALL getImplementationName() - throw (css::uno::RuntimeException, std::exception) override + OUString SAL_CALL getImplementationName() override { return OUString( "ooo.vba.VBAToOOEventDesc" ); } - sal_Bool SAL_CALL supportsService(OUString const & ServiceName) - throw (css::uno::RuntimeException, std::exception) override + sal_Bool SAL_CALL supportsService(OUString const & ServiceName) override { return cppu::supportsService(this, ServiceName); } - css::uno::Sequence<OUString> SAL_CALL getSupportedServiceNames() - throw (css::uno::RuntimeException, std::exception) override + css::uno::Sequence<OUString> SAL_CALL getSupportedServiceNames() override { const OUString strName( getImplementationName() ); return Sequence< OUString >( &strName, 1 ); @@ -991,14 +985,14 @@ public: VBAToOOEventDescGen::VBAToOOEventDescGen() {} Sequence< ScriptEventDescriptor > SAL_CALL -VBAToOOEventDescGen::getEventDescriptions( const OUString& sCntrlServiceName, const OUString& sCodeName ) throw (RuntimeException, std::exception) +VBAToOOEventDescGen::getEventDescriptions( const OUString& sCntrlServiceName, const OUString& sCodeName ) { ScriptEventHelper evntHelper( sCntrlServiceName ); return evntHelper.createEvents( sCodeName ); } Reference< XScriptEventsSupplier > SAL_CALL -VBAToOOEventDescGen::getEventSupplier( const Reference< XInterface >& xControl, const OUString& sCodeName ) throw (css::uno::RuntimeException, std::exception) +VBAToOOEventDescGen::getEventSupplier( const Reference< XInterface >& xControl, const OUString& sCodeName ) { ScriptEventHelper evntHelper( xControl ); Reference< XScriptEventsSupplier > xSupplier = |