summaryrefslogtreecommitdiff
path: root/scripting/source/basprov
diff options
context:
space:
mode:
authorStephan Bergmann <sbergman@redhat.com>2017-01-26 12:28:58 +0100
committerStephan Bergmann <sbergman@redhat.com>2017-01-26 12:54:43 +0000
commite57ca02849c3d87142ff5ff9099a212e72b8139c (patch)
treebcce66b27261553c308779f3e8663a269ed3a671 /scripting/source/basprov
parent8802ebd5172ec4bc412a59d136c82b77ab452281 (diff)
Remove dynamic exception specifications
...(for now, from LIBO_INTERNAL_CODE only). See the mail thread starting at <https://lists.freedesktop.org/archives/libreoffice/2017-January/076665.html> "Dynamic Exception Specifications" for details. Most changes have been done automatically by the rewriting loplugin:dynexcspec (after enabling the rewriting mode, to be committed shortly). The way it only removes exception specs from declarations if it also sees a definition, it identified some dead declarations-w/o-definitions (that have been removed manually) and some cases where a definition appeared in multiple include files (which have also been cleaned up manually). There's also been cases of macro paramters (that were used to abstract over exception specs) that have become unused now (and been removed). Furthermore, some code needed to be cleaned up manually (avmedia/source/quicktime/ and connectivity/source/drivers/kab/), as I had no configurations available that would actually build that code. Missing @throws documentation has not been applied in such manual clean-up. Change-Id: I3408691256c9b0c12bc5332de976743626e13960 Reviewed-on: https://gerrit.libreoffice.org/33574 Tested-by: Jenkins <ci@libreoffice.org> Reviewed-by: Stephan Bergmann <sbergman@redhat.com>
Diffstat (limited to 'scripting/source/basprov')
-rw-r--r--scripting/source/basprov/baslibnode.cxx8
-rw-r--r--scripting/source/basprov/baslibnode.hxx12
-rw-r--r--scripting/source/basprov/basmethnode.cxx22
-rw-r--r--scripting/source/basprov/basmethnode.hxx35
-rw-r--r--scripting/source/basprov/basmodnode.cxx8
-rw-r--r--scripting/source/basprov/basmodnode.hxx12
-rw-r--r--scripting/source/basprov/basprov.cxx17
-rw-r--r--scripting/source/basprov/basprov.hxx27
-rw-r--r--scripting/source/basprov/basscript.cxx3
-rw-r--r--scripting/source/basprov/basscript.hxx9
10 files changed, 56 insertions, 97 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;