diff options
| author | Stephan Bergmann <sbergman@redhat.com> | 2014-02-25 21:31:58 +0100 |
|---|---|---|
| committer | Stephan Bergmann <sbergman@redhat.com> | 2014-02-26 18:22:20 +0100 |
| commit | 5e21a413c788f839a66d9e4c14e745ed18058db8 (patch) | |
| tree | d4451246461346a425ad6f796e08bf1514cdd942 /xmloff/source/draw/ximppage.cxx | |
| parent | Fixup whitespace changes, remove commented code. (diff) | |
| download | core-5e21a413c788f839a66d9e4c14e745ed18058db8.tar.gz core-5e21a413c788f839a66d9e4c14e745ed18058db8.zip | |
cppuhelper: retrofit std::exception into overriding exception specs
Change-Id: I56e32131b7991ee9948ce46765632eb823d463b3
Diffstat (limited to 'xmloff/source/draw/ximppage.cxx')
| -rw-r--r-- | xmloff/source/draw/ximppage.cxx | 16 |
1 files changed, 8 insertions, 8 deletions
diff --git a/xmloff/source/draw/ximppage.cxx b/xmloff/source/draw/ximppage.cxx index 0fd0aa87073b..c43a03d4c3b0 100644 --- a/xmloff/source/draw/ximppage.cxx +++ b/xmloff/source/draw/ximppage.cxx @@ -537,12 +537,12 @@ public: XoNavigationOrderAccess( std::vector< Reference< XShape > >& rShapes ); // XIndexAccess - virtual sal_Int32 SAL_CALL getCount( ) throw (RuntimeException); - virtual Any SAL_CALL getByIndex( sal_Int32 Index ) throw (IndexOutOfBoundsException, WrappedTargetException, RuntimeException); + virtual sal_Int32 SAL_CALL getCount( ) throw (RuntimeException, std::exception); + virtual Any SAL_CALL getByIndex( sal_Int32 Index ) throw (IndexOutOfBoundsException, WrappedTargetException, RuntimeException, std::exception); // XElementAccess - virtual Type SAL_CALL getElementType( ) throw (RuntimeException); - virtual sal_Bool SAL_CALL hasElements( ) throw (RuntimeException); + virtual Type SAL_CALL getElementType( ) throw (RuntimeException, std::exception); + virtual sal_Bool SAL_CALL hasElements( ) throw (RuntimeException, std::exception); private: std::vector< Reference< XShape > > maShapes; @@ -554,12 +554,12 @@ XoNavigationOrderAccess::XoNavigationOrderAccess( std::vector< Reference< XShape } // XIndexAccess -sal_Int32 SAL_CALL XoNavigationOrderAccess::getCount( ) throw (RuntimeException) +sal_Int32 SAL_CALL XoNavigationOrderAccess::getCount( ) throw (RuntimeException, std::exception) { return static_cast< sal_Int32 >( maShapes.size() ); } -Any SAL_CALL XoNavigationOrderAccess::getByIndex( sal_Int32 Index ) throw (IndexOutOfBoundsException, WrappedTargetException, RuntimeException) +Any SAL_CALL XoNavigationOrderAccess::getByIndex( sal_Int32 Index ) throw (IndexOutOfBoundsException, WrappedTargetException, RuntimeException, std::exception) { if( (Index < 0) || (Index > getCount()) ) throw IndexOutOfBoundsException(); @@ -568,12 +568,12 @@ Any SAL_CALL XoNavigationOrderAccess::getByIndex( sal_Int32 Index ) throw (Index } // XElementAccess -Type SAL_CALL XoNavigationOrderAccess::getElementType( ) throw (RuntimeException) +Type SAL_CALL XoNavigationOrderAccess::getElementType( ) throw (RuntimeException, std::exception) { return cppu::UnoType<XShape>::get(); } -sal_Bool SAL_CALL XoNavigationOrderAccess::hasElements( ) throw (RuntimeException) +sal_Bool SAL_CALL XoNavigationOrderAccess::hasElements( ) throw (RuntimeException, std::exception) { return maShapes.empty() ? sal_False : sal_True; } |