diff options
| author | Stephan Bergmann <sbergman@redhat.com> | 2015-04-09 14:27:30 +0200 |
|---|---|---|
| committer | Stephan Bergmann <sbergman@redhat.com> | 2015-04-09 18:57:00 +0000 |
| commit | 91b914882948c6acbb2dd6442083b8c6ccd9cf17 (patch) | |
| tree | f0fd12aff18c9918b0fcd6adce52caf4ba9091a7 /sc | |
| parent | d6398719abecfca60db37637490e602222992dc2 (diff) | |
Change tools::Time::GetSystemTicks to sal_uInt64
...as follow-up clean-up after 71fefe1dc2bcda3a4cc18d71e1acaf161cc059f2 "Change
'blink times' to be of type sal_uInt64 and thus consistent with
Timer::Get/SetTimeout since 9c7016b5b530ca212b1275f44f9e2fc0527109ee 'Scheduler:
Changed uLong to uInt32/uInt64.'"
Transitively meant to change quite a number of further time-related places from
sal_uLong/sal_uIntPtr to consistently use sal_uInt64.
Change-Id: I38eb493943906356138bf58eb098d2f54a3dee34
Reviewed-on: https://gerrit.libreoffice.org/15214
Reviewed-by: Stephan Bergmann <sbergman@redhat.com>
Tested-by: Stephan Bergmann <sbergman@redhat.com>
Diffstat (limited to 'sc')
| -rw-r--r-- | sc/source/core/data/documen8.cxx | 4 | ||||
| -rw-r--r-- | sc/workben/test.cxx | 12 |
2 files changed, 8 insertions, 8 deletions
diff --git a/sc/source/core/data/documen8.cxx b/sc/source/core/data/documen8.cxx index 74756f598f79..dc023bb7ad21 100644 --- a/sc/source/core/data/documen8.cxx +++ b/sc/source/core/data/documen8.cxx @@ -462,7 +462,7 @@ class IdleCalcTextWidthScope ScDocument& mrDoc; ScAddress& mrCalcPos; MapMode maOldMapMode; - sal_uLong mnStartTime; + sal_uInt64 mnStartTime; ScStyleSheetPool* mpStylePool; sal_uInt16 mnOldSearchMask; SfxStyleFamily meOldFamily; @@ -517,7 +517,7 @@ public: void setNeedMore(bool b) { mbNeedMore = b; } bool getNeedMore() const { return mbNeedMore; } - sal_uLong getStartTime() const { return mnStartTime; } + sal_uInt64 getStartTime() const { return mnStartTime; } void createProgressBar() { diff --git a/sc/workben/test.cxx b/sc/workben/test.cxx index a16cdd65f802..3d36f50db40a 100644 --- a/sc/workben/test.cxx +++ b/sc/workben/test.cxx @@ -427,7 +427,7 @@ void lcl_Annotations( FixedText& aTimeText ) if (xPos && xControl) { - sal_uLong nStart = tools::Time::GetSystemTicks(); + sal_uInt64 nStart = tools::Time::GetSystemTicks(); xAnnotationText->setText(L"bla"); xCursor->gotoEnd(false); @@ -441,7 +441,7 @@ void lcl_Annotations( FixedText& aTimeText ) xPos->setText(L"dumdi"); } - sal_uLong nEnd = tools::Time::GetSystemTicks(); + sal_uInt64 nEnd = tools::Time::GetSystemTicks(); aTimeText.SetText(String(nEnd-nStart)+String(" ms")); } } @@ -585,7 +585,7 @@ void lcl_Cells( FixedText& aTimeText ) if (xDoc) { long nCount = 0; - sal_uLong nStart = tools::Time::GetSystemTicks(); + sal_uInt64 nStart = tools::Time::GetSystemTicks(); XActionLockableRef xLock = (XActionLockable*) xDoc->queryInterface(XActionLockable::getSmartUik()); @@ -624,7 +624,7 @@ void lcl_Cells( FixedText& aTimeText ) } } - sal_uLong nEnd = tools::Time::GetSystemTicks(); + sal_uInt64 nEnd = tools::Time::GetSystemTicks(); aTimeText.SetText(String(nCount)+String(" ")+String(nEnd-nStart)+String(" ms")); // if (xLock) @@ -1510,9 +1510,9 @@ IMPL_LINK_NOARG(MyWindow, CountHdl) { case 0: { - sal_uLong nStart = tools::Time::GetSystemTicks(); + sal_uInt64 nStart = tools::Time::GetSystemTicks(); lcl_DoCount(); - sal_uLong nEnd = tools::Time::GetSystemTicks(); + sal_uInt64 nEnd = tools::Time::GetSystemTicks(); aTimeText.SetText(String("Count: ")+String(nEnd-nStart)+String(" ms")); } break; |