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/DevelopersGuide/Database/DriverSkeleton/SResultSetMetaData.cxx | |
parent | Silence GCC 11 trunk -Werror=nonnull in external/boost (diff) | |
download | core-ddcc98fa50dd9d86a60dada4daa00f4d95ffe005.tar.gz core-ddcc98fa50dd9d86a60dada4daa00f4d95ffe005.zip |
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/DevelopersGuide/Database/DriverSkeleton/SResultSetMetaData.cxx')
-rw-r--r-- | odk/examples/DevelopersGuide/Database/DriverSkeleton/SResultSetMetaData.cxx | 42 |
1 files changed, 21 insertions, 21 deletions
diff --git a/odk/examples/DevelopersGuide/Database/DriverSkeleton/SResultSetMetaData.cxx b/odk/examples/DevelopersGuide/Database/DriverSkeleton/SResultSetMetaData.cxx index 348af271dda1..32e8dc0f4543 100644 --- a/odk/examples/DevelopersGuide/Database/DriverSkeleton/SResultSetMetaData.cxx +++ b/odk/examples/DevelopersGuide/Database/DriverSkeleton/SResultSetMetaData.cxx @@ -46,122 +46,122 @@ OResultSetMetaData::~OResultSetMetaData() } -sal_Int32 SAL_CALL OResultSetMetaData::getColumnDisplaySize( sal_Int32 column ) throw(SQLException, RuntimeException) +sal_Int32 SAL_CALL OResultSetMetaData::getColumnDisplaySize( sal_Int32 column ) { return 50; } -sal_Int32 SAL_CALL OResultSetMetaData::getColumnType( sal_Int32 column ) throw(SQLException, RuntimeException) +sal_Int32 SAL_CALL OResultSetMetaData::getColumnType( sal_Int32 column ) { sal_Int32 nType = 0; return nType; } -sal_Int32 SAL_CALL OResultSetMetaData::getColumnCount( ) throw(SQLException, RuntimeException) +sal_Int32 SAL_CALL OResultSetMetaData::getColumnCount( ) { // this makes no sense here so you have to change this return 0; } -sal_Bool SAL_CALL OResultSetMetaData::isCaseSensitive( sal_Int32 column ) throw(SQLException, RuntimeException) +sal_Bool SAL_CALL OResultSetMetaData::isCaseSensitive( sal_Int32 column ) { return sal_True; } -::rtl::OUString SAL_CALL OResultSetMetaData::getSchemaName( sal_Int32 column ) throw(SQLException, RuntimeException) +::rtl::OUString SAL_CALL OResultSetMetaData::getSchemaName( sal_Int32 column ) { return ::rtl::OUString(); } -::rtl::OUString SAL_CALL OResultSetMetaData::getColumnName( sal_Int32 column ) throw(SQLException, RuntimeException) +::rtl::OUString SAL_CALL OResultSetMetaData::getColumnName( sal_Int32 column ) { return ::rtl::OUString("Column") + ::rtl::OUString::number(column); } -::rtl::OUString SAL_CALL OResultSetMetaData::getTableName( sal_Int32 column ) throw(SQLException, RuntimeException) +::rtl::OUString SAL_CALL OResultSetMetaData::getTableName( sal_Int32 column ) { return ::rtl::OUString(); } -::rtl::OUString SAL_CALL OResultSetMetaData::getCatalogName( sal_Int32 column ) throw(SQLException, RuntimeException) +::rtl::OUString SAL_CALL OResultSetMetaData::getCatalogName( sal_Int32 column ) { return ::rtl::OUString(); } -::rtl::OUString SAL_CALL OResultSetMetaData::getColumnTypeName( sal_Int32 column ) throw(SQLException, RuntimeException) +::rtl::OUString SAL_CALL OResultSetMetaData::getColumnTypeName( sal_Int32 column ) { return ::rtl::OUString(); } -::rtl::OUString SAL_CALL OResultSetMetaData::getColumnLabel( sal_Int32 column ) throw(SQLException, RuntimeException) +::rtl::OUString SAL_CALL OResultSetMetaData::getColumnLabel( sal_Int32 column ) { return ::rtl::OUString(); } -::rtl::OUString SAL_CALL OResultSetMetaData::getColumnServiceName( sal_Int32 column ) throw(SQLException, RuntimeException) +::rtl::OUString SAL_CALL OResultSetMetaData::getColumnServiceName( sal_Int32 column ) { return ::rtl::OUString(); } -sal_Bool SAL_CALL OResultSetMetaData::isCurrency( sal_Int32 column ) throw(SQLException, RuntimeException) +sal_Bool SAL_CALL OResultSetMetaData::isCurrency( sal_Int32 column ) { return sal_False; } -sal_Bool SAL_CALL OResultSetMetaData::isAutoIncrement( sal_Int32 column ) throw(SQLException, RuntimeException) +sal_Bool SAL_CALL OResultSetMetaData::isAutoIncrement( sal_Int32 column ) { return sal_False; } -sal_Bool SAL_CALL OResultSetMetaData::isSigned( sal_Int32 column ) throw(SQLException, RuntimeException) +sal_Bool SAL_CALL OResultSetMetaData::isSigned( sal_Int32 column ) { return sal_False; } -sal_Int32 SAL_CALL OResultSetMetaData::getPrecision( sal_Int32 column ) throw(SQLException, RuntimeException) +sal_Int32 SAL_CALL OResultSetMetaData::getPrecision( sal_Int32 column ) { return 0; } -sal_Int32 SAL_CALL OResultSetMetaData::getScale( sal_Int32 column ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException) +sal_Int32 SAL_CALL OResultSetMetaData::getScale( sal_Int32 column ) { return 0; } -sal_Int32 SAL_CALL OResultSetMetaData::isNullable( sal_Int32 column ) throw(SQLException, RuntimeException) +sal_Int32 SAL_CALL OResultSetMetaData::isNullable( sal_Int32 column ) { return 0; } -sal_Bool SAL_CALL OResultSetMetaData::isSearchable( sal_Int32 column ) throw(SQLException, RuntimeException) +sal_Bool SAL_CALL OResultSetMetaData::isSearchable( sal_Int32 column ) { return sal_True; } -sal_Bool SAL_CALL OResultSetMetaData::isReadOnly( sal_Int32 column ) throw(SQLException, RuntimeException) +sal_Bool SAL_CALL OResultSetMetaData::isReadOnly( sal_Int32 column ) { return sal_True; } -sal_Bool SAL_CALL OResultSetMetaData::isDefinitelyWritable( sal_Int32 column ) throw(SQLException, RuntimeException) +sal_Bool SAL_CALL OResultSetMetaData::isDefinitelyWritable( sal_Int32 column ) { return sal_False; ; } -sal_Bool SAL_CALL OResultSetMetaData::isWritable( sal_Int32 column ) throw(SQLException, RuntimeException) +sal_Bool SAL_CALL OResultSetMetaData::isWritable( sal_Int32 column ) { return sal_False; } |