diff options
author | Noel Grandin <noel@peralex.com> | 2014-06-05 08:16:59 +0200 |
---|---|---|
committer | Noel Grandin <noel@peralex.com> | 2014-06-05 08:17:52 +0200 |
commit | 0e507ae031768deceab236a41d1bbe9fb5123cea (patch) | |
tree | 34cc1626f1e8fa6d50d6edd88045be6252150f19 /framework | |
parent | db246b491c1639942d9f952658d33974e9b06201 (diff) |
various: remove SAL_THROW macro
Change-Id: I9464179a736b91f5bc32eb5e5e89b3b4e3da3494
Diffstat (limited to 'framework')
-rw-r--r-- | framework/inc/uielement/constitemcontainer.hxx | 2 | ||||
-rw-r--r-- | framework/source/fwi/uielement/constitemcontainer.cxx | 7 | ||||
-rw-r--r-- | framework/source/recording/dispatchrecorder.cxx | 2 |
3 files changed, 4 insertions, 7 deletions
diff --git a/framework/inc/uielement/constitemcontainer.hxx b/framework/inc/uielement/constitemcontainer.hxx index b7aec23011be..00ec059a627b 100644 --- a/framework/inc/uielement/constitemcontainer.hxx +++ b/framework/inc/uielement/constitemcontainer.hxx @@ -97,7 +97,7 @@ class FWI_DLLPUBLIC ConstItemContainer : public ::cppu::WeakImplHelper4< private: ::cppu::IPropertyArrayHelper& SAL_CALL getInfoHelper(); const com::sun::star::uno::Sequence< com::sun::star::beans::Property > impl_getStaticPropertyDescriptor(); - static ::com::sun::star::uno::Reference < ::com::sun::star::beans::XPropertySetInfo > SAL_CALL createPropertySetInfo( ::cppu::IPropertyArrayHelper & rProperties ) SAL_THROW(()); + static ::com::sun::star::uno::Reference < ::com::sun::star::beans::XPropertySetInfo > SAL_CALL createPropertySetInfo( ::cppu::IPropertyArrayHelper & rProperties ); void copyItemContainer( const std::vector< com::sun::star::uno::Sequence< com::sun::star::beans::PropertyValue > >& rSourceVector ); com::sun::star::uno::Reference< com::sun::star::container::XIndexAccess > deepCopyContainer( const com::sun::star::uno::Reference< com::sun::star::container::XIndexAccess >& rSubContainer ); diff --git a/framework/source/fwi/uielement/constitemcontainer.cxx b/framework/source/fwi/uielement/constitemcontainer.cxx index 2622311d4363..79a014125ff0 100644 --- a/framework/source/fwi/uielement/constitemcontainer.cxx +++ b/framework/source/fwi/uielement/constitemcontainer.cxx @@ -46,7 +46,7 @@ namespace framework */ extern "C" { -static int SAL_CALL compare_OUString_Property_Impl( const void *arg1, const void *arg2 ) SAL_THROW(()) +static int SAL_CALL compare_OUString_Property_Impl( const void *arg1, const void *arg2 ) { return ((OUString *)arg1)->compareTo( ((Property *)arg2)->Name ); } @@ -58,7 +58,7 @@ class OPropertySetHelperInfo_Impl Sequence < Property > aInfos; public: - OPropertySetHelperInfo_Impl( IPropertyArrayHelper & rHelper_ ) SAL_THROW(()); + OPropertySetHelperInfo_Impl( IPropertyArrayHelper & rHelper_ ); // XPropertySetInfo-Methoden virtual Sequence< Property > SAL_CALL getProperties(void) throw(::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; @@ -71,7 +71,6 @@ public: */ OPropertySetHelperInfo_Impl::OPropertySetHelperInfo_Impl( IPropertyArrayHelper & rHelper_ ) - SAL_THROW(()) :aInfos( rHelper_.getProperties() ) { } @@ -408,7 +407,7 @@ const com::sun::star::uno::Sequence< com::sun::star::beans::Property > ConstItem } Reference < XPropertySetInfo > ConstItemContainer::createPropertySetInfo( - IPropertyArrayHelper & rProperties ) SAL_THROW(()) + IPropertyArrayHelper & rProperties ) { return static_cast< XPropertySetInfo * >( new OPropertySetHelperInfo_Impl( rProperties ) ); } diff --git a/framework/source/recording/dispatchrecorder.cxx b/framework/source/recording/dispatchrecorder.cxx index aeb15d5a8027..482aa7883a4d 100644 --- a/framework/source/recording/dispatchrecorder.cxx +++ b/framework/source/recording/dispatchrecorder.cxx @@ -50,7 +50,6 @@ DEFINE_INIT_SERVICE( void flatten_struct_members( ::std::vector< Any > * vec, void const * data, typelib_CompoundTypeDescription * pTD ) - SAL_THROW(()) { if (pTD->pBaseTypeDescription) { @@ -65,7 +64,6 @@ void flatten_struct_members( Sequence< Any > make_seq_out_of_struct( Any const & val ) - SAL_THROW( (RuntimeException) ) { Type const & type = val.getValueType(); TypeClass eTypeClass = type.getTypeClass(); |