summaryrefslogtreecommitdiff
path: root/sd
diff options
context:
space:
mode:
authorCaolán McNamara <caolanm@redhat.com>2014-02-13 16:38:47 +0000
committerCaolán McNamara <caolanm@redhat.com>2014-02-13 21:04:47 +0000
commitf5b2959152b3eead3b427b0d90942d0ae3a205f0 (patch)
treea8fe1e3de8b6a29e420fa48bc689397bf1a245d7 /sd
parent7cb5f8b07dbec98285db712b17863b39e7481a5c (diff)
coverity#737833 Uncaught exception
Change-Id: I71b3022c84a861959ec1c70a7d2f9e94766df250
Diffstat (limited to 'sd')
-rw-r--r--sd/source/ui/unoidl/unoobj.cxx8
-rw-r--r--sd/source/ui/unoidl/unoobj.hxx6
2 files changed, 9 insertions, 5 deletions
diff --git a/sd/source/ui/unoidl/unoobj.cxx b/sd/source/ui/unoidl/unoobj.cxx
index 699ce482f61a..fad68ba44f93 100644
--- a/sd/source/ui/unoidl/unoobj.cxx
+++ b/sd/source/ui/unoidl/unoobj.cxx
@@ -476,7 +476,8 @@ void SAL_CALL SdXShape::setPropertyValue( const OUString& aPropertyName, const :
::com::sun::star::beans::PropertyVetoException,
::com::sun::star::lang::IllegalArgumentException,
::com::sun::star::lang::WrappedTargetException,
- ::com::sun::star::uno::RuntimeException)
+ ::com::sun::star::uno::RuntimeException,
+ std::exception)
{
SolarMutexGuard aGuard;
@@ -853,7 +854,8 @@ void SAL_CALL SdXShape::setPropertyValue( const OUString& aPropertyName, const :
}
/** */
-SdAnimationInfo* SdXShape::GetAnimationInfo( sal_Bool bCreate ) const throw()
+SdAnimationInfo* SdXShape::GetAnimationInfo( sal_Bool bCreate ) const
+ throw (std::exception)
{
SdAnimationInfo* pInfo = NULL;
@@ -949,7 +951,7 @@ OUString SdXShape::GetPlaceholderText() const
/** sets/reset the empty status of a presentation object
*/
void SdXShape::SetEmptyPresObj(bool bEmpty)
- throw std::exception()
+ throw (std::exception)
{
// only possible if this actually *is* a presentation object
if( !IsPresObj() )
diff --git a/sd/source/ui/unoidl/unoobj.hxx b/sd/source/ui/unoidl/unoobj.hxx
index e82628c413f6..9ef6c3db8409 100644
--- a/sd/source/ui/unoidl/unoobj.hxx
+++ b/sd/source/ui/unoidl/unoobj.hxx
@@ -51,12 +51,14 @@ private:
::com::sun::star::uno::Any GetStyleSheet() const throw( ::com::sun::star::beans::UnknownPropertyException );
// Intern
- SdAnimationInfo* GetAnimationInfo( sal_Bool bCreate = sal_False ) const throw();
+ SdAnimationInfo* GetAnimationInfo( sal_Bool bCreate = sal_False ) const
+ throw (std::exception);
sal_Bool IsPresObj() const throw();
void SetPresObj( sal_Bool bPresObj ) throw();
bool IsEmptyPresObj() const throw();
- void SetEmptyPresObj(bool bEmpty) throw (std::exception);
+ void SetEmptyPresObj(bool bEmpty)
+ throw (std::exception);
sal_Bool IsMasterDepend() const throw();
void SetMasterDepend( sal_Bool bDepend ) throw();