User: kz Date: 2006/12/13 08:22:05 Modified: dba/connectivity/source/drivers/odbc/ODriver.cxx
Log: INTEGRATION: CWS dba22ui (1.15.20); FILE MERGED 2006/12/05 15:02:48 fs 1.15.20.1: copying the fix for #i72252# from CWS dba22b to dba22ui - intended for the latter, but wrongly checked in into the former File Changes: Directory: /dba/connectivity/source/drivers/odbc/ ================================================= File [changed]: ODriver.cxx Url: http://dba.openoffice.org/source/browse/dba/connectivity/source/drivers/odbc/ODriver.cxx?r1=1.15&r2=1.16 Delta lines: +18 -11 --------------------- --- ODriver.cxx 17 Sep 2006 03:06:07 -0000 1.15 +++ ODriver.cxx 13 Dec 2006 16:22:01 -0000 1.16 @@ -154,9 +154,9 @@ { ::std::vector< DriverPropertyInfo > aDriverInfo; - Sequence< ::rtl::OUString > aBoolean(2); - aBoolean[0] = ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("0")); - aBoolean[1] = ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("1")); + Sequence< ::rtl::OUString > aBooleanValues(2); + aBooleanValues[0] = ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "false" ) ); + aBooleanValues[1] = ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "true" ) ); aDriverInfo.push_back(DriverPropertyInfo( ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("CharSet")) @@ -169,8 +169,8 @@ ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("UseCatalog")) ,::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("Use catalog for file-based databases.")) ,sal_False - ,::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("0")) - ,aBoolean) + ,::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "false" ) ) + ,aBooleanValues) ); aDriverInfo.push_back(DriverPropertyInfo( ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("SystemDriverSettings")) @@ -183,22 +183,22 @@ ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("ParameterNameSubstitution")) ,::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("Change named parameters with '?'.")) ,sal_False - ,::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("0")) - ,aBoolean) + ,::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "false" ) ) + ,aBooleanValues) ); aDriverInfo.push_back(DriverPropertyInfo( ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("IgnoreDriverPrivileges")) ,::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("Ignore the privileges from the database driver.")) ,sal_False - ,::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("0")) - ,aBoolean) + ,::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "false" ) ) + ,aBooleanValues) ); aDriverInfo.push_back(DriverPropertyInfo( ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("IsAutoRetrievingEnabled")) ,::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("Retrieve generated values.")) ,sal_False - ,::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("0")) - ,aBoolean) + ,::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "false" ) ) + ,aBooleanValues) ); aDriverInfo.push_back(DriverPropertyInfo( ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("AutoRetrievingStatement")) @@ -206,6 +206,13 @@ ,sal_False ,::rtl::OUString() ,Sequence< ::rtl::OUString >()) + ); + aDriverInfo.push_back(DriverPropertyInfo( + ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("GenerateASBeforeCorrelationName")) + ,::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("Generate AS before table correlation names.")) + ,sal_False + ,::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "true" ) ) + ,aBooleanValues) ); return Sequence< DriverPropertyInfo >(&aDriverInfo[0],aDriverInfo.size()); } --------------------------------------------------------------------- To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, e-mail: [EMAIL PROTECTED]
