diff options
| author | Noel Grandin <noel@peralex.com> | 2014-09-28 15:49:26 +0200 |
|---|---|---|
| committer | Noel Grandin <noelgrandin@gmail.com> | 2014-10-01 07:34:23 +0000 |
| commit | fc04f76336fdf8c96e35382cdeb497e2f939705c (patch) | |
| tree | 70c9bbd054a34a9bca9d22bb7afbb9c4349beff0 /sc/workben | |
| parent | Fallout fdo#83010: wrap on limits also in corner cases (diff) | |
| download | core-fc04f76336fdf8c96e35382cdeb497e2f939705c.tar.gz core-fc04f76336fdf8c96e35382cdeb497e2f939705c.zip | |
fdo#82577: Handle Time
Put the TOOLS Time class in the tools namespace. Avoids clash with the X11
Time typedef.
Change-Id: Iac57d5aef35e81ace1ee0d5e6d76cb278f8ad866
Reviewed-on: https://gerrit.libreoffice.org/11684
Reviewed-by: Noel Grandin <noelgrandin@gmail.com>
Tested-by: Noel Grandin <noelgrandin@gmail.com>
Diffstat (limited to 'sc/workben')
| -rw-r--r-- | sc/workben/test.cxx | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/sc/workben/test.cxx b/sc/workben/test.cxx index d91803c1a817..a16cdd65f802 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 = Time::GetSystemTicks(); + sal_uLong 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 = Time::GetSystemTicks(); + sal_uLong 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 = Time::GetSystemTicks(); + sal_uLong nStart = tools::Time::GetSystemTicks(); XActionLockableRef xLock = (XActionLockable*) xDoc->queryInterface(XActionLockable::getSmartUik()); @@ -624,7 +624,7 @@ void lcl_Cells( FixedText& aTimeText ) } } - sal_uLong nEnd = Time::GetSystemTicks(); + sal_uLong 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 = Time::GetSystemTicks(); + sal_uLong nStart = tools::Time::GetSystemTicks(); lcl_DoCount(); - sal_uLong nEnd = Time::GetSystemTicks(); + sal_uLong nEnd = tools::Time::GetSystemTicks(); aTimeText.SetText(String("Count: ")+String(nEnd-nStart)+String(" ms")); } break; |