summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorCaolán McNamara <caolanm@redhat.com>2014-05-24 15:08:43 +0100
committerCaolán McNamara <caolanm@redhat.com>2014-05-24 16:10:59 +0100
commit94cf2594570576c80287362e83d85c0feec8cc3e (patch)
treef34d0d2d640f8ecce78cb11bb397a191cfcb3f29
parent31ded1744150cac86c270957fd0fa193e8437a36 (diff)
coverity#983802 Uncaught exception
Change-Id: I06be01500a767e600a7f391a3e74a92d05b6d73f
-rw-r--r--include/svx/fmdpage.hxx2
-rw-r--r--sd/source/ui/unoidl/unopage.cxx2
-rw-r--r--sd/source/ui/unoidl/unopage.hxx2
-rw-r--r--svx/source/form/fmdpage.cxx2
4 files changed, 4 insertions, 4 deletions
diff --git a/include/svx/fmdpage.hxx b/include/svx/fmdpage.hxx
index ea78b789f8c8..e564570a6426 100644
--- a/include/svx/fmdpage.hxx
+++ b/include/svx/fmdpage.hxx
@@ -35,7 +35,7 @@ protected:
// Creating a SdrObject based on a Description. Cann be used by derived classes to
// 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 )
- 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.
// Derived classes can create a derivation or an object aggregating SvxShape.
diff --git a/sd/source/ui/unoidl/unopage.cxx b/sd/source/ui/unoidl/unopage.cxx
index a4fd2e2a758d..3e788c881980 100644
--- a/sd/source/ui/unoidl/unopage.cxx
+++ b/sd/source/ui/unoidl/unopage.cxx
@@ -386,7 +386,7 @@ SdXImpressDocument* SdGenericDrawPage::GetModel() const
// this is called whenever a SdrObject must be created for a empty api shape wrapper
SdrObject * SdGenericDrawPage::_CreateSdrObject( const Reference< drawing::XShape >& xShape )
- throw (std::exception)
+ throw (css::uno::RuntimeException, std::exception)
{
if( NULL == SvxFmDrawPage::mpPage || !xShape.is() )
return NULL;
diff --git a/sd/source/ui/unoidl/unopage.hxx b/sd/source/ui/unoidl/unopage.hxx
index e2712b021e09..b2ea8aab9fa8 100644
--- a/sd/source/ui/unoidl/unopage.hxx
+++ b/sd/source/ui/unoidl/unopage.hxx
@@ -105,7 +105,7 @@ public:
// 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 )
- throw (std::exception) SAL_OVERRIDE;
+ throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE;
// SvxFmDrawPage
virtual ::com::sun::star::uno::Reference< ::com::sun::star::drawing::XShape > _CreateShape( SdrObject *pObj ) const
diff --git a/svx/source/form/fmdpage.cxx b/svx/source/form/fmdpage.cxx
index c0867cc9ed77..a7245b18226b 100644
--- a/svx/source/form/fmdpage.cxx
+++ b/svx/source/form/fmdpage.cxx
@@ -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 )
- throw (std::exception)
+ throw (css::uno::RuntimeException, std::exception)
{
OUString aShapeType( xDescr->getShapeType() );