Tag: cws_src680_warnings01 User: sb Date: 06/04/07 13:21:28 Modified: /dba/connectivity/source/drivers/hsqldb/ HDriver.cxx
Log: RESYNC: (1.15-1.16); FILE MERGED 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.14.8.5&r2=1.14.8.6 Delta lines: +26 -27 --------------------- --- HDriver.cxx 22 Dec 2005 11:44:48 -0000 1.14.8.5 +++ HDriver.cxx 7 Apr 2006 20:21:26 -0000 1.14.8.6 @@ -342,9 +342,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.")) @@ -366,7 +366,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]
