CWS-TOOLING: integrate CWS cmcfixes62

2009-09-22 21:19:24 +0200 cmc  r276365 : #i100000# that's the most plausible explanation, -D$(CVER) is needed by scp2 under windows
2009-09-19 16:10:36 +0200 cmc  r276303 : #i100000# revert this for no partically good reason
2009-09-18 14:16:47 +0200 cmc  r276279 : remove extra build depend
2009-09-18 08:56:15 +0200 cmc  r276265 : #i100000# rerun autoconf
2009-09-17 14:59:38 +0200 cmc  r276245 : CWS-TOOLING: rebase CWS cmcfixes62 to trunk@276192 (milestone: DEV300:m59)
2009-09-10 16:40:49 +0200 pl  r276041 : fix warning
2009-09-10 11:34:55 +0200 pl  r276026 : disable warning from system header
2009-09-09 19:30:45 +0200 pl  r276013 : use osl_getAsciiFunctionSymbol instead of strange cast
2009-09-09 19:25:32 +0200 pl  r276012 : add some casting hacks to make compile on solaris cc
2009-09-09 19:10:48 +0200 pl  r276009 : add missing Configure option for solaris sparce 32bit
2009-09-09 18:37:05 +0200 pl  r276008 : merge fix for #i104525# into moved code
2009-09-07 13:28:08 +0200 cmc  r275894 : CWS-TOOLING: rebase CWS cmcfixes62 to trunk@275801 (milestone: DEV300:m57)
2009-08-28 12:36:27 +0200 cmc  r275523 : CWS-TOOLING: rebase CWS cmcfixes62 to trunk@275331 (milestone: DEV300:m56)
2009-08-26 12:56:18 +0200 cmc  r275413 : #i104088# use the right headers in the right place
2009-08-25 17:07:50 +0200 cmc  r275372 : #i104500# make openssl build on linux that isn't x86 or x86_64
2009-08-25 13:08:48 +0200 cmc  r275347 : #i89237# pretty picswitch up
2009-08-25 10:58:09 +0200 cmc  r275342 : #i104489# remove last unused code in starmath
2009-08-25 10:23:33 +0200 cmc  r275338 : #i104088# clean up the define post-move
2009-08-24 13:46:57 +0200 cmc  r275310 : #i104088# 64bit odbc api changes
2009-08-24 13:42:52 +0200 cmc  r275309 : #i89237# unify linux platform mks under a generic parent
2009-08-24 13:19:52 +0200 cmc  r275307 : #i104455# remove unused code
2009-08-24 13:10:56 +0200 cmc  r275306 : #i104088# 64bit odbc api changes
2009-08-24 10:07:50 +0200 cmc  r275293 : #i104306# move recent-used to vcl
2009-08-24 09:32:08 +0200 cmc  r275291 : #i104306# move recent-used to vcl
2009-08-23 22:01:07 +0200 cmc  r275286 : #i104306# move recently-used to vcl
2009-08-22 15:25:25 +0200 cmc  r275285 : #i104088# 64bit odbc api changes
2009-08-21 17:52:40 +0200 cmc  r275268 : #i104306# move recently-used to vcl
2009-08-21 14:38:26 +0200 cmc  r275257 : #i104408 make these headers ready for c++0x
2009-08-21 14:20:19 +0200 cmc  r275251 : #i104406# avoid overlapping strcpy to avoid bustage on recent toolchains
2009-08-21 14:14:25 +0200 cmc  r275250 : #i104385# silence 64bit warnings

1 files changed, 36 insertions, 36 deletions

diff --git a/connectivity/source/drivers/odbcbase/OTools.cxx b/connectivity/source/drivers/odbcbase/OTools.cxx
index a7ac4ebf4d78..39c848f34eaf 100644
--- a/connectivity/source/drivers/odbcbase/OTools.cxx
+++ b/connectivity/source/drivers/odbcbase/OTools.cxx
@@ -56,16 +56,16 @@ void OTools::getValue(  OConnection* _pConnection,
                         sal_Bool &_bWasNull,
                         const ::com::sun::star::uno::Reference< ::com::sun::star::uno::XInterface >& _xInterface,
                         void* _pValue,
-                        SQLINTEGER _rSize) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException)
+                        SQLLEN _nSize) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException)
 {
     RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "odbc", "Ocke.Janssen@sun.com", "OTools::getValue" );
-    SQLINTEGER pcbValue = SQL_NULL_DATA;
+    SQLLEN pcbValue = SQL_NULL_DATA;
     OTools::ThrowException(_pConnection,
                             (*(T3SQLGetData)_pConnection->getOdbcFunction(ODBC3SQLGetData))(_aStatementHandle,
                                         (SQLUSMALLINT)columnIndex,
                                         _nType,
                                         _pValue,
-                                        (SQLINTEGER)_rSize,
+                                        _nSize,
                                         &pcbValue),
                             _aStatementHandle,SQL_HANDLE_STMT,_xInterface,sal_False);
     _bWasNull = pcbValue == SQL_NULL_DATA;
@@ -86,12 +86,12 @@ void OTools::bindParameter( OConnection* _pConnection,
 {
     RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "odbc", "Ocke.Janssen@sun.com", "OTools::bindParameter" );
     SQLRETURN nRetcode;
-    SWORD   fSqlType;
-    SWORD   fCType;
-    SDWORD  nMaxLen = 0;
+    SQLSMALLINT fSqlType;
+    SQLSMALLINT fCType;
+    SQLLEN  nMaxLen = 0;
     //  void*&   pData   = pDataBuffer;
-    SQLINTEGER* pLen    = (SQLINTEGER*)pLenBuffer;
-    SQLUINTEGER nColumnSize=0;
+    SQLLEN* pLen    = (SQLLEN*)pLenBuffer;
+    SQLULEN nColumnSize=0;
     SQLSMALLINT nDecimalDigits=0;
 
     OTools::getBindTypes(_bUseWChar,_bUseOldTimeDate,_nODBCtype,fCType,fSqlType);
@@ -123,10 +123,10 @@ void OTools::bindParameter( OConnection* _pConnection,
 void OTools::bindData(  SQLSMALLINT _nOdbcType,
                         sal_Bool _bUseWChar,
                         sal_Int8 *&_pData,
-                        SQLINTEGER*& pLen,
+                        SQLLEN*& pLen,
                         const void* _pValue,
                         rtl_TextEncoding _nTextEncoding,
-                        SQLUINTEGER& _nColumnSize)
+                        SQLULEN& _nColumnSize)
 {
     RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "odbc", "Ocke.Janssen@sun.com", "OTools::bindData" );
     _nColumnSize = 0;
@@ -222,7 +222,7 @@ void OTools::bindData(  SQLSMALLINT _nOdbcType,
             {
                 sal_Int32 nLen = 0;
                 nLen = ((const ::com::sun::star::uno::Sequence< sal_Int8 > *)_pValue)->getLength();
-                *pLen = (SDWORD)SQL_LEN_DATA_AT_EXEC(nLen);
+                *pLen = (SQLLEN)SQL_LEN_DATA_AT_EXEC(nLen);
             }
             break;
         case SQL_LONGVARCHAR:
@@ -235,21 +235,21 @@ void OTools::bindData(  SQLSMALLINT _nOdbcType,
                 ::rtl::OString aString(::rtl::OUStringToOString(*(::rtl::OUString*)_pValue,_nTextEncoding));
                 nLen = aString.getLength();
             }
-            *pLen = (SDWORD)SQL_LEN_DATA_AT_EXEC(nLen);
+            *pLen = (SQLLEN)SQL_LEN_DATA_AT_EXEC(nLen);
         }   break;
         case SQL_DATE:
             *(DATE_STRUCT*)_pData = *(DATE_STRUCT*)_pValue;
-            *pLen = (SDWORD)sizeof(DATE_STRUCT);
+            *pLen = (SQLLEN)sizeof(DATE_STRUCT);
             _nColumnSize = 10;
             break;
         case SQL_TIME:
             *(TIME_STRUCT*)_pData = *(TIME_STRUCT*)_pValue;
-            *pLen = (SDWORD)sizeof(TIME_STRUCT);
+            *pLen = (SQLLEN)sizeof(TIME_STRUCT);
             _nColumnSize = 8;
             break;
         case SQL_TIMESTAMP:
             *(TIMESTAMP_STRUCT*)_pData = *(TIMESTAMP_STRUCT*)_pValue;
-            *pLen = (SDWORD)sizeof(TIMESTAMP_STRUCT);
+            *pLen = (SQLLEN)sizeof(TIMESTAMP_STRUCT);
             _nColumnSize = 19;
             break;
     }
@@ -262,7 +262,7 @@ void OTools::bindValue( OConnection* _pConnection,
                         SQLSMALLINT _nMaxLen,
                         const void* _pValue,
                         void* _pData,
-                        SQLINTEGER *pLen,
+                        SQLLEN *pLen,
                         const ::com::sun::star::uno::Reference< ::com::sun::star::uno::XInterface >& _xInterface,
                         rtl_TextEncoding _nTextEncoding,
                         sal_Bool _bUseOldTimeDate) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException)
@@ -271,7 +271,7 @@ void OTools::bindValue( OConnection* _pConnection,
     SQLRETURN nRetcode;
     SQLSMALLINT   fSqlType;
     SQLSMALLINT   fCType;
-    SQLSMALLINT   nMaxLen = _nMaxLen;
+    SQLLEN nMaxLen = _nMaxLen;
 
     OTools::getBindTypes(   sal_False,
                             _bUseOldTimeDate,
@@ -375,7 +375,7 @@ void OTools::bindValue( OConnection* _pConnection,
                     _pData = (void*)(columnIndex);
                     sal_Int32 nLen = 0;
                     nLen = ((const ::com::sun::star::uno::Sequence< sal_Int8 > *)_pValue)->getLength();
-                    *pLen = (SDWORD)SQL_LEN_DATA_AT_EXEC(nLen);
+                    *pLen = (SQLLEN)SQL_LEN_DATA_AT_EXEC(nLen);
                 }
                     break;
                 case SQL_LONGVARCHAR:
@@ -383,7 +383,7 @@ void OTools::bindValue( OConnection* _pConnection,
                     _pData = (void*)(columnIndex);
                     sal_Int32 nLen = 0;
                     nLen = ((::rtl::OUString*)_pValue)->getLength();
-                    *pLen = (SDWORD)SQL_LEN_DATA_AT_EXEC(nLen);
+                    *pLen = (SQLLEN)SQL_LEN_DATA_AT_EXEC(nLen);
                 }   break;
                 case SQL_DATE:
                     *pLen = sizeof(DATE_STRUCT);
@@ -446,10 +446,10 @@ void OTools::ThrowException(OConnection* _pConnection,
     RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "odbc", "Ocke.Janssen@sun.com", "OTools::ThrowException" );
 
     SDB_ODBC_CHAR szSqlState[5];
-    SDWORD pfNativeError;
+    SQLINTEGER pfNativeError;
     SDB_ODBC_CHAR szErrorMessage[SQL_MAX_MESSAGE_LENGTH];
     szErrorMessage[0] = '\0';
-    SWORD pcbErrorMsg = 0;
+    SQLSMALLINT pcbErrorMsg = 0;
 
     // Informationen zur letzten Operation:
     // wenn hstmt != SQL_NULL_HSTMT ist (Benutzung von SetStatus in SdbCursor, SdbTable, ...),
@@ -478,7 +478,7 @@ void OTools::ThrowException(OConnection* _pConnection,
 Sequence<sal_Int8> OTools::getBytesValue(OConnection* _pConnection,
                                          SQLHANDLE _aStatementHandle,
                                          sal_Int32 columnIndex,
-                                         SWORD  _fSqlType,
+                                         SQLSMALLINT _fSqlType,
                                          sal_Bool &_bWasNull,
                                          const Reference< XInterface >& _xInterface) throw(SQLException, RuntimeException)
 {
@@ -486,14 +486,14 @@ Sequence<sal_Int8> OTools::getBytesValue(OConnection* _pConnection,
     char aCharArray[2048];
     // Erstmal versuchen, die Daten mit dem kleinen Puffer
     // abzuholen:
-    SQLINTEGER nMaxLen = sizeof aCharArray - 1;
+    SQLLEN nMaxLen = sizeof aCharArray - 1;
     //  GETDATA(SQL_C_CHAR,aCharArray,nMaxLen);
-    SQLINTEGER pcbValue = 0;
+    SQLLEN pcbValue = 0;
     OTools::ThrowException(_pConnection,(*(T3SQLGetData)_pConnection->getOdbcFunction(ODBC3SQLGetData))(_aStatementHandle,
                                         (SQLUSMALLINT)columnIndex,
                                         _fSqlType,
                                         (SQLPOINTER)aCharArray,
-                                        (SQLINTEGER)nMaxLen,
+                                        nMaxLen,
                                         &pcbValue),
                             _aStatementHandle,SQL_HANDLE_STMT,_xInterface);
 
@@ -540,7 +540,7 @@ Sequence<sal_Int8> OTools::getBytesValue(OConnection* _pConnection,
 ::rtl::OUString OTools::getStringValue(OConnection* _pConnection,
                                        SQLHANDLE _aStatementHandle,
                                        sal_Int32 columnIndex,
-                                       SWORD  _fSqlType,
+                                       SQLSMALLINT _fSqlType,
                                        sal_Bool &_bWasNull,
                                        const Reference< XInterface >& _xInterface,
                                        rtl_TextEncoding _nTextEncoding) throw(SQLException, RuntimeException)
@@ -555,15 +555,15 @@ Sequence<sal_Int8> OTools::getBytesValue(OConnection* _pConnection,
         {
             sal_Unicode waCharArray[2048];
             // read the unicode data
-            sal_Int32 nMaxLen = (sizeof(waCharArray) / sizeof(sal_Unicode)) - 1;
+            SQLLEN nMaxLen = (sizeof(waCharArray) / sizeof(sal_Unicode)) - 1;
             //  GETDATA(SQL_C_WCHAR, waCharArray, nMaxLen + sizeof(sal_Unicode));
 
-            SQLINTEGER pcbValue=0;
+            SQLLEN pcbValue=0;
             OTools::ThrowException(_pConnection,(*(T3SQLGetData)_pConnection->getOdbcFunction(ODBC3SQLGetData))(_aStatementHandle,
                                                 (SQLUSMALLINT)columnIndex,
                                                 SQL_C_WCHAR,
                                                 &waCharArray,
-                                                (SQLINTEGER)nMaxLen*sizeof(sal_Unicode),
+                                                (SQLLEN)nMaxLen*sizeof(sal_Unicode),
                                                 &pcbValue),
                                     _aStatementHandle,SQL_HANDLE_STMT,_xInterface);
             _bWasNull = pcbValue == SQL_NULL_DATA;
@@ -571,10 +571,10 @@ Sequence<sal_Int8> OTools::getBytesValue(OConnection* _pConnection,
                 return ::rtl::OUString();
             // Bei Fehler bricht der GETDATA-Makro mit return ab,
             // bei NULL mit break!
-            SQLINTEGER nRealSize = 0;
+            SQLLEN nRealSize = 0;
             if ( pcbValue > -1 )
                 nRealSize = pcbValue / sizeof(sal_Unicode);
-            SQLINTEGER nLen = pcbValue != SQL_NO_TOTAL ? std::min(nRealSize, nMaxLen) : (nMaxLen-1);
+            SQLLEN nLen = pcbValue != SQL_NO_TOTAL ? std::min(nRealSize, nMaxLen) : (nMaxLen-1);
             waCharArray[nLen] = 0;
             aData.append(waCharArray,nLen);
 
@@ -598,7 +598,7 @@ Sequence<sal_Int8> OTools::getBytesValue(OConnection* _pConnection,
                                                 (SQLUSMALLINT)columnIndex,
                                                 SQL_C_WCHAR,
                                                 &waCharArray,
-                                                (SQLINTEGER)nLen+1,
+                                                (SQLLEN)nLen+1,
                                                 &pcbValue),
                                     _aStatementHandle,SQL_HANDLE_STMT,_xInterface);
                 nRealSize = 0;
@@ -616,21 +616,21 @@ Sequence<sal_Int8> OTools::getBytesValue(OConnection* _pConnection,
             char aCharArray[2048];
             // Erstmal versuchen, die Daten mit dem kleinen Puffer
             // abzuholen:
-            SDWORD nMaxLen = sizeof aCharArray - 1;
+            SQLLEN nMaxLen = sizeof aCharArray - 1;
             //  GETDATA(SQL_C_CHAR,aCharArray,nMaxLen);
-            SQLINTEGER pcbValue = 0;
+            SQLLEN pcbValue = 0;
             OTools::ThrowException(_pConnection,(*(T3SQLGetData)_pConnection->getOdbcFunction(ODBC3SQLGetData))(_aStatementHandle,
                                                 (SQLUSMALLINT)columnIndex,
                                                 SQL_C_CHAR,
                                                 &aCharArray,
-                                                (SQLINTEGER)nMaxLen,
+                                                nMaxLen,
                                                 &pcbValue),
                                     _aStatementHandle,SQL_HANDLE_STMT,_xInterface);
             _bWasNull = pcbValue == SQL_NULL_DATA;
             if(_bWasNull)
                 return ::rtl::OUString();
 
-            SQLINTEGER nLen = pcbValue != SQL_NO_TOTAL ? std::min(pcbValue, nMaxLen) : (nMaxLen-1);
+            SQLLEN nLen = pcbValue != SQL_NO_TOTAL ? std::min(pcbValue, nMaxLen) : (nMaxLen-1);
             aCharArray[nLen] = 0;
             if ( ((pcbValue == SQL_NO_TOTAL) || pcbValue > nMaxLen) && aCharArray[nLen-1] == 0 && nLen > 0 )
                 --nLen;