Some more sal_IntPtr dance, but enough for today

Change-Id: Ic772181321e74713244223cc3d4542bd4cd2dc88

7 files changed, 14 insertions, 20 deletions

diff --git a/include/svl/svdde.hxx b/include/svl/svdde.hxx
index c8a08beffbb9..66ec9f0b6a5a 100644
--- a/include/svl/svdde.hxx
+++ b/include/svl/svdde.hxx
@@ -220,7 +220,7 @@ public:
                     ~DdeConnection();
 
     long            GetError();
-    long            GetConvId();
+    sal_IntPtr      GetConvId();
 
     static const std::vector<DdeConnection*>& GetConnections();
 
diff --git a/include/vcl/region.hxx b/include/vcl/region.hxx
index 02eebc7ec50e..88c55ea5b5fc 100644
--- a/include/vcl/region.hxx
+++ b/include/vcl/region.hxx
@@ -39,7 +39,7 @@ struct ImplRegionInfo;
 enum RegionType { REGION_NULL, REGION_EMPTY, REGION_RECTANGLE, REGION_COMPLEX };
 enum RegionOverlapType { REGION_INSIDE, REGION_OVER, REGION_OUTSIDE };
 
-typedef long RegionHandle;
+typedef sal_IntPtr RegionHandle;
 
 // ----------
 // - Region -
diff --git a/include/wntgcci/sehandler.hxx b/include/wntgcci/sehandler.hxx
index 2fabe486a452..9218adde07a7 100644
--- a/include/wntgcci/sehandler.hxx
+++ b/include/wntgcci/sehandler.hxx
@@ -7,8 +7,8 @@
 #ifndef _SEHANDLER_HXX
 #define _SEHANDLER_HXX
 
-#ifndef __MINGW32__
-#error This file should be included only in a MinGW compilation
+#if !defined( __MINGW32__ ) || defined ( _WIN64 )
+#error This file should be included only in a 32-bit MinGW compilation
 #endif
 
 #include <windows.h>
diff --git a/svl/source/svdde/ddecli.cxx b/svl/source/svdde/ddecli.cxx
index 5928211f00f8..168881144d35 100644
--- a/svl/source/svdde/ddecli.cxx
+++ b/svl/source/svdde/ddecli.cxx
@@ -243,9 +243,9 @@ const String& DdeConnection::GetTopicName()
 
 // --- DdeConnection::GetConvId() ----------------------------------
 
-long DdeConnection::GetConvId()
+sal_IntPtr DdeConnection::GetConvId()
 {
-    return (long)pImp->hConv;
+    return (sal_IntPtr)pImp->hConv;
 }
 
 const std::vector<DdeConnection*>& DdeConnection::GetConnections()
diff --git a/svl/source/svdde/ddesvr.cxx b/svl/source/svdde/ddesvr.cxx
index 202d26d9f18f..d4b8aeed43a2 100644
--- a/svl/source/svdde/ddesvr.cxx
+++ b/svl/source/svdde/ddesvr.cxx
@@ -45,12 +45,7 @@ class DdeItemImp : public std::vector<DdeItemImpData> {};
 
 // --- DdeInternat::SvrCallback() ----------------------------------
 
-#ifdef WNT
-HDDEDATA CALLBACK DdeInternal::SvrCallback(
-            WORD nCode, WORD nCbType, HCONV hConv, HSZ hText1, HSZ hText2,
-            HDDEDATA hData, DWORD, DWORD )
-#else
-#if defined( ICC )
+#if defined( WNT ) || defined( ICC )
 HDDEDATA CALLBACK DdeInternal::SvrCallback(
             WORD nCode, WORD nCbType, HCONV hConv, HSZ hText1, HSZ hText2,
             HDDEDATA hData, DWORD, DWORD )
@@ -59,7 +54,6 @@ HDDEDATA CALLBACK _export DdeInternal::SvrCallback(
             WORD nCode, WORD nCbType, HCONV hConv, HSZ hText1, HSZ hText2,
             HDDEDATA hData, DWORD, DWORD )
 #endif
-#endif
 {
     DdeServices&    rAll = DdeService::GetServices();
     DdeService*     pService;
@@ -169,7 +163,7 @@ HDDEDATA CALLBACK _export DdeInternal::SvrCallback(
                 pTopic = FindTopic( *pService, hText1 );
                 if ( pTopic )
                 {
-                    pTopic->Connect( (long) hConv );
+                    pTopic->Connect( (sal_IntPtr) hConv );
                     pC = new Conversation;
                     pC->hConv = hConv;
                     pC->pTopic = pTopic;
@@ -195,7 +189,7 @@ HDDEDATA CALLBACK _export DdeInternal::SvrCallback(
 found:
     if ( nCode == XTYP_DISCONNECT)
     {
-        pC->pTopic->_Disconnect( (long) hConv );
+        pC->pTopic->_Disconnect( (sal_IntPtr) hConv );
         for ( ConvList::iterator it = pService->pConv->begin();
               it != pService->pConv->end();
               ++it
@@ -227,7 +221,7 @@ found:
         pTopic->aItem = OUString();
 
     sal_Bool bRes = sal_False;
-    pInst->hCurConvSvr = (long)hConv;
+    pInst->hCurConvSvr = (sal_IntPtr)hConv;
     switch( nCode )
     {
         case XTYP_REQUEST:
@@ -324,14 +318,14 @@ found:
 
                 if (pItem)
                 {
-                    pItem->IncMonitor( (long)hConv );
+                    pItem->IncMonitor( (sal_IntPtr)hConv );
                     pInst->hCurConvSvr = 0;
                 }
             }
             return (HDDEDATA)sal_True;
 
         case XTYP_ADVSTOP:
-            pItem->DecMonitor( (long)hConv );
+            pItem->DecMonitor( (sal_IntPtr)hConv );
             if( !pItem->pImpData )
                 pTopic->StopAdviseLoop();
             pInst->hCurConvSvr = 0;
diff --git a/vcl/inc/win/wincomp.hxx b/vcl/inc/win/wincomp.hxx
index e6c7fd0c3318..8660c1b3ded7 100644
--- a/vcl/inc/win/wincomp.hxx
+++ b/vcl/inc/win/wincomp.hxx
@@ -135,7 +135,7 @@ inline void SetWindowFont( HWND hWnd, HFONT hFont, BOOL bRedraw )
 
 inline HFONT GetWindowFont( HWND hWnd )
 {
-    return (HFONT)(UINT)SendMessage( hWnd, WM_GETFONT, 0, 0 );
+    return (HFONT) SendMessage( hWnd, WM_GETFONT, 0, 0 );
 }
 
 inline void SetClassCursor( HWND hWnd, HCURSOR hCursor )
diff --git a/vcl/source/window/printdlg.cxx b/vcl/source/window/printdlg.cxx
index f11044c6263e..89f9a76df85b 100644
--- a/vcl/source/window/printdlg.cxx
+++ b/vcl/source/window/printdlg.cxx
@@ -1336,7 +1336,7 @@ Size PrintDialog::getJobPageSize()
 
 void PrintDialog::updateNupFromPages()
 {
-    long nPages = long(maNUpPage.mpNupPagesBox->GetEntryData(maNUpPage.mpNupPagesBox->GetSelectEntryPos()));
+    sal_IntPtr nPages = sal_IntPtr(maNUpPage.mpNupPagesBox->GetEntryData(maNUpPage.mpNupPagesBox->GetSelectEntryPos()));
     int nRows   = int(maNUpPage.mpNupRowsEdt->GetValue());
     int nCols   = int(maNUpPage.mpNupColEdt->GetValue());
     long nPageMargin  = long(maNUpPage.mpPageMarginEdt->Denormalize(maNUpPage.mpPageMarginEdt->GetValue( FUNIT_100TH_MM )));