From fce604c8ae11b462113305aba080d77f8193cfea Mon Sep 17 00:00:00 2001 From: Noel Grandin Date: Mon, 9 Jan 2017 11:20:48 +0200 Subject: [PATCH] [API CHANGE] return unsigned 64-bit value from GetSystemTicks in basic code instead of 32-bit value. looks like this has been incorrect since commit 9f2104e1f3a1ef8a37406b39188234df309241bc Author: Jens-Heiner Rechtien Date: Mon Jun 19 16:46:13 2006 +0000 INTEGRATION: CWS warnings01 (1.23.26); FILE MERGED but nobody cared, since the values would previously fit into a 32-bit number. Change-Id: I4c121085977b5e7ff3e33c8ad57749b925ad31b9 Reviewed-on: https://gerrit.libreoffice.org/32879 Tested-by: Jenkins Reviewed-by: Noel Grandin --- basic/source/runtime/methods1.cxx | 2 +- basic/source/runtime/stdobj.cxx | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/basic/source/runtime/methods1.cxx b/basic/source/runtime/methods1.cxx index 34ead7fe4b43..eb0f245577ba 100644 --- a/basic/source/runtime/methods1.cxx +++ b/basic/source/runtime/methods1.cxx @@ -1415,7 +1415,7 @@ RTLFUNC(GetSystemTicks) StarBASIC::Error( ERRCODE_BASIC_BAD_ARGUMENT ); return; } - rPar.Get(0)->PutLong( tools::Time::GetSystemTicks() ); + rPar.Get(0)->PutUInt64( tools::Time::GetSystemTicks() ); } RTLFUNC(GetPathSeparator) diff --git a/basic/source/runtime/stdobj.cxx b/basic/source/runtime/stdobj.cxx index 0eac637f8fba..34ce7d81ea1e 100644 --- a/basic/source/runtime/stdobj.cxx +++ b/basic/source/runtime/stdobj.cxx @@ -307,7 +307,7 @@ static Methods aMethods[] = { { "GetPathSeparator", SbxSTRING, FUNCTION_,RTLNAME(GetPathSeparator),0 }, { "GetProcessServiceManager", SbxOBJECT, 0 | FUNCTION_, RTLNAME(GetProcessServiceManager),0 }, { "GetSolarVersion", SbxLONG, FUNCTION_,RTLNAME(GetSolarVersion),0 }, -{ "GetSystemTicks", SbxLONG, FUNCTION_,RTLNAME(GetSystemTicks),0 }, +{ "GetSystemTicks", SbxSALUINT64,FUNCTION_,RTLNAME(GetSystemTicks),0 }, { "GetSystemType", SbxINTEGER, FUNCTION_,RTLNAME(GetSystemType),0 }, { "GlobalScope", SbxOBJECT, FUNCTION_,RTLNAME(GlobalScope),0 }, { "Green", SbxINTEGER, 1 | FUNCTION_ | NORMONLY_, RTLNAME(Green),0 },