Tag: cws_src680_dba22b User: fs Date: 2006/12/18 02:44:51 Modified: dba/connectivity/source/drivers/odbc/OConnection.cxx
Log: RESYNC: (1.38-1.40); FILE MERGED File Changes: Directory: /dba/connectivity/source/drivers/odbc/ ================================================= File [changed]: OConnection.cxx Url: http://dba.openoffice.org/source/browse/dba/connectivity/source/drivers/odbc/OConnection.cxx?r1=1.38.50.1&r2=1.38.50.2 Delta lines: +7 -10 -------------------- --- OConnection.cxx 5 Dec 2006 14:47:37 -0000 1.38.50.1 +++ OConnection.cxx 18 Dec 2006 10:44:48 -0000 1.38.50.2 @@ -44,9 +44,6 @@ #ifndef _CONNECTIVITY_ODBC_ODATABASEMETADATA_HXX_ #include "odbc/ODatabaseMetaData.hxx" #endif -#ifndef _CONNECTIVITY_RESOURCE_HRC_ -#include "Resource.hrc" -#endif #ifndef _CONNECTIVITY_ODBC_OFUNCTIONS_HXX_ #include "odbc/OFunctions.hxx" #endif @@ -587,19 +584,19 @@ aInfo.bNullable = (sal_Int32)aValue == ColumnValue::NULLABLE; ++nPos; aValue.fill(nPos,aTypes[nPos],xRow); - aInfo.bCaseSensitive = aValue; + aInfo.bCaseSensitive = (sal_Bool)aValue; ++nPos; aValue.fill(nPos,aTypes[nPos],xRow); aInfo.nSearchType = aValue; ++nPos; aValue.fill(nPos,aTypes[nPos],xRow); - aInfo.bUnsigned = aValue; + aInfo.bUnsigned = (sal_Bool)aValue; ++nPos; aValue.fill(nPos,aTypes[nPos],xRow); - aInfo.bCurrency = aValue; + aInfo.bCurrency = (sal_Bool)aValue; ++nPos; aValue.fill(nPos,aTypes[nPos],xRow); - aInfo.bAutoIncrement = aValue; + aInfo.bAutoIncrement = (sal_Bool)aValue; ++nPos; aValue.fill(nPos,aTypes[nPos],xRow); aInfo.aLocalTypeName = aValue; --------------------------------------------------------------------- To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, e-mail: [EMAIL PROTECTED]
