diff options
author | Caolán McNamara <caolanm@redhat.com> | 2015-07-02 09:15:23 +0100 |
---|---|---|
committer | Caolán McNamara <caolanm@redhat.com> | 2015-07-02 11:39:34 +0100 |
commit | 1d498fb0feca911fa063e96779b654c3aded2415 (patch) | |
tree | af68b46ac75ca322011739eda846d3c9d721e9c5 /sw | |
parent | 3f2c6a02df51f5d548bb1100275860be5196b766 (diff) |
some other coverity things
Change-Id: I89ffd2b918f8707cde1b1d015c1ad35ef484b69c
Diffstat (limited to 'sw')
-rw-r--r-- | sw/inc/unocrsrhelper.hxx | 11 | ||||
-rw-r--r-- | sw/inc/unostyle.hxx | 2 | ||||
-rw-r--r-- | sw/source/core/unocore/unoobj.cxx | 2 | ||||
-rw-r--r-- | sw/source/core/unocore/unostyle.cxx | 2 |
4 files changed, 9 insertions, 8 deletions
diff --git a/sw/inc/unocrsrhelper.hxx b/sw/inc/unocrsrhelper.hxx index 5a82bd4602ba..96926392ac99 100644 --- a/sw/inc/unocrsrhelper.hxx +++ b/sw/inc/unocrsrhelper.hxx @@ -171,11 +171,12 @@ namespace SwUnoCursorHelper rPropertyValues, const SetAttrMode nAttrMode = SetAttrMode::DEFAULT, const bool bTableMode = false) - throw (::com::sun::star::beans::UnknownPropertyException, - ::com::sun::star::beans::PropertyVetoException, - ::com::sun::star::lang::IllegalArgumentException, - ::com::sun::star::lang::WrappedTargetException, - ::com::sun::star::uno::RuntimeException); + throw (css::beans::UnknownPropertyException, + css::beans::PropertyVetoException, + css::lang::IllegalArgumentException, + css::lang::WrappedTargetException, + css::uno::RuntimeException, + std::exception); ::com::sun::star::uno::Any GetPropertyValue( SwPaM& rPaM, const SfxItemPropertySet & rPropSet, diff --git a/sw/inc/unostyle.hxx b/sw/inc/unostyle.hxx index d252a6984712..e856f234e818 100644 --- a/sw/inc/unostyle.hxx +++ b/sw/inc/unostyle.hxx @@ -195,7 +195,7 @@ protected: ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException, std::exception); - ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Any > SAL_CALL GetPropertyValues_Impl( const ::com::sun::star::uno::Sequence< OUString >& aPropertyNames ) throw(::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException); + ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Any > SAL_CALL GetPropertyValues_Impl( const ::com::sun::star::uno::Sequence< OUString >& aPropertyNames ) throw(::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException, std::exception); virtual void Modify( const SfxPoolItem* pOld, const SfxPoolItem *pNew) SAL_OVERRIDE; public: diff --git a/sw/source/core/unocore/unoobj.cxx b/sw/source/core/unocore/unoobj.cxx index c2fbd477a3a9..dc0c45c8171c 100644 --- a/sw/source/core/unocore/unoobj.cxx +++ b/sw/source/core/unocore/unoobj.cxx @@ -1798,7 +1798,7 @@ void SwUnoCursorHelper::SetPropertyValues( const SetAttrMode nAttrMode, const bool bTableMode) throw (beans::UnknownPropertyException, beans::PropertyVetoException, lang::IllegalArgumentException, lang::WrappedTargetException, - uno::RuntimeException) + uno::RuntimeException, std::exception) { if (!rPropertyValues.getLength()) return; diff --git a/sw/source/core/unocore/unostyle.cxx b/sw/source/core/unocore/unostyle.cxx index b43c4f7819d2..24b33b6eacda 100644 --- a/sw/source/core/unocore/unostyle.cxx +++ b/sw/source/core/unocore/unostyle.cxx @@ -2624,7 +2624,7 @@ static uno::Any lcl_GetStyleProperty(const SfxItemPropertySimpleEntry& rEntry, uno::Sequence< uno::Any > SAL_CALL SwXStyle::GetPropertyValues_Impl( const uno::Sequence< OUString > & rPropertyNames ) - throw( beans::UnknownPropertyException, lang::WrappedTargetException, uno::RuntimeException ) + throw( beans::UnknownPropertyException, lang::WrappedTargetException, uno::RuntimeException, std::exception ) { if ( !m_pDoc ) throw uno::RuntimeException(); |