diff options
| author | Fridrich Štrba <fridrich.strba@bluewin.ch> | 2013-06-10 13:17:58 +0200 |
|---|---|---|
| committer | Fridrich Štrba <fridrich.strba@bluewin.ch> | 2013-06-10 14:03:40 +0200 |
| commit | e9289dbde26cd89b7e5bf54afccd06fc01dabdde (patch) | |
| tree | ec2b1698fcaa07767c85b8c5fc67b71d513506e5 | |
| parent | cd3b1847a5549e6348aa5b9b0ed1f59f679c6cf0 (diff) | |
mingw64: Don't cast to pointers from narrower integers
Change-Id: Ica7bd2d6b395d42d575660991ec74ecb2b744473
| -rw-r--r-- | vcl/source/gdi/impvect.cxx | 2 | ||||
| -rw-r--r-- | vcl/win/source/app/salinst.cxx | 6 | ||||
| -rw-r--r-- | vcl/win/source/gdi/salgdi3.cxx | 2 | ||||
| -rw-r--r-- | vcl/win/source/window/salframe.cxx | 6 |
4 files changed, 8 insertions, 8 deletions
diff --git a/vcl/source/gdi/impvect.cxx b/vcl/source/gdi/impvect.cxx index 9e011a4a2b05..c69664bbda76 100644 --- a/vcl/source/gdi/impvect.cxx +++ b/vcl/source/gdi/impvect.cxx @@ -41,7 +41,7 @@ #define VECT_MAP( _def_pIn, _def_pOut, _def_nVal ) _def_pOut[_def_nVal]=(_def_pIn[_def_nVal]=((_def_nVal)*4L)+1L)+5L; #define BACK_MAP( _def_nVal ) ((((_def_nVal)+2)>>2)-1) -#define VECT_PROGRESS( _def_pProgress, _def_nVal ) if(_def_pProgress&&_def_pProgress->IsSet())(_def_pProgress->Call((void*)_def_nVal)); +#define VECT_PROGRESS( _def_pProgress, _def_nVal ) if(_def_pProgress&&_def_pProgress->IsSet())(_def_pProgress->Call((void*)(sal_IntPtr)_def_nVal)); struct ChainMove { long nDX; long nDY; }; diff --git a/vcl/win/source/app/salinst.cxx b/vcl/win/source/app/salinst.cxx index b8fe478a5d24..57e641468267 100644 --- a/vcl/win/source/app/salinst.cxx +++ b/vcl/win/source/app/salinst.cxx @@ -972,7 +972,7 @@ void SalTimer::Start( sal_uLong nMS ) SalFrame* WinSalInstance::CreateChildFrame( SystemParentData* pSystemParentData, sal_uLong nSalFrameStyle ) { // to switch to Main-Thread - return (SalFrame*)ImplSendMessage( mhComWnd, SAL_MSG_CREATEFRAME, nSalFrameStyle, (LPARAM)pSystemParentData->hWnd ); + return (SalFrame*)(sal_IntPtr)ImplSendMessage( mhComWnd, SAL_MSG_CREATEFRAME, nSalFrameStyle, (LPARAM)pSystemParentData->hWnd ); } // ----------------------------------------------------------------------- @@ -985,7 +985,7 @@ SalFrame* WinSalInstance::CreateFrame( SalFrame* pParent, sal_uLong nSalFrameSty hWndParent = static_cast<WinSalFrame*>(pParent)->mhWnd; else hWndParent = 0; - return (SalFrame*)ImplSendMessage( mhComWnd, SAL_MSG_CREATEFRAME, nSalFrameStyle, (LPARAM)hWndParent ); + return (SalFrame*)(sal_IntPtr)ImplSendMessage( mhComWnd, SAL_MSG_CREATEFRAME, nSalFrameStyle, (LPARAM)hWndParent ); } // ----------------------------------------------------------------------- @@ -1002,7 +1002,7 @@ SalObject* WinSalInstance::CreateObject( SalFrame* pParent, sal_Bool /*bShow*/ ) { // to switch to Main-Thread - return (SalObject*)ImplSendMessage( mhComWnd, SAL_MSG_CREATEOBJECT, 0, (LPARAM)static_cast<WinSalFrame*>(pParent) ); + return (SalObject*)(sal_IntPtr)ImplSendMessage( mhComWnd, SAL_MSG_CREATEOBJECT, 0, (LPARAM)static_cast<WinSalFrame*>(pParent) ); } // ----------------------------------------------------------------------- diff --git a/vcl/win/source/gdi/salgdi3.cxx b/vcl/win/source/gdi/salgdi3.cxx index 59fb0e641777..625ee1a0ea1a 100644 --- a/vcl/win/source/gdi/salgdi3.cxx +++ b/vcl/win/source/gdi/salgdi3.cxx @@ -2239,7 +2239,7 @@ void WinSalGraphics::GetDevFontList( ImplDevFontList* pFontList ) aInfo.mnPreferedCharSet = DEFAULT_CHARSET; DWORD nCP = GetACP(); CHARSETINFO aCharSetInfo; - if ( TranslateCharsetInfo( (DWORD*)nCP, &aCharSetInfo, TCI_SRCCODEPAGE ) ) + if ( TranslateCharsetInfo( (DWORD*)(sal_IntPtr)nCP, &aCharSetInfo, TCI_SRCCODEPAGE ) ) aInfo.mnPreferedCharSet = aCharSetInfo.ciCharset; LOGFONTW aLogFont; diff --git a/vcl/win/source/window/salframe.cxx b/vcl/win/source/window/salframe.cxx index 86c3a7b77f56..072dd3ca33a0 100644 --- a/vcl/win/source/window/salframe.cxx +++ b/vcl/win/source/window/salframe.cxx @@ -1012,7 +1012,7 @@ SalGraphics* WinSalFrame::GetGraphics() mpGraphics2->mbScreen = TRUE; } - HDC hDC = (HDC)ImplSendMessage( pSalData->mpFirstInstance->mhComWnd, + HDC hDC = (HDC)(sal_IntPtr)ImplSendMessage( pSalData->mpFirstInstance->mhComWnd, SAL_MSG_GETDC, (WPARAM)mhWnd, 0 ); if ( hDC ) @@ -1564,7 +1564,7 @@ static void ImplSetParentFrame( WinSalFrame* pThis, HWND hNewParentWnd, sal_Bool // create a new hwnd with the same styles HWND hWndParent = hNewParentWnd; // forward to main thread - HWND hWnd = (HWND) ImplSendMessage( pSalData->mpFirstInstance->mhComWnd, + HWND hWnd = (HWND) (sal_IntPtr) ImplSendMessage( pSalData->mpFirstInstance->mhComWnd, bAsChild ? SAL_MSG_RECREATECHILDHWND : SAL_MSG_RECREATEHWND, (WPARAM) hWndParent, (LPARAM)pThis->mhWnd ); @@ -1581,7 +1581,7 @@ static void ImplSetParentFrame( WinSalFrame* pThis, HWND hNewParentWnd, sal_Bool if( bNeedCacheDC ) { // re-create cached DC - HDC hDC = (HDC)ImplSendMessage( pSalData->mpFirstInstance->mhComWnd, + HDC hDC = (HDC)(sal_IntPtr)ImplSendMessage( pSalData->mpFirstInstance->mhComWnd, SAL_MSG_GETDC, (WPARAM) hWnd, 0 ); if ( hDC ) |