diff options
| author | Stephan Bergmann <sbergman@redhat.com> | 2020-07-22 13:41:12 +0200 |
|---|---|---|
| committer | Stephan Bergmann <sbergman@redhat.com> | 2020-07-22 15:13:24 +0200 |
| commit | ddcc98fa50dd9d86a60dada4daa00f4d95ffe005 (patch) | |
| tree | d9a03e447ac75e7ddad07f4eb81d294310a3dc91 /odk/examples/cpp/complextoolbarcontrols/MyJob.h | |
| parent | 7adb6398dcb081999003c61985ae8a203c65ce0d (diff) | |
Remove obsolete dynamic exception specifications from SDK example C++ code
GCC 11 trunk g++ defaults to C++17 now, so that CustomTarget_odk/build-examples
and CustomTarget_odk/build-examples_java would now fail with "error: ISO C++17
does not allow dynamic exception specifications".
550e0e42d9ccef1244299b2d6cbda18549f8af19 "Remove dynamic exception
specifications from cppumaker-generated code" had long since removed the
exception specifications from the underlying (C++ classes representing) UNO
interface types, so just remove them from the SDK example code, too. An
alternative would have been to make sure those CustomTarget use an old C++
compiler standard. However, testing that the examples work against a new
standard has probably similar merit to testing that they keep working against
some obsolete standard.
Change-Id: I8ec9ac2f9ced7bd1b746fb00d9bce94bf6aedda5
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/99218
Tested-by: Jenkins
Reviewed-by: Stephan Bergmann <sbergman@redhat.com>
Diffstat (limited to 'odk/examples/cpp/complextoolbarcontrols/MyJob.h')
| -rw-r--r-- | odk/examples/cpp/complextoolbarcontrols/MyJob.h | 24 |
1 files changed, 8 insertions, 16 deletions
diff --git a/odk/examples/cpp/complextoolbarcontrols/MyJob.h b/odk/examples/cpp/complextoolbarcontrols/MyJob.h index 0741e5eed21e..e9f505f1c8cb 100644 --- a/odk/examples/cpp/complextoolbarcontrols/MyJob.h +++ b/odk/examples/cpp/complextoolbarcontrols/MyJob.h @@ -61,30 +61,22 @@ public: // XJob virtual ::com::sun::star::uno::Any SAL_CALL execute( - const ::com::sun::star::uno::Sequence< ::com::sun::star::beans::NamedValue >& Arguments ) - throw (::com::sun::star::lang::IllegalArgumentException, ::com::sun::star::uno::Exception, ::com::sun::star::uno::RuntimeException); + const ::com::sun::star::uno::Sequence< ::com::sun::star::beans::NamedValue >& Arguments ); // XServiceInfo - virtual ::rtl::OUString SAL_CALL getImplementationName( ) - throw (::com::sun::star::uno::RuntimeException); - virtual sal_Bool SAL_CALL supportsService( const ::rtl::OUString& ServiceName ) - throw (::com::sun::star::uno::RuntimeException); - virtual ::com::sun::star::uno::Sequence< ::rtl::OUString > SAL_CALL getSupportedServiceNames( ) - throw (::com::sun::star::uno::RuntimeException); + virtual ::rtl::OUString SAL_CALL getImplementationName( ); + virtual sal_Bool SAL_CALL supportsService( const ::rtl::OUString& ServiceName ); + virtual ::com::sun::star::uno::Sequence< ::rtl::OUString > SAL_CALL getSupportedServiceNames( ); }; -::rtl::OUString MyJob_getImplementationName() - throw ( ::com::sun::star::uno::RuntimeException ); +::rtl::OUString MyJob_getImplementationName(); -sal_Bool SAL_CALL MyJob_supportsService( const ::rtl::OUString& ServiceName ) - throw ( ::com::sun::star::uno::RuntimeException ); +sal_Bool SAL_CALL MyJob_supportsService( const ::rtl::OUString& ServiceName ); -::com::sun::star::uno::Sequence< ::rtl::OUString > SAL_CALL MyJob_getSupportedServiceNames( ) - throw ( ::com::sun::star::uno::RuntimeException ); +::com::sun::star::uno::Sequence< ::rtl::OUString > SAL_CALL MyJob_getSupportedServiceNames( ); ::com::sun::star::uno::Reference< ::com::sun::star::uno::XInterface > -SAL_CALL MyJob_createInstance( const ::com::sun::star::uno::Reference< ::com::sun::star::lang::XMultiServiceFactory > & rSMgr) - throw ( ::com::sun::star::uno::Exception ); +SAL_CALL MyJob_createInstance( const ::com::sun::star::uno::Reference< ::com::sun::star::lang::XMultiServiceFactory > & rSMgr); #endif |