coverity#983802 Uncaught exception

Change-Id: I06be01500a767e600a7f391a3e74a92d05b6d73f
This commit is contained in:
Caolán McNamara
2014-05-24 15:08:43 +01:00
parent 31ded17441
commit 94cf259457
4 changed files with 4 additions and 4 deletions

View File

@@ -35,7 +35,7 @@ protected:
// Creating a SdrObject based on a Description. Cann be used by derived classes to // Creating a SdrObject based on a Description. Cann be used by derived classes to
// support own ::com::sun::star::drawing::Shapes (for example Controls) // support own ::com::sun::star::drawing::Shapes (for example Controls)
virtual SdrObject *_CreateSdrObject( const ::com::sun::star::uno::Reference< ::com::sun::star::drawing::XShape > & xShape ) virtual SdrObject *_CreateSdrObject( const ::com::sun::star::uno::Reference< ::com::sun::star::drawing::XShape > & xShape )
throw (std::exception) SAL_OVERRIDE; throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE;
// The following method is called when a SvxShape object should be created. // The following method is called when a SvxShape object should be created.
// Derived classes can create a derivation or an object aggregating SvxShape. // Derived classes can create a derivation or an object aggregating SvxShape.

View File

@@ -386,7 +386,7 @@ SdXImpressDocument* SdGenericDrawPage::GetModel() const
// this is called whenever a SdrObject must be created for a empty api shape wrapper // this is called whenever a SdrObject must be created for a empty api shape wrapper
SdrObject * SdGenericDrawPage::_CreateSdrObject( const Reference< drawing::XShape >& xShape ) SdrObject * SdGenericDrawPage::_CreateSdrObject( const Reference< drawing::XShape >& xShape )
throw (std::exception) throw (css::uno::RuntimeException, std::exception)
{ {
if( NULL == SvxFmDrawPage::mpPage || !xShape.is() ) if( NULL == SvxFmDrawPage::mpPage || !xShape.is() )
return NULL; return NULL;

View File

@@ -105,7 +105,7 @@ public:
// this is called whenever a SdrObject must be created for a empty api shape wrapper // this is called whenever a SdrObject must be created for a empty api shape wrapper
virtual SdrObject *_CreateSdrObject( const ::com::sun::star::uno::Reference< ::com::sun::star::drawing::XShape >& xShape ) virtual SdrObject *_CreateSdrObject( const ::com::sun::star::uno::Reference< ::com::sun::star::drawing::XShape >& xShape )
throw (std::exception) SAL_OVERRIDE; throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE;
// SvxFmDrawPage // SvxFmDrawPage
virtual ::com::sun::star::uno::Reference< ::com::sun::star::drawing::XShape > _CreateShape( SdrObject *pObj ) const virtual ::com::sun::star::uno::Reference< ::com::sun::star::drawing::XShape > _CreateShape( SdrObject *pObj ) const

View File

@@ -69,7 +69,7 @@ Any SAL_CALL SvxFmDrawPage::queryAggregation( const ::com::sun::star::uno::Type&
} }
SdrObject *SvxFmDrawPage::_CreateSdrObject( const ::com::sun::star::uno::Reference< ::com::sun::star::drawing::XShape > & xDescr ) SdrObject *SvxFmDrawPage::_CreateSdrObject( const ::com::sun::star::uno::Reference< ::com::sun::star::drawing::XShape > & xDescr )
throw (std::exception) throw (css::uno::RuntimeException, std::exception)
{ {
OUString aShapeType( xDescr->getShapeType() ); OUString aShapeType( xDescr->getShapeType() );