diff options
| author | Fridrich Štrba <fridrich.strba@bluewin.ch> | 2013-06-06 15:50:51 +0200 |
|---|---|---|
| committer | Fridrich Štrba <fridrich.strba@bluewin.ch> | 2013-06-06 15:52:05 +0200 |
| commit | 35a65baefe99181685aea8e630d27c5e2a7c6bc4 (patch) | |
| tree | c856875ba27b7fa1305c47ed3c6c736948395158 /extensions/source | |
| parent | 47cc957c36eceb4ae035006137223b5afb652696 (diff) | |
Slowly, but surely going on compiling for mingw64
Change-Id: I590aa6a854a040281bf73d5be768c05d4906a984
Diffstat (limited to 'extensions/source')
| -rw-r--r-- | extensions/source/plugin/win/sysplug.cxx | 8 | ||||
| -rw-r--r-- | extensions/source/scanner/scanwin.cxx | 10 |
2 files changed, 9 insertions, 9 deletions
diff --git a/extensions/source/plugin/win/sysplug.cxx b/extensions/source/plugin/win/sysplug.cxx index f50bc30ed508..d75c54a87bdb 100644 --- a/extensions/source/plugin/win/sysplug.cxx +++ b/extensions/source/plugin/win/sysplug.cxx @@ -236,8 +236,8 @@ long PluginComm_Impl::doIt() ? (*_NPPfuncs.write)( (NPP)m_aArgs[0], (NPStream*)m_aArgs[1], - (int32_t)m_aArgs[2], - (int32_t)m_aArgs[3], + (sal_IntPtr)m_aArgs[2], + (sal_IntPtr)m_aArgs[3], m_aArgs[4] ) : 0); break; @@ -254,7 +254,7 @@ long PluginComm_Impl::doIt() nRet = (_NPPfuncs.getvalue ? (*_NPPfuncs.getvalue)( (NPP)m_aArgs[0], - (NPPVariable)(int)m_aArgs[1], + (NPPVariable)(sal_IntPtr)m_aArgs[1], m_aArgs[2] ) : NPERR_GENERIC_ERROR); break; @@ -263,7 +263,7 @@ long PluginComm_Impl::doIt() nRet = (_NPPfuncs.setvalue ? (*_NPPfuncs.setvalue)( (NPP)m_aArgs[0], - (NPNVariable)(int)m_aArgs[1], + (NPNVariable)(sal_IntPtr)m_aArgs[1], m_aArgs[2] ) : NPERR_GENERIC_ERROR); break; diff --git a/extensions/source/scanner/scanwin.cxx b/extensions/source/scanner/scanwin.cxx index 130cc12a96f1..d8e01600f069 100644 --- a/extensions/source/scanner/scanwin.cxx +++ b/extensions/source/scanner/scanwin.cxx @@ -423,7 +423,7 @@ void ImpTwain::ImplFallback( ULONG nEvent ) IMPL_LINK( ImpTwain, ImplFallbackHdl, void*, pData ) { - const ULONG nEvent = (ULONG) pData; + const sal_uIntPtr nEvent = (sal_uIntPtr) pData; bool bFallback = true; switch( nCurState ) @@ -710,7 +710,7 @@ bool Twain::PerformTransfer( ScannerManager& rMgr, const uno::Reference< lang::X IMPL_LINK( Twain, ImpNotifyHdl, ImpTwain*, nEvent ) { - switch( (ULONG)(void*) nEvent ) + switch( (sal_uIntPtr)(void*) nEvent ) { case( TWAIN_EVENT_SCANNING ): meState = TWAIN_STATE_SCANNING; @@ -770,7 +770,7 @@ void ScannerManager::ReleaseData() { if( mpData ) { - GlobalFree( (HGLOBAL)(long) mpData ); + GlobalFree( (HGLOBAL)(sal_IntPtr) mpData ); mpData = NULL; } } @@ -778,7 +778,7 @@ void ScannerManager::ReleaseData() awt::Size ScannerManager::getSize() throw() { awt::Size aRet; - HGLOBAL hDIB = (HGLOBAL)(long) mpData; + HGLOBAL hDIB = (HGLOBAL)(sal_IntPtr) mpData; if( hDIB ) { @@ -806,7 +806,7 @@ uno::Sequence< sal_Int8 > ScannerManager::getDIB() throw() if( mpData ) { - HGLOBAL hDIB = (HGLOBAL)(long) mpData; + HGLOBAL hDIB = (HGLOBAL)(sal_IntPtr) mpData; const sal_uInt32 nDIBSize = GlobalSize( hDIB ); BITMAPINFOHEADER* pBIH = (BITMAPINFOHEADER*) GlobalLock( hDIB ); |