User: rt      
Date: 2006/12/01 08:50:27

Modified:
   dba/connectivity/source/drivers/odbc/OConnection.cxx

Log:
 INTEGRATION: CWS dba22a (1.38.18); FILE MERGED
 2006/11/13 11:01:44 fs 1.38.18.1: make compile with gcc 4.2 (which claims that 
a sal_Bool cannot be assigned to
 a sal_Bool:1)
 Issue number:  #i71263#
 Submitted by:  [EMAIL PROTECTED]
 Reviewed by:   [EMAIL PROTECTED]

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&r2=1.39
Delta lines:  +4 -4
-------------------
--- OConnection.cxx     17 Sep 2006 03:05:16 -0000      1.38
+++ OConnection.cxx     1 Dec 2006 16:50:25 -0000       1.39
@@ -588,19 +588,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]

Reply via email to