Kaydet (Commit) 90e16066 authored tarafından Fridrich Štrba's avatar Fridrich Štrba

mingw64: long -> sal_IntPtr in dbaccess

Change-Id: Ic9e049b6b79a8ae3777d8b2a6e918289445c21da
üst 7c2c4895
...@@ -272,7 +272,7 @@ DBG_NAME(OConnectionHelper) ...@@ -272,7 +272,7 @@ DBG_NAME(OConnectionHelper)
OUString sOldDataSource=getURLNoPrefix(); OUString sOldDataSource=getURLNoPrefix();
OUString sNewDataSource; OUString sNewDataSource;
HWND hWnd = GetParent()->GetSystemData()->hWnd; HWND hWnd = GetParent()->GetSystemData()->hWnd;
sNewDataSource = getAdoDatalink((long)hWnd,sOldDataSource); sNewDataSource = getAdoDatalink((LONG_PTR)hWnd,sOldDataSource);
if ( !sNewDataSource.isEmpty() ) if ( !sNewDataSource.isEmpty() )
{ {
setURLNoPrefix(sNewDataSource); setURLNoPrefix(sNewDataSource);
......
...@@ -146,7 +146,7 @@ DlgQryJoin::DlgQryJoin( OQueryTableView * pParent, ...@@ -146,7 +146,7 @@ DlgQryJoin::DlgQryJoin( OQueryTableView * pParent,
const sal_uInt16 nCount = m_pJoinControl->aLB_JoinType.GetEntryCount(); const sal_uInt16 nCount = m_pJoinControl->aLB_JoinType.GetEntryCount();
for (sal_uInt16 i = 0; i < nCount; ++i) 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 ) if ( !bSupportFullJoin && nJoinTyp == ID_FULL_JOIN )
m_pJoinControl->aLB_JoinType.RemoveEntry(i); m_pJoinControl->aLB_JoinType.RemoveEntry(i);
else if ( !bSupportOuterJoin && (nJoinTyp == ID_LEFT_JOIN || nJoinTyp == ID_RIGHT_JOIN) ) else if ( !bSupportOuterJoin && (nJoinTyp == ID_LEFT_JOIN || nJoinTyp == ID_RIGHT_JOIN) )
...@@ -184,7 +184,7 @@ IMPL_LINK( DlgQryJoin, LBChangeHdl, ListBox*, /*pListBox*/ ) ...@@ -184,7 +184,7 @@ IMPL_LINK( DlgQryJoin, LBChangeHdl, ListBox*, /*pListBox*/ )
const EJoinType eOldJoinType = eJoinType; const EJoinType eOldJoinType = eJoinType;
sal_uInt16 nResId = 0; sal_uInt16 nResId = 0;
const sal_uInt16 nPos = m_pJoinControl->aLB_JoinType.GetSelectEntryPos(); 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; sal_Bool bAddHint = sal_True;
switch ( nJoinType ) switch ( nJoinType )
{ {
...@@ -324,7 +324,7 @@ void DlgQryJoin::setJoinType(EJoinType _eNewJoinType) ...@@ -324,7 +324,7 @@ void DlgQryJoin::setJoinType(EJoinType _eNewJoinType)
eJoinType = _eNewJoinType; eJoinType = _eNewJoinType;
m_pJoinControl->m_aCBNatural.Enable(eJoinType != CROSS_JOIN); m_pJoinControl->m_aCBNatural.Enable(eJoinType != CROSS_JOIN);
long nJoinType = 0; sal_IntPtr nJoinType = 0;
switch ( eJoinType ) switch ( eJoinType )
{ {
default: default:
...@@ -348,7 +348,7 @@ void DlgQryJoin::setJoinType(EJoinType _eNewJoinType) ...@@ -348,7 +348,7 @@ void DlgQryJoin::setJoinType(EJoinType _eNewJoinType)
const sal_uInt16 nCount = m_pJoinControl->aLB_JoinType.GetEntryCount(); const sal_uInt16 nCount = m_pJoinControl->aLB_JoinType.GetEntryCount();
for (sal_uInt16 i = 0; i < nCount; ++i) 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); m_pJoinControl->aLB_JoinType.SelectEntryPos(i);
break; break;
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment