diff options
| author | Noel Grandin <noel.grandin@collabora.co.uk> | 2017-02-06 15:57:42 +0200 |
|---|---|---|
| committer | Noel Grandin <noel.grandin@collabora.co.uk> | 2017-02-07 06:02:23 +0000 |
| commit | 93bde3156284df4419c49447cbf455de9d74f00a (patch) | |
| tree | 2a19f9fc266785de37d60d995792c9cdfddb723b /basic | |
| parent | d16e1336f0b1251c0e1ffbe171bc26ed48ea49f0 (diff) | |
Revert "[API CHANGE] return sal_uInt64 from GetSystemTicks in basic"
This reverts commit fce604c8ae11b462113305aba080d77f8193cfea,
and fixes
tdf#105735 - xray ThisComponent no longer works
in the process.
It turns out Basic doesn't support sal_uInt64 very well, so lets rather
have a small possibility of bad timestamps instead of broken scripts.
Change-Id: Ic00485bd517a4fc61e05632001c9a5f92e05ddd6
Reviewed-on: https://gerrit.libreoffice.org/33972
Tested-by: Jenkins <ci@libreoffice.org>
Reviewed-by: Noel Grandin <noel.grandin@collabora.co.uk>
Diffstat (limited to 'basic')
| -rw-r--r-- | basic/source/runtime/methods1.cxx | 2 | ||||
| -rw-r--r-- | 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 f24e4268293f..c14281c4ea96 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)->PutUInt64( tools::Time::GetSystemTicks() ); + rPar.Get(0)->PutLong( tools::Time::GetSystemTicks() ); } RTLFUNC(GetPathSeparator) diff --git a/basic/source/runtime/stdobj.cxx b/basic/source/runtime/stdobj.cxx index 34ce7d81ea1e..0eac637f8fba 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", SbxSALUINT64,FUNCTION_,RTLNAME(GetSystemTicks),0 }, +{ "GetSystemTicks", SbxLONG, FUNCTION_,RTLNAME(GetSystemTicks),0 }, { "GetSystemType", SbxINTEGER, FUNCTION_,RTLNAME(GetSystemType),0 }, { "GlobalScope", SbxOBJECT, FUNCTION_,RTLNAME(GlobalScope),0 }, { "Green", SbxINTEGER, 1 | FUNCTION_ | NORMONLY_, RTLNAME(Green),0 }, |