User: hr Date: 06/06/19 18:34:42 Modified: /dba/connectivity/source/drivers/jdbc/ JDriver.cxx
Log: INTEGRATION: CWS warnings01 (1.34.30); FILE MERGED 2005/11/21 15:51:40 fs 1.34.30.3: #i57457# OSL_VERIFY_EQUALS 2005/11/16 12:59:10 fs 1.34.30.2: #i57457# warning free code 2005/11/07 14:43:41 fs 1.34.30.1: #i57457# warning-free code File Changes: Directory: /dba/connectivity/source/drivers/jdbc/ ================================================= File [changed]: JDriver.cxx Url: http://dba.openoffice.org/source/browse/dba/connectivity/source/drivers/jdbc/JDriver.cxx?r1=1.34&r2=1.35 Delta lines: +10 -8 -------------------- --- JDriver.cxx 8 Sep 2005 06:10:55 -0000 1.34 +++ JDriver.cxx 20 Jun 2006 01:34:40 -0000 1.35 @@ -60,6 +60,9 @@ #ifndef INCLUDED_JVMFWK_FRAMEWORK_H #include <jvmfwk/framework.h> #endif +#ifndef CONNECTIVITY_DIAGNOSE_EX_H +#include "diagnose_ex.h" +#endif using namespace connectivity; using namespace ::com::sun::star::uno; @@ -140,14 +143,13 @@ // don't ask the real driver for the url // I feel responsible for all jdbc url's 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" ); static const ::rtl::OUString s_sJdbcPrefix = ::rtl::OUString::createFromAscii("jdbc:"); return bEnabled && 0 == url.compareTo(s_sJdbcPrefix, 5); } // ------------------------------------------------------------------------- Sequence< DriverPropertyInfo > SAL_CALL java_sql_Driver::getPropertyInfo( const ::rtl::OUString& url, - const Sequence< PropertyValue >& info ) throw(SQLException, RuntimeException) + const Sequence< PropertyValue >& /*info*/ ) throw(SQLException, RuntimeException) { if ( acceptsURL(url) ) { --------------------------------------------------------------------- To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, e-mail: [EMAIL PROTECTED]
