diff options
| author | Jens-Heiner Rechtien <hr@openoffice.org> | 2006-06-20 00:29:52 +0000 |
|---|---|---|
| committer | Jens-Heiner Rechtien <hr@openoffice.org> | 2006-06-20 00:29:52 +0000 |
| commit | 713f0c3ae8328c6514aaf287351bd4c8fc79f6eb (patch) | |
| tree | c60ec2a08b744847913e119847c85d4550d59c97 /connectivity/source/drivers/hsqldb/HDriver.cxx | |
| parent | 64ebfd0936009df870f6457f0058242479b7ebe1 (diff) | |
INTEGRATION: CWS warnings01 (1.14.8); FILE MERGED
2006/04/07 20:21:26 sb 1.14.8.6: RESYNC: (1.15-1.16); FILE MERGED
2005/12/22 11:44:48 fs 1.14.8.5: #i57457# warning-free code
2005/11/21 15:51:39 fs 1.14.8.4: #i57457# OSL_VERIFY_EQUALS
2005/11/16 12:59:05 fs 1.14.8.3: #i57457# warning free code
2005/11/07 19:09:17 pl 1.14.8.2: RESYNC: (1.14-1.15); FILE MERGED
2005/11/07 14:43:36 fs 1.14.8.1: #i57457# warning-free code
Diffstat (limited to 'connectivity/source/drivers/hsqldb/HDriver.cxx')
| -rw-r--r-- | connectivity/source/drivers/hsqldb/HDriver.cxx | 26 |
1 files changed, 16 insertions, 10 deletions
diff --git a/connectivity/source/drivers/hsqldb/HDriver.cxx b/connectivity/source/drivers/hsqldb/HDriver.cxx index 3d02bcd119..5bcdde54ab 100644 --- a/connectivity/source/drivers/hsqldb/HDriver.cxx +++ b/connectivity/source/drivers/hsqldb/HDriver.cxx @@ -4,9 +4,9 @@ * * $RCSfile: HDriver.cxx,v $ * - * $Revision: 1.16 $ + * $Revision: 1.17 $ * - * last change: $Author: obo $ $Date: 2006-03-29 12:16:41 $ + * last change: $Author: hr $ $Date: 2006-06-20 01:29:52 $ * * The Contents of this file are made available subject to * the terms of GNU Lesser General Public License Version 2.1. @@ -83,6 +83,9 @@ #ifndef CONNECTIVITY_HSQLDB_CATALOG_HXX #include "hsqldb/HCatalog.hxx" #endif +#ifndef CONNECTIVITY_DIAGNOSE_EX_H +#include "diagnose_ex.h" +#endif #ifndef _RTL_USTRBUF_HXX_ #include <rtl/ustrbuf.hxx> #endif @@ -92,6 +95,9 @@ #ifndef _OSL_PROCESS_H_ #include <osl/process.h> #endif +#ifndef _DBHELPER_DBEXCEPTION_HXX_ +#include <connectivity/dbexception.hxx> +#endif //........................................................................ namespace connectivity { @@ -329,13 +335,12 @@ namespace connectivity sal_Bool SAL_CALL ODriverDelegator::acceptsURL( const ::rtl::OUString& url ) throw (SQLException, RuntimeException) { sal_Bool bEnabled = sal_False; - javaFrameworkError eErr = jfw_getEnabled( &bEnabled ); - OSL_ENSURE( JFW_E_NONE == eErr,"error in jfw_getEnabled" ); + OSL_VERIFY_EQUALS( jfw_getEnabled( &bEnabled ), JFW_E_NONE, "error in jfw_getEnabled" ); return bEnabled && url.compareToAscii("sdbc:embedded:hsqldb",sizeof("sdbc:embedded:hsqldb")) == 0; } //-------------------------------------------------------------------- - Sequence< DriverPropertyInfo > SAL_CALL ODriverDelegator::getPropertyInfo( const ::rtl::OUString& url, const Sequence< PropertyValue >& info ) throw (SQLException, RuntimeException) + Sequence< DriverPropertyInfo > SAL_CALL ODriverDelegator::getPropertyInfo( const ::rtl::OUString& url, const Sequence< PropertyValue >& /*info*/ ) throw (SQLException, RuntimeException) { if ( !acceptsURL(url) ) return Sequence< DriverPropertyInfo >(); @@ -449,8 +454,9 @@ namespace connectivity return getSupportedServiceNames_Static(); } //------------------------------------------------------------------ - void SAL_CALL ODriverDelegator::createCatalog( const Sequence< PropertyValue >& info ) throw (SQLException, ::com::sun::star::container::ElementExistException, RuntimeException) + void SAL_CALL ODriverDelegator::createCatalog( const Sequence< PropertyValue >& /*info*/ ) throw (SQLException, ::com::sun::star::container::ElementExistException, RuntimeException) { + ::dbtools::throwFeatureNotImplementedException( "XCreateCatalog::createCatalog", *this ); } //------------------------------------------------------------------ void ODriverDelegator::shutdownConnection(const TWeakPairVector::iterator& _aIter ) @@ -579,15 +585,15 @@ namespace connectivity } } //------------------------------------------------------------------ - void SAL_CALL ODriverDelegator::commited( const ::com::sun::star::lang::EventObject& aEvent ) throw (::com::sun::star::uno::RuntimeException) + void SAL_CALL ODriverDelegator::commited( const ::com::sun::star::lang::EventObject& /*aEvent*/ ) throw (::com::sun::star::uno::RuntimeException) { } //------------------------------------------------------------------ - void SAL_CALL ODriverDelegator::preRevert( const ::com::sun::star::lang::EventObject& aEvent ) throw (::com::sun::star::uno::Exception, ::com::sun::star::uno::RuntimeException) + void SAL_CALL ODriverDelegator::preRevert( const ::com::sun::star::lang::EventObject& /*aEvent*/ ) throw (::com::sun::star::uno::Exception, ::com::sun::star::uno::RuntimeException) { } //------------------------------------------------------------------ - void SAL_CALL ODriverDelegator::reverted( const ::com::sun::star::lang::EventObject& aEvent ) throw (::com::sun::star::uno::RuntimeException) + void SAL_CALL ODriverDelegator::reverted( const ::com::sun::star::lang::EventObject& /*aEvent*/ ) throw (::com::sun::star::uno::RuntimeException) { } //------------------------------------------------------------------ @@ -810,7 +816,7 @@ namespace connectivity xStatement->execute( aStatement.makeStringAndClear() ); } } - catch( const Exception& e ) + catch( const Exception& ) { OSL_ENSURE( sal_False, "ODriverDelegator::onConnectedNewDatabase: caught an exception!" ); } |