diff options
author | Noel Grandin <noel@peralex.com> | 2014-06-05 08:16:37 +0200 |
---|---|---|
committer | Noel Grandin <noel@peralex.com> | 2014-06-05 08:17:52 +0200 |
commit | db246b491c1639942d9f952658d33974e9b06201 (patch) | |
tree | d0b05cb281bc25e4671aadb470027815f48e5127 /scripting/source | |
parent | e9ae2b07c29707641fe126539390fe2281acdf84 (diff) |
scripting: remove SAL_THROW macro
Change-Id: I535a57d043ac51926ae6f640d721d0dd1571c3fa
Diffstat (limited to 'scripting/source')
-rw-r--r-- | scripting/source/basprov/basprov.cxx | 1 | ||||
-rw-r--r-- | scripting/source/dlgprov/dlgprov.cxx | 3 | ||||
-rw-r--r-- | scripting/source/provider/ActiveMSPList.cxx | 3 | ||||
-rw-r--r-- | scripting/source/provider/ActiveMSPList.hxx | 9 | ||||
-rw-r--r-- | scripting/source/provider/BrowseNodeFactoryImpl.cxx | 3 | ||||
-rw-r--r-- | scripting/source/provider/MasterScriptProvider.cxx | 4 | ||||
-rw-r--r-- | scripting/source/provider/MasterScriptProviderFactory.cxx | 3 | ||||
-rw-r--r-- | scripting/source/stringresource/stringresource.cxx | 3 | ||||
-rw-r--r-- | scripting/source/vbaevents/eventhelper.cxx | 2 | ||||
-rw-r--r-- | scripting/source/vbaevents/service.hxx | 12 |
10 files changed, 6 insertions, 37 deletions
diff --git a/scripting/source/basprov/basprov.cxx b/scripting/source/basprov/basprov.cxx index 5bffe2a38863..6e8d5b3a0411 100644 --- a/scripting/source/basprov/basprov.cxx +++ b/scripting/source/basprov/basprov.cxx @@ -505,7 +505,6 @@ namespace basprov static Reference< XInterface > SAL_CALL create_BasicProviderImpl( Reference< XComponentContext > const & xContext ) - SAL_THROW(()) { return static_cast< lang::XTypeProvider * >( new BasicProviderImpl( xContext ) ); } diff --git a/scripting/source/dlgprov/dlgprov.cxx b/scripting/source/dlgprov/dlgprov.cxx index 5960369ea0d2..8e447d5230c4 100644 --- a/scripting/source/dlgprov/dlgprov.cxx +++ b/scripting/source/dlgprov/dlgprov.cxx @@ -78,7 +78,7 @@ namespace comp_DialogModelProvider return s; } - uno::Reference< uno::XInterface > SAL_CALL _create(const uno::Reference< uno::XComponentContext > & context) SAL_THROW((uno::Exception)) + uno::Reference< uno::XInterface > SAL_CALL _create(const uno::Reference< uno::XComponentContext > & context) { return static_cast< ::cppu::OWeakObject * >(new dlgprov::DialogModelProvider(context)); } @@ -791,7 +791,6 @@ static OUString aResourceResolverPropName("ResourceResolver"); static Reference< XInterface > SAL_CALL create_DialogProviderImpl( Reference< XComponentContext > const & xContext ) - SAL_THROW(()) { return static_cast< lang::XTypeProvider * >( new DialogProviderImpl( xContext ) ); } diff --git a/scripting/source/provider/ActiveMSPList.cxx b/scripting/source/provider/ActiveMSPList.cxx index 366349a8546e..780511448ac7 100644 --- a/scripting/source/provider/ActiveMSPList.cxx +++ b/scripting/source/provider/ActiveMSPList.cxx @@ -68,7 +68,6 @@ ActiveMSPList::createNewMSP( const uno::Any& context ) Reference< provider::XScriptProvider > ActiveMSPList::getMSPFromAnyContext( const Any& aContext ) - SAL_THROW(( lang::IllegalArgumentException, RuntimeException )) { Reference< provider::XScriptProvider > msp; OUString sContext; @@ -112,7 +111,6 @@ ActiveMSPList::getMSPFromAnyContext( const Any& aContext ) Reference< provider::XScriptProvider > ActiveMSPList::getMSPFromInvocationContext( const Reference< document::XScriptInvocationContext >& xContext ) - SAL_THROW(( lang::IllegalArgumentException, RuntimeException )) { Reference< provider::XScriptProvider > msp; @@ -147,7 +145,6 @@ Reference< provider::XScriptProvider > Reference< provider::XScriptProvider > ActiveMSPList::getMSPFromStringContext( const OUString& context ) - SAL_THROW(( lang::IllegalArgumentException, RuntimeException )) { Reference< provider::XScriptProvider > msp; try diff --git a/scripting/source/provider/ActiveMSPList.hxx b/scripting/source/provider/ActiveMSPList.hxx index 971156d006a5..cd3dc110f334 100644 --- a/scripting/source/provider/ActiveMSPList.hxx +++ b/scripting/source/provider/ActiveMSPList.hxx @@ -63,16 +63,13 @@ public: virtual ~ActiveMSPList(); css::uno::Reference< css::script::provider::XScriptProvider > - getMSPFromStringContext( const OUString& context ) - SAL_THROW(( css::lang::IllegalArgumentException, css::uno::RuntimeException )); + getMSPFromStringContext( const OUString& context ); css::uno::Reference< css::script::provider::XScriptProvider > - getMSPFromAnyContext( const css::uno::Any& context ) - SAL_THROW(( css::lang::IllegalArgumentException, css::uno::RuntimeException )); + getMSPFromAnyContext( const css::uno::Any& context ); css::uno::Reference< css::script::provider::XScriptProvider > - getMSPFromInvocationContext( const css::uno::Reference< css::document::XScriptInvocationContext >& context ) - SAL_THROW(( css::lang::IllegalArgumentException, css::uno::RuntimeException )); + getMSPFromInvocationContext( const css::uno::Reference< css::document::XScriptInvocationContext >& context ); //XEventListener diff --git a/scripting/source/provider/BrowseNodeFactoryImpl.cxx b/scripting/source/provider/BrowseNodeFactoryImpl.cxx index 61581f55459a..4a8af6affaf3 100644 --- a/scripting/source/provider/BrowseNodeFactoryImpl.cxx +++ b/scripting/source/provider/BrowseNodeFactoryImpl.cxx @@ -712,7 +712,6 @@ BrowseNodeFactoryImpl::getOrganizerHierarchy() Sequence< OUString > SAL_CALL bnf_getSupportedServiceNames( ) - SAL_THROW(()) { OUString str_name( "com.sun.star.script.browse.BrowseNodeFactory"); @@ -722,7 +721,6 @@ bnf_getSupportedServiceNames( ) OUString SAL_CALL bnf_getImplementationName( ) - SAL_THROW(()) { return OUString( "com.sun.star.script.browse.BrowseNodeFactory" ); @@ -730,7 +728,6 @@ bnf_getImplementationName( ) Reference< XInterface > SAL_CALL bnf_create( Reference< XComponentContext > const & xComponentContext ) - SAL_THROW( (Exception) ) { return static_cast< ::cppu::OWeakObject * >( new BrowseNodeFactoryImpl( xComponentContext ) ); diff --git a/scripting/source/provider/MasterScriptProvider.cxx b/scripting/source/provider/MasterScriptProvider.cxx index 3b02a10a8cf1..a66886622eb2 100644 --- a/scripting/source/provider/MasterScriptProvider.cxx +++ b/scripting/source/provider/MasterScriptProvider.cxx @@ -818,7 +818,6 @@ Reference< XInterface > SAL_CALL sp_create( Sequence< OUString > sp_getSupportedServiceNames( ) - SAL_THROW(()) { OUString names[3]; @@ -831,7 +830,6 @@ Sequence< OUString > sp_getSupportedServiceNames( ) OUString sp_getImplementationName( ) -SAL_THROW(()) { return OUString( "com.sun.star.script.provider.MasterScriptProvider" ); } @@ -845,7 +843,6 @@ Reference< XInterface > SAL_CALL urihelper_create( } Sequence< OUString > urihelper_getSupportedServiceNames( ) - SAL_THROW(()) { OUString serviceNameList[] = { OUString( @@ -858,7 +855,6 @@ Sequence< OUString > urihelper_getSupportedServiceNames( ) } OUString urihelper_getImplementationName( ) - SAL_THROW(()) { return OUString( "com.sun.star.script.provider.ScriptURIHelper"); diff --git a/scripting/source/provider/MasterScriptProviderFactory.cxx b/scripting/source/provider/MasterScriptProviderFactory.cxx index 547244a7e69a..4a676709e89a 100644 --- a/scripting/source/provider/MasterScriptProviderFactory.cxx +++ b/scripting/source/provider/MasterScriptProviderFactory.cxx @@ -64,7 +64,6 @@ MasterScriptProviderFactory::getActiveMSPList() const } Sequence< OUString > SAL_CALL mspf_getSupportedServiceNames( ) - SAL_THROW(()) { OUString str_name( "com.sun.star.script.provider.MasterScriptProviderFactory"); @@ -73,7 +72,6 @@ Sequence< OUString > SAL_CALL mspf_getSupportedServiceNames( ) } OUString SAL_CALL mspf_getImplementationName( ) - SAL_THROW(()) { return OUString( "com.sun.star.script.provider.MasterScriptProviderFactory"); @@ -81,7 +79,6 @@ OUString SAL_CALL mspf_getImplementationName( ) Reference< XInterface > SAL_CALL mspf_create( Reference< XComponentContext > const & xComponentContext ) - SAL_THROW( (Exception) ) { return static_cast< ::cppu::OWeakObject * >( new MasterScriptProviderFactory( xComponentContext ) ); diff --git a/scripting/source/stringresource/stringresource.cxx b/scripting/source/stringresource/stringresource.cxx index 1ecfd8e96487..15335314a936 100644 --- a/scripting/source/stringresource/stringresource.cxx +++ b/scripting/source/stringresource/stringresource.cxx @@ -92,7 +92,6 @@ static OUString getImplementationName_StringResourceImpl() static Reference< XInterface > SAL_CALL create_StringResourceImpl( Reference< XComponentContext > const & xContext ) - SAL_THROW(()) { return static_cast< ::cppu::OWeakObject * >( new StringResourcePersistenceImpl( xContext ) ); } @@ -2278,7 +2277,6 @@ static OUString getImplementationName_StringResourceWithStorageImpl() static Reference< XInterface > SAL_CALL create_StringResourceWithStorageImpl( Reference< XComponentContext > const & xContext ) - SAL_THROW(()) { return static_cast< ::cppu::OWeakObject * >( new StringResourceWithStorageImpl( xContext ) ); } @@ -2604,7 +2602,6 @@ static OUString getImplementationName_StringResourceWithLocationImpl() static Reference< XInterface > SAL_CALL create_StringResourceWithLocationImpl( Reference< XComponentContext > const & xContext ) - SAL_THROW(()) { return static_cast< ::cppu::OWeakObject * >( new StringResourceWithLocationImpl( xContext ) ); } diff --git a/scripting/source/vbaevents/eventhelper.cxx b/scripting/source/vbaevents/eventhelper.cxx index 2ac54c9a6f69..c5fe35169a6f 100644 --- a/scripting/source/vbaevents/eventhelper.cxx +++ b/scripting/source/vbaevents/eventhelper.cxx @@ -1073,7 +1073,6 @@ namespace evtlstner uno::Reference< XInterface > SAL_CALL create( Reference< XComponentContext > const & xContext ) - SAL_THROW(()) { return static_cast< lang::XTypeProvider * >( new EventListener( xContext ) ); } @@ -1103,7 +1102,6 @@ namespace ooevtdescgen uno::Reference< XInterface > SAL_CALL create( Reference< XComponentContext > const & xContext ) - SAL_THROW(()) { return static_cast< lang::XTypeProvider * >( new VBAToOOEventDescGen( xContext ) ); } diff --git a/scripting/source/vbaevents/service.hxx b/scripting/source/vbaevents/service.hxx index 901e8be2afdf..4c8357c90426 100644 --- a/scripting/source/vbaevents/service.hxx +++ b/scripting/source/vbaevents/service.hxx @@ -27,12 +27,8 @@ namespace evtlstner // component operations - css::uno::Reference< css::uno::XInterface > SAL_CALL create( - css::uno::Reference< css::uno::XComponentContext > const & xContext ) - SAL_THROW(()); - - + css::uno::Reference< css::uno::XComponentContext > const & xContext ); OUString SAL_CALL getImplementationName(); @@ -45,12 +41,8 @@ namespace ooevtdescgen // component operations - css::uno::Reference< css::uno::XInterface > SAL_CALL create( - css::uno::Reference< css::uno::XComponentContext > const & xContext ) - SAL_THROW(()); - - + css::uno::Reference< css::uno::XComponentContext > const & xContext ); OUString SAL_CALL getImplementationName(); |