User: obo     
Date: 06/03/29 04:20:03

Modified:
 /dba/connectivity/source/drivers/mysql/
  YDriver.cxx

Log:
 INTEGRATION: CWS dba203a (1.14.8); FILE MERGED
 2006/02/24 09:27:50 fs 1.14.8.1: #i62522#

File Changes:

Directory: /dba/connectivity/source/drivers/mysql/
==================================================

File [changed]: YDriver.cxx
Url: 
http://dba.openoffice.org/source/browse/dba/connectivity/source/drivers/mysql/YDriver.cxx?r1=1.14&r2=1.15
Delta lines:  +30 -29
---------------------
--- YDriver.cxx 3 Feb 2006 17:14:31 -0000       1.14
+++ YDriver.cxx 29 Mar 2006 12:20:00 -0000      1.15
@@ -295,8 +295,9 @@
        Sequence< DriverPropertyInfo > SAL_CALL 
ODriverDelegator::getPropertyInfo( const ::rtl::OUString& url, const Sequence< 
PropertyValue >& info ) throw (SQLException, RuntimeException)
        {
                ::std::vector< DriverPropertyInfo > aDriverInfo;
-               if ( acceptsURL(url) )
-               {
+               if ( !acceptsURL(url) )
+            return Sequence< DriverPropertyInfo >();
+
                        sal_Bool bIsODBC = isOdbcUrl( url );
 
                        Sequence< ::rtl::OUString > aBoolean(2);
@@ -328,7 +329,7 @@
                                                ,Sequence< ::rtl::OUString >())
                                                );
                        }
-               }
+
                return Sequence< DriverPropertyInfo 
>(&aDriverInfo[0],aDriverInfo.size()); 
        }
 




---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]

Reply via email to