diff options
| author | Caolán McNamara <caolanm@redhat.com> | 2015-11-06 09:29:48 +0000 |
|---|---|---|
| committer | Caolán McNamara <caolanm@redhat.com> | 2015-11-06 12:15:49 +0000 |
| commit | a114895f1fd232d25e6bc8cf149878bf7106b3bb (patch) | |
| tree | e72fa5cf0aaf7ea9efb8ba62323159736e2bc130 | |
| parent | abf49c259b88cb6537ab4b818df3cac5c62d23c2 (diff) | |
coverity#1338240 Uncaught exception
Change-Id: I3b1b1c9745cae1dd7a765769ea761973d0a60134
| -rw-r--r-- | include/svx/unoshape.hxx | 2 | ||||
| -rw-r--r-- | svx/source/unodraw/unoshap4.cxx | 3 |
2 files changed, 2 insertions, 3 deletions
diff --git a/include/svx/unoshape.hxx b/include/svx/unoshape.hxx index 843b7c964cb1..7ed8a2c71f11 100644 --- a/include/svx/unoshape.hxx +++ b/include/svx/unoshape.hxx @@ -874,7 +874,7 @@ public: protected: // override these for special property handling in subcasses. Return true if property is handled - virtual bool setPropertyValueImpl( const OUString& rName, const SfxItemPropertySimpleEntry* pProperty, const css::uno::Any& rValue ) throw(css::beans::UnknownPropertyException, css::beans::PropertyVetoException, css::lang::IllegalArgumentException, css::lang::WrappedTargetException, css::uno::RuntimeException) override; + virtual bool setPropertyValueImpl( const OUString& rName, const SfxItemPropertySimpleEntry* pProperty, const css::uno::Any& rValue ) throw(css::beans::UnknownPropertyException, css::beans::PropertyVetoException, css::lang::IllegalArgumentException, css::lang::WrappedTargetException, css::uno::RuntimeException, std::exception) override; virtual bool getPropertyValueImpl( const OUString& rName, const SfxItemPropertySimpleEntry* pProperty, css::uno::Any& rValue ) throw(css::beans::UnknownPropertyException, css::lang::WrappedTargetException, css::uno::RuntimeException, std::exception) override; private: diff --git a/svx/source/unodraw/unoshap4.cxx b/svx/source/unodraw/unoshap4.cxx index 4f3bc05a5bf3..71e46ff5bab0 100644 --- a/svx/source/unodraw/unoshap4.cxx +++ b/svx/source/unodraw/unoshap4.cxx @@ -806,8 +806,7 @@ SvxMediaShape::~SvxMediaShape() throw() } - -bool SvxMediaShape::setPropertyValueImpl( const OUString& rName, const SfxItemPropertySimpleEntry* pProperty, const css::uno::Any& rValue ) throw(css::beans::UnknownPropertyException, css::beans::PropertyVetoException, css::lang::IllegalArgumentException, css::lang::WrappedTargetException, css::uno::RuntimeException) +bool SvxMediaShape::setPropertyValueImpl( const OUString& rName, const SfxItemPropertySimpleEntry* pProperty, const css::uno::Any& rValue ) throw(css::beans::UnknownPropertyException, css::beans::PropertyVetoException, css::lang::IllegalArgumentException, css::lang::WrappedTargetException, css::uno::RuntimeException, std::exception) { if( ((pProperty->nWID >= OWN_ATTR_MEDIA_URL) && (pProperty->nWID <= OWN_ATTR_MEDIA_ZOOM)) || (pProperty->nWID == OWN_ATTR_MEDIA_STREAM) |