From 90e16066593047915b7007bb7a6846eabeeca567 Mon Sep 17 00:00:00 2001
From: Fridrich Štrba <fridrich.strba@bluewin.ch>
Date: Mon, 10 Jun 2013 13:07:59 +0200
Subject: mingw64: long -> sal_IntPtr in dbaccess

Change-Id: Ic9e049b6b79a8ae3777d8b2a6e918289445c21da
---
 dbaccess/source/ui/dlg/ConnectionHelper.cxx | 2 +-
 dbaccess/source/ui/querydesign/querydlg.cxx | 8 ++++----
 2 files changed, 5 insertions(+), 5 deletions(-)

(limited to 'dbaccess')

diff --git a/dbaccess/source/ui/dlg/ConnectionHelper.cxx b/dbaccess/source/ui/dlg/ConnectionHelper.cxx
index cd284defa94a..964fb6b5a310 100644
--- a/dbaccess/source/ui/dlg/ConnectionHelper.cxx
+++ b/dbaccess/source/ui/dlg/ConnectionHelper.cxx
@@ -272,7 +272,7 @@ DBG_NAME(OConnectionHelper)
                 OUString sOldDataSource=getURLNoPrefix();
                 OUString sNewDataSource;
                 HWND hWnd = GetParent()->GetSystemData()->hWnd;
-                sNewDataSource = getAdoDatalink((long)hWnd,sOldDataSource);
+                sNewDataSource = getAdoDatalink((LONG_PTR)hWnd,sOldDataSource);
                 if ( !sNewDataSource.isEmpty() )
                 {
                     setURLNoPrefix(sNewDataSource);
diff --git a/dbaccess/source/ui/querydesign/querydlg.cxx b/dbaccess/source/ui/querydesign/querydlg.cxx
index 90adc949949c..e382fda8f23f 100644
--- a/dbaccess/source/ui/querydesign/querydlg.cxx
+++ b/dbaccess/source/ui/querydesign/querydlg.cxx
@@ -146,7 +146,7 @@ DlgQryJoin::DlgQryJoin( OQueryTableView * pParent,
         const sal_uInt16 nCount = m_pJoinControl->aLB_JoinType.GetEntryCount();
         for (sal_uInt16 i = 0; i < nCount; ++i)
         {
-            const long nJoinTyp = reinterpret_cast<long>(m_pJoinControl->aLB_JoinType.GetEntryData(i));
+            const sal_IntPtr nJoinTyp = reinterpret_cast<sal_IntPtr>(m_pJoinControl->aLB_JoinType.GetEntryData(i));
             if ( !bSupportFullJoin && nJoinTyp == ID_FULL_JOIN )
                 m_pJoinControl->aLB_JoinType.RemoveEntry(i);
             else if ( !bSupportOuterJoin && (nJoinTyp == ID_LEFT_JOIN || nJoinTyp == ID_RIGHT_JOIN) )
@@ -184,7 +184,7 @@ IMPL_LINK( DlgQryJoin, LBChangeHdl, ListBox*, /*pListBox*/ )
     const EJoinType eOldJoinType = eJoinType;
     sal_uInt16 nResId = 0;
     const sal_uInt16 nPos = m_pJoinControl->aLB_JoinType.GetSelectEntryPos();
-    const long nJoinType = reinterpret_cast<long>(m_pJoinControl->aLB_JoinType.GetEntryData(nPos));
+    const sal_IntPtr nJoinType = reinterpret_cast<sal_IntPtr>(m_pJoinControl->aLB_JoinType.GetEntryData(nPos));
     sal_Bool bAddHint = sal_True;
     switch ( nJoinType )
     {
@@ -324,7 +324,7 @@ void DlgQryJoin::setJoinType(EJoinType _eNewJoinType)
     eJoinType = _eNewJoinType;
     m_pJoinControl->m_aCBNatural.Enable(eJoinType != CROSS_JOIN);
 
-    long nJoinType = 0;
+    sal_IntPtr nJoinType = 0;
     switch ( eJoinType )
     {
         default:
@@ -348,7 +348,7 @@ void DlgQryJoin::setJoinType(EJoinType _eNewJoinType)
     const sal_uInt16 nCount = m_pJoinControl->aLB_JoinType.GetEntryCount();
     for (sal_uInt16 i = 0; i < nCount; ++i)
     {
-        if ( nJoinType == reinterpret_cast<long>(m_pJoinControl->aLB_JoinType.GetEntryData(i)) )
+        if ( nJoinType == reinterpret_cast<sal_IntPtr>(m_pJoinControl->aLB_JoinType.GetEntryData(i)) )
         {
             m_pJoinControl->aLB_JoinType.SelectEntryPos(i);
             break;
-- 
cgit