User: obo Date: 06/03/29 04:16:43 Modified: /dba/connectivity/source/drivers/hsqldb/ HDriver.cxx
Log: INTEGRATION: CWS dba203a (1.15.66); FILE MERGED 2006/02/24 09:27:29 fs 1.15.66.1: #i62522# File Changes: Directory: /dba/connectivity/source/drivers/hsqldb/ =================================================== File [changed]: HDriver.cxx Url: http://dba.openoffice.org/source/browse/dba/connectivity/source/drivers/hsqldb/HDriver.cxx?r1=1.15&r2=1.16 Delta lines: +23 -24 --------------------- --- HDriver.cxx 23 Sep 2005 11:39:24 -0000 1.15 +++ HDriver.cxx 29 Mar 2006 12:16:41 -0000 1.16 @@ -337,9 +337,9 @@ //-------------------------------------------------------------------- Sequence< DriverPropertyInfo > SAL_CALL ODriverDelegator::getPropertyInfo( const ::rtl::OUString& url, const Sequence< PropertyValue >& info ) throw (SQLException, RuntimeException) { + if ( !acceptsURL(url) ) + return Sequence< DriverPropertyInfo >(); ::std::vector< DriverPropertyInfo > aDriverInfo; - if ( acceptsURL(url) ) - { aDriverInfo.push_back(DriverPropertyInfo( ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("Storage")) ,::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("Defines the storage where the database will be stored.")) @@ -361,7 +361,6 @@ ,::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("CALL IDENTITY()")) ,Sequence< ::rtl::OUString >()) ); - } return Sequence< DriverPropertyInfo >(&aDriverInfo[0],aDriverInfo.size()); } --------------------------------------------------------------------- To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, e-mail: [EMAIL PROTECTED]
