From 11383f56fb6889a324dd74725e5092ac4ce3999d Mon Sep 17 00:00:00 2001 From: Noel Grandin Date: Thu, 5 Jun 2014 08:08:35 +0200 Subject: connectivity: remove SAL_THROW macro Change-Id: Id3bbb7a0d39a41b7106303f42d55ba4968235b63 --- include/connectivity/CommonTools.hxx | 8 ++++---- include/connectivity/FValue.hxx | 8 ++++---- include/connectivity/dbconversion.hxx | 6 ++---- include/connectivity/dbtools.hxx | 19 +++++++------------ include/connectivity/parameters.hxx | 10 +++++----- include/connectivity/sqliterator.hxx | 8 ++++---- include/connectivity/sqlscan.hxx | 8 ++++---- include/connectivity/virtualdbtools.hxx | 12 +++++------- 8 files changed, 35 insertions(+), 44 deletions(-) (limited to 'include/connectivity') diff --git a/include/connectivity/CommonTools.hxx b/include/connectivity/CommonTools.hxx index bbf919cced16..d09990531aa9 100644 --- a/include/connectivity/CommonTools.hxx +++ b/include/connectivity/CommonTools.hxx @@ -90,13 +90,13 @@ namespace connectivity std::vector< VectorVal > & get() { return m_vector; } std::vector< VectorVal > const & get() const { return m_vector; } - inline static void * SAL_CALL operator new( size_t nSize ) SAL_THROW(()) + inline static void * SAL_CALL operator new( size_t nSize ) { return ::rtl_allocateMemory( nSize ); } - inline static void SAL_CALL operator delete( void * pMem ) SAL_THROW(()) + inline static void SAL_CALL operator delete( void * pMem ) { ::rtl_freeMemory( pMem ); } - inline static void * SAL_CALL operator new( size_t, void * pMem ) SAL_THROW(()) + inline static void * SAL_CALL operator new( size_t, void * pMem ) { return pMem; } - inline static void SAL_CALL operator delete( void *, void * ) SAL_THROW(()) + inline static void SAL_CALL operator delete( void *, void * ) {} void acquire() diff --git a/include/connectivity/FValue.hxx b/include/connectivity/FValue.hxx index 8b0dc6201269..787785d8199d 100644 --- a/include/connectivity/FValue.hxx +++ b/include/connectivity/FValue.hxx @@ -273,13 +273,13 @@ namespace connectivity free(); } - inline static void * SAL_CALL operator new( size_t nSize ) SAL_THROW(()) + inline static void * SAL_CALL operator new( size_t nSize ) { return ::rtl_allocateMemory( nSize ); } - inline static void * SAL_CALL operator new( size_t,void* _pHint ) SAL_THROW(()) + inline static void * SAL_CALL operator new( size_t,void* _pHint ) { return _pHint; } - inline static void SAL_CALL operator delete( void * pMem ) SAL_THROW(()) + inline static void SAL_CALL operator delete( void * pMem ) { ::rtl_freeMemory( pMem ); } - inline static void SAL_CALL operator delete( void *,void* ) SAL_THROW(()) + inline static void SAL_CALL operator delete( void *,void* ) { } ORowSetValue& operator=(const ORowSetValue& _rRH); diff --git a/include/connectivity/dbconversion.hxx b/include/connectivity/dbconversion.hxx index 62ec97f69f3e..f99de9aa7bd0 100644 --- a/include/connectivity/dbconversion.hxx +++ b/include/connectivity/dbconversion.hxx @@ -165,8 +165,7 @@ namespace dbtools const OUString& _rSource, OString& _rDest, rtl_TextEncoding _eEncoding - ) - SAL_THROW((::com::sun::star::sdbc::SQLException)); + ); /** converts a Unicode string into a 8-bit string, using the given encoding @@ -196,8 +195,7 @@ namespace dbtools OString& _rDest, sal_Int32 _nMaxLen, rtl_TextEncoding _eEncoding - ) - SAL_THROW((::com::sun::star::sdbc::SQLException)); + ); }; diff --git a/include/connectivity/dbtools.hxx b/include/connectivity/dbtools.hxx index 1edd02bffe47..73e20b2006ab 100644 --- a/include/connectivity/dbtools.hxx +++ b/include/connectivity/dbtools.hxx @@ -149,9 +149,7 @@ namespace dbtools const ::com::sun::star::uno::Reference< ::com::sun::star::sdbc::XRowSet>& _rxRowSet, const ::com::sun::star::uno::Reference< ::com::sun::star::uno::XComponentContext>& _rxContext, bool _bSetAsActiveConnection - ) SAL_THROW ( ( ::com::sun::star::sdbc::SQLException - , ::com::sun::star::lang::WrappedTargetException - , ::com::sun::star::uno::RuntimeException ) ); + ); /** ensures that a row set has a valid ActiveConnection, if possible @@ -180,9 +178,7 @@ namespace dbtools const ::com::sun::star::uno::Reference< ::com::sun::star::sdbc::XRowSet>& _rxRowSet, const ::com::sun::star::uno::Reference< ::com::sun::star::uno::XComponentContext>& _rxContext, bool _bUseAutoConnectionDisposer - ) SAL_THROW ( ( ::com::sun::star::sdbc::SQLException - , ::com::sun::star::lang::WrappedTargetException - , ::com::sun::star::uno::RuntimeException ) ); + ); /** returns the connection the RowSet is currently working with (which is the ActiveConnection property) */ @@ -191,8 +187,7 @@ namespace dbtools const OUString& _rDataSourceName, const OUString& _rUser, const OUString& _rPwd, - const ::com::sun::star::uno::Reference< ::com::sun::star::uno::XComponentContext>& _rxContext) - SAL_THROW ( (::com::sun::star::sdbc::SQLException) ); + const ::com::sun::star::uno::Reference< ::com::sun::star::uno::XComponentContext>& _rxContext); /** determines whether the given component is part of a document which is an embedded database @@ -266,7 +261,7 @@ namespace dbtools const OUString& _rCommand, ::com::sun::star::uno::Reference< ::com::sun::star::lang::XComponent >& _rxKeepFieldsAlive, SQLExceptionInfo* _pErrorInfo = NULL - ) SAL_THROW( ( ) ); + ); /** get fields for a result set given by a "command descriptor" @@ -302,7 +297,7 @@ namespace dbtools const sal_Int32 _nCommandType, const OUString& _rCommand, SQLExceptionInfo* _pErrorInfo = NULL - ) SAL_THROW( ( ) ); + ); /** create a new ::com::sun::star::sdbc::SQLContext, fill it with the given descriptions and the given source, @@ -559,7 +554,7 @@ namespace dbtools OOO_DLLPUBLIC_DBTOOLS bool implUpdateObject( const ::com::sun::star::uno::Reference< ::com::sun::star::sdbc::XRowUpdate >& _rxUpdatedObject, const sal_Int32 _nColumnIndex, - const ::com::sun::star::uno::Any& _rValue) SAL_THROW ( ( ::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException) ); + const ::com::sun::star::uno::Any& _rValue); @@ -619,7 +614,7 @@ namespace dbtools OOO_DLLPUBLIC_DBTOOLS bool implSetObject( const ::com::sun::star::uno::Reference< ::com::sun::star::sdbc::XParameters>& _rxParameters, const sal_Int32 _nColumnIndex, - const ::com::sun::star::uno::Any& _rValue) SAL_THROW ( ( ::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException ) ); + const ::com::sun::star::uno::Any& _rValue); /** creates the standard sql create table statement without the key part. @param descriptor diff --git a/include/connectivity/parameters.hxx b/include/connectivity/parameters.hxx index e1962b835253..f39cf08dab83 100644 --- a/include/connectivity/parameters.hxx +++ b/include/connectivity/parameters.hxx @@ -186,7 +186,7 @@ namespace dbtools @precond the instance is alive, i.e. isAlive returns */ - void setAllParametersNull() SAL_THROW( ( ::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException ) ); + void setAllParametersNull(); /** resets all detail columns which are, via a parameter, linked to a master column, to the value of this master column. @@ -197,7 +197,7 @@ namespace dbtools @precond the instance is alive, i.e. isAlive returns */ - void resetParameterValues() SAL_THROW(()); + void resetParameterValues(); /** tells the object that it's database component is being disposed @@ -316,7 +316,7 @@ namespace dbtools const ::com::sun::star::uno::Reference< ::com::sun::star::container::XNameAccess >& _rxParentColumns, const ::com::sun::star::uno::Reference< ::com::sun::star::container::XNameAccess >& _rxColumns, ::std::vector< OUString >& _out_rAdditionalFilterComponents - ) SAL_THROW(( ::com::sun::star::uno::Exception )); + ); /** finalizes our m_pOuterParameters so that it can be used for external parameter listeners @@ -390,7 +390,7 @@ namespace dbtools bool getColumns( ::com::sun::star::uno::Reference< ::com::sun::star::container::XNameAccess >& /* [out] */ _rxColumns, bool _bFromComposer - ) SAL_THROW(( ::com::sun::star::uno::Exception )); + ); /** retrieves the active connection of the database component */ @@ -400,7 +400,7 @@ namespace dbtools /** caches some info about the connection of our database component */ - void cacheConnectionInfo() SAL_THROW(( )); + void cacheConnectionInfo(); private: ParameterManager(); // never implemented diff --git a/include/connectivity/sqliterator.hxx b/include/connectivity/sqliterator.hxx index 66cb66fcdf60..ef792db83017 100644 --- a/include/connectivity/sqliterator.hxx +++ b/include/connectivity/sqliterator.hxx @@ -140,13 +140,13 @@ namespace connectivity const OSQLParseNode* pRoot = NULL ); ~OSQLParseTreeIterator(); - inline static void * SAL_CALL operator new( size_t nSize ) SAL_THROW(()) + inline static void * SAL_CALL operator new( size_t nSize ) { return ::rtl_allocateMemory( nSize ); } - inline static void * SAL_CALL operator new( size_t,void* _pHint ) SAL_THROW(()) + inline static void * SAL_CALL operator new( size_t,void* _pHint ) { return _pHint; } - inline static void SAL_CALL operator delete( void * pMem ) SAL_THROW(()) + inline static void SAL_CALL operator delete( void * pMem ) { ::rtl_freeMemory( pMem ); } - inline static void SAL_CALL operator delete( void *,void* ) SAL_THROW(()) + inline static void SAL_CALL operator delete( void *,void* ) { } void dispose(); diff --git a/include/connectivity/sqlscan.hxx b/include/connectivity/sqlscan.hxx index 038ed7830eb7..301efddc6dca 100644 --- a/include/connectivity/sqlscan.hxx +++ b/include/connectivity/sqlscan.hxx @@ -44,13 +44,13 @@ namespace connectivity OSQLScanner(); virtual ~OSQLScanner(); - inline static void * SAL_CALL operator new( size_t nSize ) SAL_THROW(()) + inline static void * SAL_CALL operator new( size_t nSize ) { return ::rtl_allocateMemory( nSize ); } - inline static void * SAL_CALL operator new( size_t,void* _pHint ) SAL_THROW(()) + inline static void * SAL_CALL operator new( size_t,void* _pHint ) { return _pHint; } - inline static void SAL_CALL operator delete( void * pMem ) SAL_THROW(()) + inline static void SAL_CALL operator delete( void * pMem ) { ::rtl_freeMemory( pMem ); } - inline static void SAL_CALL operator delete( void *,void* ) SAL_THROW(()) + inline static void SAL_CALL operator delete( void *,void* ) { } virtual sal_Int32 SQLyygetc(void); diff --git a/include/connectivity/virtualdbtools.hxx b/include/connectivity/virtualdbtools.hxx index a19222a71166..e3b647b3ec18 100644 --- a/include/connectivity/virtualdbtools.hxx +++ b/include/connectivity/virtualdbtools.hxx @@ -120,19 +120,17 @@ namespace connectivity const OUString& _rUser, const OUString& _rPwd, const ::com::sun::star::uno::Reference< ::com::sun::star::uno::XComponentContext>& _rxContext - ) const SAL_THROW ( (::com::sun::star::sdbc::SQLException) ) = 0; + ) const = 0; virtual ::com::sun::star::uno::Reference< ::com::sun::star::sdbc::XConnection> connectRowset( const ::com::sun::star::uno::Reference< ::com::sun::star::sdbc::XRowSet>& _rxRowSet, const ::com::sun::star::uno::Reference< ::com::sun::star::uno::XComponentContext>& _rxContext, sal_Bool _bSetAsActiveConnection - ) const SAL_THROW ( ( ::com::sun::star::sdbc::SQLException - , ::com::sun::star::lang::WrappedTargetException - , ::com::sun::star::uno::RuntimeException ) ) = 0; + ) const = 0; virtual ::com::sun::star::uno::Reference< ::com::sun::star::sdbc::XConnection> getRowSetConnection( const ::com::sun::star::uno::Reference< ::com::sun::star::sdbc::XRowSet>& _rxRowSet) - const SAL_THROW ( (::com::sun::star::uno::RuntimeException) ) = 0; + const = 0; virtual ::com::sun::star::uno::Reference< ::com::sun::star::util::XNumberFormatsSupplier> getNumberFormats( const ::com::sun::star::uno::Reference< ::com::sun::star::sdbc::XConnection>& _rxConn, @@ -187,7 +185,7 @@ namespace connectivity const OUString& _rCommand, ::com::sun::star::uno::Reference< ::com::sun::star::lang::XComponent >& _rxKeepFieldsAlive, ::dbtools::SQLExceptionInfo* _pErrorInfo = NULL - ) SAL_THROW( ( ) ) = 0; + ) = 0; virtual ::com::sun::star::uno::Sequence< OUString > getFieldNamesByCommandDescriptor( @@ -195,7 +193,7 @@ namespace connectivity const sal_Int32 _nCommandType, const OUString& _rCommand, ::dbtools::SQLExceptionInfo* _pErrorInfo = NULL - ) SAL_THROW( ( ) ) = 0; + ) = 0; /** check if the property "Privileges" supports ::com::sun::star::sdbcx::Privilege::INSERT @param _rxCursorSet the property set -- cgit