diff options
| author | Caolán McNamara <caolanm@redhat.com> | 2014-07-01 10:19:45 +0100 |
|---|---|---|
| committer | Caolán McNamara <caolanm@redhat.com> | 2014-07-01 10:56:15 +0100 |
| commit | 855010d9d1db33b8cb11f32d2f94014df6997682 (patch) | |
| tree | dc4a5b7016509acfd5084cea87cede97ea5f665f | |
| parent | 1b6cefaf68b89da765847093ecb542c1139935d3 (diff) | |
coverity#707290 Uncaught exception
Change-Id: If020fd537c15c41fe33134f554b7df1f10f18570
| -rw-r--r-- | sw/inc/unodraw.hxx | 2 | ||||
| -rw-r--r-- | sw/source/core/unocore/unodraw.cxx | 3 |
2 files changed, 3 insertions, 2 deletions
diff --git a/sw/inc/unodraw.hxx b/sw/inc/unodraw.hxx index 04dceffb02db..540448dd6965 100644 --- a/sw/inc/unodraw.hxx +++ b/sw/inc/unodraw.hxx @@ -64,7 +64,7 @@ public: // The following method is called when a SvxShape-object is to be created. // Derived classes may obtain at this point a derivation or an object // that is aggregating a SvxShape. - virtual ::com::sun::star::uno::Reference< ::com::sun::star::drawing::XShape > _CreateShape( SdrObject *pObj ) const throw (std::exception) SAL_OVERRIDE; + virtual ::com::sun::star::uno::Reference< ::com::sun::star::drawing::XShape > _CreateShape( SdrObject *pObj ) const throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE; }; typedef cppu::WeakAggImplHelper4 diff --git a/sw/source/core/unocore/unodraw.cxx b/sw/source/core/unocore/unodraw.cxx index c11fc43b2e12..2717324d72ea 100644 --- a/sw/source/core/unocore/unodraw.cxx +++ b/sw/source/core/unocore/unodraw.cxx @@ -300,7 +300,8 @@ SdrObject* SwFmDrawPage::_CreateSdrObject( const uno::Reference< drawing::XShape return SvxFmDrawPage::_CreateSdrObject( xShape ); } -uno::Reference< drawing::XShape > SwFmDrawPage::_CreateShape( SdrObject *pObj ) const throw (std::exception) +uno::Reference< drawing::XShape > SwFmDrawPage::_CreateShape( SdrObject *pObj ) const + throw (uno::RuntimeException, std::exception) { uno::Reference< drawing::XShape > xRet; if(pObj->ISA(SwVirtFlyDrawObj) || pObj->GetObjInventor() == SWGInventor) |