User: vg Date: 05/02/17 02:15:31 Modified: /dba/connectivity/source/drivers/jdbc/ JDriver.cxx
Log: INTEGRATION: CWS dba23 (1.30.50); FILE MERGED 2005/01/20 16:31:43 oj 1.30.50.1: #i40970# check if java is enabled 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.30&r2=1.31 Delta lines: +7 -1 ------------------- --- JDriver.cxx 2 Aug 2004 17:05:00 -0000 1.30 +++ JDriver.cxx 17 Feb 2005 10:15:29 -0000 1.31 @@ -84,6 +84,9 @@ #ifndef _DBHELPER_DBEXCEPTION_HXX_ #include "connectivity/dbexception.hxx" #endif +#ifndef INCLUDED_JVMFWK_FRAMEWORK_H +#include <jvmfwk/framework.h> +#endif using namespace connectivity; using namespace ::com::sun::star::uno; @@ -163,8 +166,11 @@ { // 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" ); static const ::rtl::OUString s_sJdbcPrefix = ::rtl::OUString::createFromAscii("jdbc:"); - return 0 == url.compareTo(s_sJdbcPrefix, 5); + return bEnabled && 0 == url.compareTo(s_sJdbcPrefix, 5); } // ------------------------------------------------------------------------- Sequence< DriverPropertyInfo > SAL_CALL java_sql_Driver::getPropertyInfo( const ::rtl::OUString& url, --------------------------------------------------------------------- To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, e-mail: [EMAIL PROTECTED]
