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 /sc/inc/miscuno.hxx | |
| 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 'sc/inc/miscuno.hxx')
| -rw-r--r-- | sc/inc/miscuno.hxx | 38 |
1 files changed, 19 insertions, 19 deletions
diff --git a/sc/inc/miscuno.hxx b/sc/inc/miscuno.hxx index 5c35b36dc284..db46d8a6f607 100644 --- a/sc/inc/miscuno.hxx +++ b/sc/inc/miscuno.hxx @@ -32,18 +32,18 @@ #define SC_SIMPLE_SERVICE_INFO( ClassName, ClassNameAscii, ServiceAscii ) \ OUString SAL_CALL ClassName::getImplementationName() \ - throw(::com::sun::star::uno::RuntimeException) \ + throw(::com::sun::star::uno::RuntimeException, std::exception) \ { \ return OUString::createFromAscii(ClassNameAscii); \ } \ sal_Bool SAL_CALL ClassName::supportsService( const OUString& ServiceName ) \ - throw(::com::sun::star::uno::RuntimeException) \ + throw(::com::sun::star::uno::RuntimeException, std::exception) \ { \ return cppu::supportsService(this, ServiceName); \ } \ ::com::sun::star::uno::Sequence< OUString > \ SAL_CALL ClassName::getSupportedServiceNames(void) \ - throw(::com::sun::star::uno::RuntimeException) \ + throw(::com::sun::star::uno::RuntimeException, std::exception) \ { \ ::com::sun::star::uno::Sequence< OUString > aRet(1); \ OUString* pArray = aRet.getArray(); \ @@ -55,22 +55,22 @@ sal_Bool SAL_CALL ClassName::supportsService( const OUString& ServiceName ) \ void SAL_CALL ClassName::addPropertyChangeListener( const OUString&, \ const uno::Reference<beans::XPropertyChangeListener>&) \ throw(beans::UnknownPropertyException, \ - lang::WrappedTargetException, uno::RuntimeException) \ + lang::WrappedTargetException, uno::RuntimeException, std::exception) \ { OSL_FAIL("not implemented"); } \ void SAL_CALL ClassName::removePropertyChangeListener( const OUString&, \ const uno::Reference<beans::XPropertyChangeListener>&) \ throw(beans::UnknownPropertyException, \ - lang::WrappedTargetException, uno::RuntimeException) \ + lang::WrappedTargetException, uno::RuntimeException, std::exception) \ { OSL_FAIL("not implemented"); } \ void SAL_CALL ClassName::addVetoableChangeListener( const OUString&, \ const uno::Reference<beans::XVetoableChangeListener>&) \ throw(beans::UnknownPropertyException, \ - lang::WrappedTargetException, uno::RuntimeException) \ + lang::WrappedTargetException, uno::RuntimeException, std::exception) \ { OSL_FAIL("not implemented"); } \ void SAL_CALL ClassName::removeVetoableChangeListener( const OUString&, \ const uno::Reference<beans::XVetoableChangeListener>&) \ throw(beans::UnknownPropertyException, \ - lang::WrappedTargetException, uno::RuntimeException) \ + lang::WrappedTargetException, uno::RuntimeException, std::exception) \ { OSL_FAIL("not implemented"); } @@ -101,19 +101,19 @@ public: virtual ~ScIndexEnumeration(); // XEnumeration - virtual sal_Bool SAL_CALL hasMoreElements() throw(::com::sun::star::uno::RuntimeException); + virtual sal_Bool SAL_CALL hasMoreElements() throw(::com::sun::star::uno::RuntimeException, std::exception); virtual ::com::sun::star::uno::Any SAL_CALL nextElement() throw(::com::sun::star::container::NoSuchElementException, ::com::sun::star::lang::WrappedTargetException, - ::com::sun::star::uno::RuntimeException); + ::com::sun::star::uno::RuntimeException, std::exception); // XServiceInfo virtual OUString SAL_CALL getImplementationName( ) - throw(::com::sun::star::uno::RuntimeException); + throw(::com::sun::star::uno::RuntimeException, std::exception); virtual sal_Bool SAL_CALL supportsService( const OUString& ServiceName ) - throw(::com::sun::star::uno::RuntimeException); + throw(::com::sun::star::uno::RuntimeException, std::exception); virtual ::com::sun::star::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames( ) - throw(::com::sun::star::uno::RuntimeException); + throw(::com::sun::star::uno::RuntimeException, std::exception); }; // new (uno 3) variant @@ -132,24 +132,24 @@ public: virtual ~ScNameToIndexAccess(); // XIndexAccess - virtual sal_Int32 SAL_CALL getCount( ) throw(::com::sun::star::uno::RuntimeException); + virtual sal_Int32 SAL_CALL getCount( ) throw(::com::sun::star::uno::RuntimeException, std::exception); virtual ::com::sun::star::uno::Any SAL_CALL getByIndex( sal_Int32 Index ) throw(::com::sun::star::lang::IndexOutOfBoundsException, ::com::sun::star::lang::WrappedTargetException, - ::com::sun::star::uno::RuntimeException); + ::com::sun::star::uno::RuntimeException, std::exception); // XElementAccess virtual ::com::sun::star::uno::Type SAL_CALL getElementType( ) - throw(::com::sun::star::uno::RuntimeException); - virtual sal_Bool SAL_CALL hasElements( ) throw(::com::sun::star::uno::RuntimeException); + throw(::com::sun::star::uno::RuntimeException, std::exception); + virtual sal_Bool SAL_CALL hasElements( ) throw(::com::sun::star::uno::RuntimeException, std::exception); // XServiceInfo virtual OUString SAL_CALL getImplementationName( ) - throw(::com::sun::star::uno::RuntimeException); + throw(::com::sun::star::uno::RuntimeException, std::exception); virtual sal_Bool SAL_CALL supportsService( const OUString& ServiceName ) - throw(::com::sun::star::uno::RuntimeException); + throw(::com::sun::star::uno::RuntimeException, std::exception); virtual ::com::sun::star::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames( ) - throw(::com::sun::star::uno::RuntimeException); + throw(::com::sun::star::uno::RuntimeException, std::exception); }; class SC_DLLPUBLIC ScUnoHelpFunctions |