diff options
| -rw-r--r-- | include/svx/AccessibleOLEShape.hxx | 2 | ||||
| -rw-r--r-- | include/svx/unopool.hxx | 2 | ||||
| -rw-r--r-- | sd/source/ui/accessibility/AccessiblePresentationOLEShape.cxx | 2 | ||||
| -rw-r--r-- | sd/source/ui/inc/AccessiblePresentationOLEShape.hxx | 2 | ||||
| -rw-r--r-- | svx/source/accessibility/AccessibleOLEShape.cxx | 4 |
5 files changed, 5 insertions, 7 deletions
diff --git a/include/svx/AccessibleOLEShape.hxx b/include/svx/AccessibleOLEShape.hxx index 4591edd939f2..5ff85ada3468 100644 --- a/include/svx/AccessibleOLEShape.hxx +++ b/include/svx/AccessibleOLEShape.hxx @@ -102,7 +102,7 @@ protected: /// Create a description string that contains the accessible description. virtual OUString CreateAccessibleDescription () - throw (::com::sun::star::uno::RuntimeException) SAL_OVERRIDE; + throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; private: AccessibleOLEShape (const AccessibleOLEShape&) SAL_DELETED_FUNCTION; diff --git a/include/svx/unopool.hxx b/include/svx/unopool.hxx index 37a3ab154cb1..c8947794c0be 100644 --- a/include/svx/unopool.hxx +++ b/include/svx/unopool.hxx @@ -78,7 +78,7 @@ protected: void init(); static void getAny( SfxItemPool* pPool, const comphelper::PropertyMapEntry* pEntry, ::com::sun::star::uno::Any& rValue ) throw(::com::sun::star::beans::UnknownPropertyException); - virtual void putAny( SfxItemPool* pPool, const comphelper::PropertyMapEntry* pEntry, const ::com::sun::star::uno::Any& rValue ) throw(::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::lang::IllegalArgumentException, css::uno::RuntimeException); + virtual void putAny( SfxItemPool* pPool, const comphelper::PropertyMapEntry* pEntry, const ::com::sun::star::uno::Any& rValue ) throw(::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::lang::IllegalArgumentException, css::uno::RuntimeException, std::exception); protected: SdrModel* mpModel; diff --git a/sd/source/ui/accessibility/AccessiblePresentationOLEShape.cxx b/sd/source/ui/accessibility/AccessiblePresentationOLEShape.cxx index f6307e68c28a..958e312b7cc6 100644 --- a/sd/source/ui/accessibility/AccessiblePresentationOLEShape.cxx +++ b/sd/source/ui/accessibility/AccessiblePresentationOLEShape.cxx @@ -82,7 +82,7 @@ OUString OUString AccessiblePresentationOLEShape::CreateAccessibleDescription() - throw (::com::sun::star::uno::RuntimeException) + throw (::com::sun::star::uno::RuntimeException, std::exception) { // return createAccessibleName(); DescriptionGenerator aDG (mxShape); diff --git a/sd/source/ui/inc/AccessiblePresentationOLEShape.hxx b/sd/source/ui/inc/AccessiblePresentationOLEShape.hxx index 4704774cb5ae..19ec75d15439 100644 --- a/sd/source/ui/inc/AccessiblePresentationOLEShape.hxx +++ b/sd/source/ui/inc/AccessiblePresentationOLEShape.hxx @@ -55,7 +55,7 @@ public: /// Create a description string that contains the accessible description. virtual OUString CreateAccessibleDescription () - throw (::com::sun::star::uno::RuntimeException) SAL_OVERRIDE; + throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; /// Return this object's role. virtual sal_Int16 SAL_CALL getAccessibleRole () throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; }; diff --git a/svx/source/accessibility/AccessibleOLEShape.cxx b/svx/source/accessibility/AccessibleOLEShape.cxx index 3c4bbac8387a..7cc19ff44dab 100644 --- a/svx/source/accessibility/AccessibleOLEShape.cxx +++ b/svx/source/accessibility/AccessibleOLEShape.cxx @@ -204,11 +204,9 @@ OUString return sName; } - - OUString AccessibleOLEShape::CreateAccessibleDescription() - throw (::com::sun::star::uno::RuntimeException) + throw (::com::sun::star::uno::RuntimeException, std::exception) { return CreateAccessibleName (); } |