[Libreoffice-commits] core.git: connectivity/source

[Norbert Thiebaud]

 connectivity/source/drivers/odbc/OTools.cxx |    8 ++++++--
 1 file changed, 6 insertions(+), 2 deletions(-)

New commits:
commit 1e82ae8811e7c344805bba8ee0411c9b3682a80f
Author: Norbert Thiebaud <nthiebaud at gmail.com>
Date:   Sun Feb 21 08:20:33 2016 -0800

    WaE vs2015: casting from int32 to pointer to to odbc idiosyncracies
    
    Change-Id: I94f2435aee76b03d4b14b009fdeca06a14f22909
    Reviewed-on: https://gerrit.libreoffice.org/22599
    Tested-by: Jenkins <ci at libreoffice.org>
    Reviewed-by: Norbert Thiebaud <nthiebaud at gmail.com>

diff --git a/connectivity/source/drivers/odbc/OTools.cxx b/connectivity/source/drivers/odbc/OTools.cxx
index 06d11c6..4b93785 100644
--- a/connectivity/source/drivers/odbc/OTools.cxx
+++ b/connectivity/source/drivers/odbc/OTools.cxx
@@ -253,7 +253,9 @@ void OTools::bindValue( OConnection* _pConnection,
                     }   break;
                 case SQL_LONGVARBINARY:
                 {
-                    _pData = reinterpret_cast<void*>(columnIndex);
+                    /* see https://msdn.microsoft.com/en-us/library/ms716238%28v=vs.85%29.aspx
+                     * for an explanation of that apparently weird cast */
+                    _pData = reinterpret_cast<void*>((uintptr_t)columnIndex);
                     sal_Int32 nLen = 0;
                     nLen = static_cast<const ::com::sun::star::uno::Sequence< sal_Int8 > *>(_pValue)->getLength();
                     *pLen = (SQLLEN)SQL_LEN_DATA_AT_EXEC(nLen);
@@ -261,7 +263,9 @@ void OTools::bindValue( OConnection* _pConnection,
                     break;
                 case SQL_LONGVARCHAR:
                 {
-                    _pData = reinterpret_cast<void*>(columnIndex);
+                    /* see https://msdn.microsoft.com/en-us/library/ms716238%28v=vs.85%29.aspx
+                     * for an explanation of that apparently weird cast */
+                    _pData = reinterpret_cast<void*>((uintptr_t)columnIndex);
                     sal_Int32 nLen = 0;
                     nLen = static_cast<OUString const *>(_pValue)->getLength();
                     *pLen = (SQLLEN)SQL_LEN_DATA_AT_EXEC(nLen);