You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@openoffice.apache.org by da...@apache.org on 2018/11/30 05:27:07 UTC
svn commit: r1847780 - in /openoffice/trunk/main/tools/source:
debug/debug.cxx rc/resmgr.cxx
Author: damjan
Date: Fri Nov 30 05:27:07 2018
New Revision: 1847780
URL: http://svn.apache.org/viewvc?rev=1847780&view=rev
Log:
More LLP64 fixes for main/tools.
Patch by: me
Modified:
openoffice/trunk/main/tools/source/debug/debug.cxx
openoffice/trunk/main/tools/source/rc/resmgr.cxx
Modified: openoffice/trunk/main/tools/source/debug/debug.cxx
URL: http://svn.apache.org/viewvc/openoffice/trunk/main/tools/source/debug/debug.cxx?rev=1847780&r1=1847779&r2=1847780&view=diff
==============================================================================
--- openoffice/trunk/main/tools/source/debug/debug.cxx (original)
+++ openoffice/trunk/main/tools/source/debug/debug.cxx Fri Nov 30 05:27:07 2018
@@ -1173,7 +1173,7 @@ void* DbgFunc( sal_uInt16 nAction, void*
if ( nAction == DBG_FUNC_GETDATA )
return (void*)&(pDebugData->aDbgData);
else if ( nAction == DBG_FUNC_GETPRINTMSGBOX )
- return (void*)(long)(pDebugData->pDbgPrintMsgBox);
+ return (void*)(sal_IntPtr)(pDebugData->pDbgPrintMsgBox);
else if ( nAction == DBG_FUNC_FILTERMESSAGE )
if ( ImplDbgFilterMessage( (const sal_Char*) pParam ) )
return (void*) -1;
@@ -1197,19 +1197,19 @@ void* DbgFunc( sal_uInt16 nAction, void*
break;
case DBG_FUNC_SETPRINTMSGBOX:
- pDebugData->pDbgPrintMsgBox = (DbgPrintLine)(long)pParam;
+ pDebugData->pDbgPrintMsgBox = (DbgPrintLine)(sal_IntPtr)pParam;
break;
case DBG_FUNC_SETPRINTWINDOW:
- pDebugData->pDbgPrintWindow = (DbgPrintLine)(long)pParam;
+ pDebugData->pDbgPrintWindow = (DbgPrintLine)(sal_IntPtr)pParam;
break;
case DBG_FUNC_SETPRINTTESTTOOL:
- pDebugData->pDbgPrintTestTool = (DbgPrintLine)(long)pParam;
+ pDebugData->pDbgPrintTestTool = (DbgPrintLine)(sal_IntPtr)pParam;
break;
case DBG_FUNC_SET_ABORT:
- pDebugData->pDbgAbort = (DbgPrintLine)(long)pParam;
+ pDebugData->pDbgAbort = (DbgPrintLine)(sal_IntPtr)pParam;
break;
case DBG_FUNC_SAVEDATA:
@@ -1299,7 +1299,7 @@ void* DbgFunc( sal_uInt16 nAction, void*
return (void*)(sal_uIntPtr)sal_True;
case DBG_FUNC_SETTESTSOLARMUTEX:
- pDebugData->pDbgTestSolarMutex = (DbgTestSolarMutexProc)(long)pParam;
+ pDebugData->pDbgTestSolarMutex = (DbgTestSolarMutexProc)(sal_IntPtr)pParam;
break;
case DBG_FUNC_TESTSOLARMUTEX:
Modified: openoffice/trunk/main/tools/source/rc/resmgr.cxx
URL: http://svn.apache.org/viewvc/openoffice/trunk/main/tools/source/rc/resmgr.cxx?rev=1847780&r1=1847779&r2=1847780&view=diff
==============================================================================
--- openoffice/trunk/main/tools/source/rc/resmgr.cxx (original)
+++ openoffice/trunk/main/tools/source/rc/resmgr.cxx Fri Nov 30 05:27:07 2018
@@ -1390,9 +1390,9 @@ sal_uInt32 ResMgr::GetRemainSize()
return pFallbackResMgr->GetRemainSize();
const ImpRCStack& rTop = aStack[nCurStack];
- return (sal_uInt32)((long)(sal_uInt8 *)rTop.pResource +
+ return (sal_uInt32)((sal_uIntPtr)(sal_uInt8 *)rTop.pResource +
rTop.pResource->GetLocalOff() -
- (long)(sal_uInt8 *)rTop.pClassRes);
+ (sal_uIntPtr)(sal_uInt8 *)rTop.pClassRes);
}
// -----------------------------------------------------------------------