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 /vcl/source | |
parent | eb4811590c85895ce531674596bdd6afb3397725 (diff) |
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 'vcl/source')
-rw-r--r-- | vcl/source/app/dbggui.cxx | 4 | ||||
-rw-r--r-- | vcl/source/app/help.cxx | 6 | ||||
-rw-r--r-- | vcl/source/app/svapp.cxx | 2 | ||||
-rw-r--r-- | vcl/source/app/timer.cxx | 8 | ||||
-rw-r--r-- | vcl/source/control/field2.cxx | 70 | ||||
-rw-r--r-- | vcl/source/window/builder.cxx | 6 | ||||
-rw-r--r-- | vcl/source/window/debugevent.cxx | 2 | ||||
-rw-r--r-- | vcl/source/window/dockmgr.cxx | 4 | ||||
-rw-r--r-- | vcl/source/window/dockwin.cxx | 4 | ||||
-rw-r--r-- | vcl/source/window/mouse.cxx | 2 | ||||
-rw-r--r-- | vcl/source/window/scrwnd.cxx | 4 | ||||
-rw-r--r-- | vcl/source/window/winproc.cxx | 16 |
12 files changed, 64 insertions, 64 deletions
diff --git a/vcl/source/app/dbggui.cxx b/vcl/source/app/dbggui.cxx index 9b29b001e2f1..85b452817549 100644 --- a/vcl/source/app/dbggui.cxx +++ b/vcl/source/app/dbggui.cxx @@ -685,7 +685,7 @@ void DbgDialogTest( vcl::Window* pWindow ) else if ( pChild->GetType() == WINDOW_TIMEFIELD ) { TimeField* pField = static_cast<TimeField*>(pChild); - if ( pField->GetMax() == Time( 23, 59, 59, 99 ) ) + if ( pField->GetMax() == tools::Time( 23, 59, 59, 99 ) ) bMaxWarning = true; } else if ( pChild->GetType() == WINDOW_DATEFIELD ) @@ -715,7 +715,7 @@ void DbgDialogTest( vcl::Window* pWindow ) else if ( pChild->GetType() == WINDOW_TIMEBOX ) { TimeBox* pBox = static_cast<TimeBox*>(pChild); - if ( pBox->GetMax() == Time( 23, 59, 59, 99 ) ) + if ( pBox->GetMax() == tools::Time( 23, 59, 59, 99 ) ) bMaxWarning = true; } else if ( pChild->GetType() == WINDOW_DATEBOX ) diff --git a/vcl/source/app/help.cxx b/vcl/source/app/help.cxx index 5d0b1e382f01..1e44c4522b99 100644 --- a/vcl/source/app/help.cxx +++ b/vcl/source/app/help.cxx @@ -235,7 +235,7 @@ void Help::HideTip( sal_uLong nId ) // trigger update, so that a Paint is instantly triggered since we do not save the background pFrameWindow->ImplUpdateAll(); delete pHelpWin; - ImplGetSVData()->maHelpData.mnLastHelpHideTime = Time::GetSystemTicks(); + ImplGetSVData()->maHelpData.mnLastHelpHideTime = tools::Time::GetSystemTicks(); } HelpTextWindow::HelpTextWindow( vcl::Window* pParent, const OUString& rText, sal_uInt16 nHelpWinStyle, sal_uInt16 nStyle ) : @@ -517,7 +517,7 @@ void ImplShowHelpWindow( vcl::Window* pParent, sal_uInt16 nHelpWinStyle, sal_uIn if (!pHelpWin && !rHelpText.isEmpty()) { - sal_uLong nCurTime = Time::GetSystemTicks(); + sal_uLong nCurTime = tools::Time::GetSystemTicks(); if ( ( ( nCurTime - pSVData->maHelpData.mnLastHelpHideTime ) < pParent->GetSettings().GetHelpSettings().GetTipDelay() ) || ( ( nStyle & QUICKHELP_NO_DELAY ) != 0 ) ) @@ -557,7 +557,7 @@ void ImplDestroyHelpWindow( bool bUpdateHideTime ) pHelpWin->Hide(); delete pHelpWin; if( bUpdateHideTime ) - pSVData->maHelpData.mnLastHelpHideTime = Time::GetSystemTicks(); + pSVData->maHelpData.mnLastHelpHideTime = tools::Time::GetSystemTicks(); } } diff --git a/vcl/source/app/svapp.cxx b/vcl/source/app/svapp.cxx index e5640c7a7f94..2798d3fdcf3f 100644 --- a/vcl/source/app/svapp.cxx +++ b/vcl/source/app/svapp.cxx @@ -453,7 +453,7 @@ bool Application::AnyInput( sal_uInt16 nType ) sal_uLong Application::GetLastInputInterval() { - return (Time::GetSystemTicks()-ImplGetSVData()->maAppData.mnLastInputTime); + return (tools::Time::GetSystemTicks()-ImplGetSVData()->maAppData.mnLastInputTime); } extern int nImplSysDialog; diff --git a/vcl/source/app/timer.cxx b/vcl/source/app/timer.cxx index 703f7e81f03d..ecbfa7467cdc 100644 --- a/vcl/source/app/timer.cxx +++ b/vcl/source/app/timer.cxx @@ -92,7 +92,7 @@ void Timer::ImplTimerCallbackProc() ImplTimerData* pPrevTimerData; sal_uLong nMinPeriod = MAX_TIMER_PERIOD; sal_uLong nDeltaTime; - sal_uLong nTime = Time::GetSystemTicks(); + sal_uLong nTime = tools::Time::GetSystemTicks(); if ( pSVData->mbNoCallTimer ) return; @@ -133,7 +133,7 @@ void Timer::ImplTimerCallbackProc() } // determine new time - sal_uLong nNewTime = Time::GetSystemTicks(); + sal_uLong nNewTime = tools::Time::GetSystemTicks(); pPrevTimerData = NULL; pTimerData = pSVData->mpFirstTimerData; while ( pTimerData ) @@ -263,7 +263,7 @@ void Timer::Start() // insert timer and start mpTimerData = new ImplTimerData; mpTimerData->mpTimer = this; - mpTimerData->mnUpdateTime = Time::GetSystemTicks(); + mpTimerData->mnUpdateTime = tools::Time::GetSystemTicks(); mpTimerData->mnTimerUpdate = pSVData->mnTimerUpdate; mpTimerData->mbDelete = false; mpTimerData->mbInTimeout = false; @@ -291,7 +291,7 @@ void Timer::Start() } else { - mpTimerData->mnUpdateTime = Time::GetSystemTicks(); + mpTimerData->mnUpdateTime = tools::Time::GetSystemTicks(); mpTimerData->mnTimerUpdate = pSVData->mnTimerUpdate; mpTimerData->mbDelete = false; } diff --git a/vcl/source/control/field2.cxx b/vcl/source/control/field2.cxx index 4dd7e8568336..fbc74e3bfb39 100644 --- a/vcl/source/control/field2.cxx +++ b/vcl/source/control/field2.cxx @@ -2053,7 +2053,7 @@ static bool ImplCutTimePortion( OUStringBuffer& _rStr, sal_Int32 _nSepPos, bool return true; } -static bool ImplTimeGetValue( const OUString& rStr, Time& rTime, +static bool ImplTimeGetValue( const OUString& rStr, tools::Time& rTime, TimeFieldFormat eFormat, bool bDuration, const LocaleDataWrapper& rLocaleDataWrapper, bool _bSkipInvalidCharacters = true ) { @@ -2062,7 +2062,7 @@ static bool ImplTimeGetValue( const OUString& rStr, Time& rTime, short nMinute = 0; short nSecond = 0; sal_Int64 nNanoSec = 0; - Time aTime( 0, 0, 0 ); + tools::Time aTime( 0, 0, 0 ); if ( rStr.isEmpty() ) return false; @@ -2220,7 +2220,7 @@ static bool ImplTimeGetValue( const OUString& rStr, Time& rTime, if ( (nHour == 12) && ( ( aUpperCaseStr.indexOf( aAM ) >= 0 ) || ( aUpperCaseStr.indexOf( aAM2 ) >= 0 ) ) ) nHour = 0; - aTime = Time( (sal_uInt16)nHour, (sal_uInt16)nMinute, (sal_uInt16)nSecond, + aTime = tools::Time( (sal_uInt16)nHour, (sal_uInt16)nMinute, (sal_uInt16)nSecond, (sal_uInt32)nNanoSec ); } else @@ -2238,7 +2238,7 @@ static bool ImplTimeGetValue( const OUString& rStr, Time& rTime, nNanoSec = nNanoSec < 0 ? -nNanoSec : nNanoSec; } - aTime = Time( (sal_uInt16)nHour, (sal_uInt16)nMinute, (sal_uInt16)nSecond, + aTime = tools::Time( (sal_uInt16)nHour, (sal_uInt16)nMinute, (sal_uInt16)nSecond, (sal_uInt32)nNanoSec ); if ( bNegative ) aTime = -aTime; @@ -2251,11 +2251,11 @@ static bool ImplTimeGetValue( const OUString& rStr, Time& rTime, bool TimeFormatter::ImplTimeReformat( const OUString& rStr, OUString& rOutStr ) { - Time aTime( 0, 0, 0 ); + tools::Time aTime( 0, 0, 0 ); if ( !ImplTimeGetValue( rStr, aTime, GetFormat(), IsDuration(), ImplGetLocaleDataWrapper() ) ) return true; - Time aTempTime = aTime; + tools::Time aTempTime = aTime; if ( aTempTime > GetMax() ) aTempTime = GetMax() ; else if ( aTempTime < GetMin() ) @@ -2266,11 +2266,11 @@ bool TimeFormatter::ImplTimeReformat( const OUString& rStr, OUString& rOutStr ) maCorrectedTime = aTempTime; if ( !GetErrorHdl().Call( this ) ) { - maCorrectedTime = Time( Time::SYSTEM ); + maCorrectedTime = tools::Time( tools::Time::SYSTEM ); return false; } else - maCorrectedTime = Time( Time::SYSTEM ); + maCorrectedTime = tools::Time( tools::Time::SYSTEM ); } bool bSecond = false; @@ -2302,7 +2302,7 @@ bool TimeFormatter::ImplTimeReformat( const OUString& rStr, OUString& rOutStr ) { if ( aTempTime.GetHour() > 12 ) { - Time aT( aTempTime ); + tools::Time aT( aTempTime ); aT.SetHour( aT.GetHour() % 12 ); rOutStr = ImplGetLocaleDataWrapper().getTime( aT, bSecond, b100Sec ); } @@ -2326,7 +2326,7 @@ void TimeField::ImplTimeSpinArea( bool bUp ) if ( GetField() ) { sal_Int32 nTimeArea = 0; - Time aTime( GetTime() ); + tools::Time aTime( GetTime() ); OUString aText( GetText() ); Selection aSelection( GetField()->GetSelection() ); @@ -2365,15 +2365,15 @@ void TimeField::ImplTimeSpinArea( bool bUp ) if ( nTimeArea ) { - Time aAddTime( 0, 0, 0 ); + tools::Time aAddTime( 0, 0, 0 ); if ( nTimeArea == 1 ) - aAddTime = Time( 1, 0 ); + aAddTime = tools::Time( 1, 0 ); else if ( nTimeArea == 2 ) - aAddTime = Time( 0, 1 ); + aAddTime = tools::Time( 0, 1 ); else if ( nTimeArea == 3 ) - aAddTime = Time( 0, 0, 1 ); + aAddTime = tools::Time( 0, 0, 1 ); else if ( nTimeArea == 4 ) - aAddTime = Time( 0, 0, 0, 1 ); + aAddTime = tools::Time( 0, 0, 0, 1 ); if ( !bUp ) aAddTime = -aAddTime; @@ -2381,10 +2381,10 @@ void TimeField::ImplTimeSpinArea( bool bUp ) aTime += aAddTime; if ( !IsDuration() ) { - Time aAbsMaxTime( 23, 59, 59, 999999999 ); + tools::Time aAbsMaxTime( 23, 59, 59, 999999999 ); if ( aTime > aAbsMaxTime ) aTime = aAbsMaxTime; - Time aAbsMinTime( 0, 0 ); + tools::Time aAbsMinTime( 0, 0 ); if ( aTime < aAbsMinTime ) aTime = aAbsMinTime; } @@ -2405,7 +2405,7 @@ TimeFormatter::TimeFormatter() : maLastTime( 0, 0 ), maMin( 0, 0 ), maMax( 23, 59, 59, 999999999 ), - maCorrectedTime( Time::SYSTEM ), + maCorrectedTime( tools::Time::SYSTEM ), mbEnforceValidValue( true ), maFieldTime( 0, 0 ) { @@ -2421,13 +2421,13 @@ void TimeFormatter::ImplLoadRes( const ResId& rResId ) if ( TIMEFORMATTER_MIN & nMask ) { - SetMin( Time( ResId( (RSHEADER_TYPE *)pMgr->GetClass(), *pMgr ) ) ); + SetMin( tools::Time( ResId( (RSHEADER_TYPE *)pMgr->GetClass(), *pMgr ) ) ); pMgr->Increment( ResMgr::GetObjSize( (RSHEADER_TYPE *)pMgr->GetClass() ) ); } if ( TIMEFORMATTER_MAX & nMask ) { - SetMax( Time( ResId( (RSHEADER_TYPE *)pMgr->GetClass(), *pMgr ) ) ); + SetMax( tools::Time( ResId( (RSHEADER_TYPE *)pMgr->GetClass(), *pMgr ) ) ); pMgr->Increment( ResMgr::GetObjSize( (RSHEADER_TYPE *)pMgr->GetClass() ) ); } @@ -2442,7 +2442,7 @@ void TimeFormatter::ImplLoadRes( const ResId& rResId ) if ( TIMEFORMATTER_VALUE & nMask ) { - maFieldTime = Time( ResId( (RSHEADER_TYPE *)pMgr->GetClass(), *pMgr ) ); + maFieldTime = tools::Time( ResId( (RSHEADER_TYPE *)pMgr->GetClass(), *pMgr ) ); if ( maFieldTime > GetMax() ) maFieldTime = GetMax(); if ( maFieldTime < GetMin() ) @@ -2463,14 +2463,14 @@ void TimeFormatter::ReformatAll() Reformat(); } -void TimeFormatter::SetMin( const Time& rNewMin ) +void TimeFormatter::SetMin( const tools::Time& rNewMin ) { maMin = rNewMin; if ( !IsEmptyFieldValue() ) ReformatAll(); } -void TimeFormatter::SetMax( const Time& rNewMax ) +void TimeFormatter::SetMax( const tools::Time& rNewMax ) { maMax = rNewMax; if ( !IsEmptyFieldValue() ) @@ -2495,14 +2495,14 @@ void TimeFormatter::SetDuration( bool bNewDuration ) ReformatAll(); } -void TimeFormatter::SetTime( const Time& rNewTime ) +void TimeFormatter::SetTime( const tools::Time& rNewTime ) { SetUserTime( rNewTime ); maFieldTime = maLastTime; SetEmptyFieldValueData( false ); } -void TimeFormatter::ImplNewFieldValue( const Time& rTime ) +void TimeFormatter::ImplNewFieldValue( const tools::Time& rTime ) { if ( GetField() ) { @@ -2518,7 +2518,7 @@ void TimeFormatter::ImplNewFieldValue( const Time& rTime ) aSelection.Max() = SELECTION_MAX; } - Time aOldLastTime = maLastTime; + tools::Time aOldLastTime = maLastTime; ImplSetUserTime( rTime, &aSelection ); maLastTime = aOldLastTime; @@ -2531,9 +2531,9 @@ void TimeFormatter::ImplNewFieldValue( const Time& rTime ) } } -void TimeFormatter::ImplSetUserTime( const Time& rNewTime, Selection* pNewSelection ) +void TimeFormatter::ImplSetUserTime( const tools::Time& rNewTime, Selection* pNewSelection ) { - Time aNewTime = rNewTime; + tools::Time aNewTime = rNewTime; if ( aNewTime > GetMax() ) aNewTime = GetMax(); else if ( aNewTime < GetMin() ) @@ -2573,7 +2573,7 @@ void TimeFormatter::ImplSetUserTime( const Time& rNewTime, Selection* pNewSelect { if ( aNewTime.GetHour() > 12 ) { - Time aT( aNewTime ); + tools::Time aT( aNewTime ); aT.SetHour( aT.GetHour() % 12 ); aStr = ImplGetLocaleDataWrapper().getTime( aT, bSec, b100Sec ); } @@ -2589,14 +2589,14 @@ void TimeFormatter::ImplSetUserTime( const Time& rNewTime, Selection* pNewSelect } } -void TimeFormatter::SetUserTime( const Time& rNewTime ) +void TimeFormatter::SetUserTime( const tools::Time& rNewTime ) { ImplSetUserTime( rNewTime ); } -Time TimeFormatter::GetTime() const +tools::Time TimeFormatter::GetTime() const { - Time aTime( 0, 0, 0 ); + tools::Time aTime( 0, 0, 0 ); if ( GetField() ) { @@ -2680,12 +2680,12 @@ void TimeField::ImplLoadRes( const ResId& rResId ) if ( TIMEFIELD_FIRST & nMask ) { - maFirst = Time( ResId( (RSHEADER_TYPE *)GetClassRes(), *pMgr ) ); + maFirst = tools::Time( ResId( (RSHEADER_TYPE *)GetClassRes(), *pMgr ) ); IncrementRes( GetObjSizeRes( (RSHEADER_TYPE *)GetClassRes() ) ); } if ( TIMEFIELD_LAST & nMask ) { - maLast = Time( ResId( (RSHEADER_TYPE *)GetClassRes(), *pMgr ) ); + maLast = tools::Time( ResId( (RSHEADER_TYPE *)GetClassRes(), *pMgr ) ); IncrementRes( GetObjSizeRes( (RSHEADER_TYPE *)GetClassRes() ) ); } } @@ -2720,7 +2720,7 @@ bool TimeField::Notify( NotifyEvent& rNEvt ) Reformat(); else { - Time aTime( 0, 0, 0 ); + tools::Time aTime( 0, 0, 0 ); if ( ImplTimeGetValue( GetText(), aTime, GetFormat(), IsDuration(), ImplGetLocaleDataWrapper(), false ) ) // even with strict text analysis, our text is a valid time -> do a complete // reformat diff --git a/vcl/source/window/builder.cxx b/vcl/source/window/builder.cxx index edb66381a832..0a1eabf0bfce 100644 --- a/vcl/source/window/builder.cxx +++ b/vcl/source/window/builder.cxx @@ -3330,19 +3330,19 @@ void VclBuilder::mungeAdjustment(TimeField &rTarget, const Adjustment &rAdjustme if (rKey == "upper") { - Time aUpper(rValue.toInt32()); + tools::Time aUpper(rValue.toInt32()); rTarget.SetMax(aUpper); rTarget.SetLast(aUpper); } else if (rKey == "lower") { - Time aLower(rValue.toInt32()); + tools::Time aLower(rValue.toInt32()); rTarget.SetMin(aLower); rTarget.SetFirst(aLower); } else if (rKey == "value") { - Time aValue(rValue.toInt32()); + tools::Time aValue(rValue.toInt32()); rTarget.SetTime(aValue); } else diff --git a/vcl/source/window/debugevent.cxx b/vcl/source/window/debugevent.cxx index b6e1cf88dc80..cc4a86552448 100644 --- a/vcl/source/window/debugevent.cxx +++ b/vcl/source/window/debugevent.cxx @@ -122,7 +122,7 @@ static void InitKeyEvent( SalKeyEvent &rKeyEvent ) if (nRand < 0.001) rKeyEvent.mnTime = getRandom() * ULONG_MAX; else - rKeyEvent.mnTime = Time::GetSystemTicks(); + rKeyEvent.mnTime = tools::Time::GetSystemTicks(); if (getRandom() < 0.01) rKeyEvent.mnRepeat = getRandom() * 20; diff --git a/vcl/source/window/dockmgr.cxx b/vcl/source/window/dockmgr.cxx index 41bcaa7ce72f..d57ea8a78be2 100644 --- a/vcl/source/window/dockmgr.cxx +++ b/vcl/source/window/dockmgr.cxx @@ -74,7 +74,7 @@ ImplDockFloatWin2::ImplDockFloatWin2( vcl::Window* pParent, WinBits nWinBits, ImplDockingWindowWrapper* pDockingWin ) : FloatingWindow( pParent, nWinBits ), mpDockWin( pDockingWin ), - mnLastTicks( Time::GetSystemTicks() ), + mnLastTicks( tools::Time::GetSystemTicks() ), mbInMove( false ), mnLastUserEvent( 0 ) { @@ -187,7 +187,7 @@ IMPL_LINK_NOARG(ImplDockFloatWin2, DockingHdl) if( mpDockWin->IsDockable() && mpDockWin->GetWindow()->IsVisible() && - (Time::GetSystemTicks() - mnLastTicks > 500) && + (tools::Time::GetSystemTicks() - mnLastTicks > 500) && ( aState.mnState & ( MOUSE_LEFT | MOUSE_MIDDLE | MOUSE_RIGHT ) ) && !(aState.mnState & KEY_MOD1) && // i43499 CTRL disables docking now bRealMove ) diff --git a/vcl/source/window/dockwin.cxx b/vcl/source/window/dockwin.cxx index 83f0de88d7c4..bf04f1afc719 100644 --- a/vcl/source/window/dockwin.cxx +++ b/vcl/source/window/dockwin.cxx @@ -86,7 +86,7 @@ ImplDockFloatWin::ImplDockFloatWin( vcl::Window* pParent, WinBits nWinBits, DockingWindow* pDockingWin ) : FloatingWindow( pParent, nWinBits ), mpDockWin( pDockingWin ), - mnLastTicks( Time::GetSystemTicks() ), + mnLastTicks( tools::Time::GetSystemTicks() ), mbInMove( false ), mnLastUserEvent( 0 ) { @@ -148,7 +148,7 @@ IMPL_LINK_NOARG(ImplDockFloatWin, DockingHdl) mnLastUserEvent = 0; if( mpDockWin->IsDockable() && - (Time::GetSystemTicks() - mnLastTicks > 500) && + (tools::Time::GetSystemTicks() - mnLastTicks > 500) && ( aState.mnState & ( MOUSE_LEFT | MOUSE_MIDDLE | MOUSE_RIGHT ) ) && !(aState.mnState & KEY_MOD1) ) // i43499 CTRL disables docking now { diff --git a/vcl/source/window/mouse.cxx b/vcl/source/window/mouse.cxx index 0a9ab7a5ad48..1249ad4842c1 100644 --- a/vcl/source/window/mouse.cxx +++ b/vcl/source/window/mouse.cxx @@ -136,7 +136,7 @@ void Window::ImplCallMouseMove( sal_uInt16 nMouseCode, bool bModChanged ) { if ( mpWindowImpl->mpFrameData->mbMouseIn && mpWindowImpl->mpFrameWindow->mpWindowImpl->mbReallyVisible ) { - sal_uLong nTime = Time::GetSystemTicks(); + sal_uLong nTime = tools::Time::GetSystemTicks(); long nX = mpWindowImpl->mpFrameData->mnLastMouseX; long nY = mpWindowImpl->mpFrameData->mnLastMouseY; sal_uInt16 nCode = nMouseCode; diff --git a/vcl/source/window/scrwnd.cxx b/vcl/source/window/scrwnd.cxx index 49606fb9e2a3..6e085b509c13 100644 --- a/vcl/source/window/scrwnd.cxx +++ b/vcl/source/window/scrwnd.cxx @@ -350,12 +350,12 @@ IMPL_LINK_NOARG(ImplWheelWindow, ImplScrollHdl) if ( !ImplCallPreNotify( aNCmdEvt ) ) { - const sal_uLong nTime = Time::GetSystemTicks(); + const sal_uLong nTime = tools::Time::GetSystemTicks(); ImplDelData aDel( this ); pWindow->Command( aCEvt ); if( aDel.IsDead() ) return 0; - mnRepaintTime = std::max( Time::GetSystemTicks() - nTime, (sal_uLong)1 ); + mnRepaintTime = std::max( tools::Time::GetSystemTicks() - nTime, (sal_uLong)1 ); ImplRecalcScrollValues(); } } diff --git a/vcl/source/window/winproc.cxx b/vcl/source/window/winproc.cxx index cb2bd92a250b..a677af194432 100644 --- a/vcl/source/window/winproc.cxx +++ b/vcl/source/window/winproc.cxx @@ -617,7 +617,7 @@ bool ImplHandleMouseEvent( vcl::Window* pWindow, sal_uInt16 nSVEvent, bool bMous nClicks = pChild->ImplGetFrameData()->mnClickCount; } - pSVData->maAppData.mnLastInputTime = Time::GetSystemTicks(); + pSVData->maAppData.mnLastInputTime = tools::Time::GetSystemTicks(); } DBG_ASSERT( pChild, "ImplHandleMouseEvent: pChild == NULL" ); @@ -836,7 +836,7 @@ static vcl::Window* ImplGetKeyInputWindow( vcl::Window* pWindow ) ImplSVData* pSVData = ImplGetSVData(); // determine last input time - pSVData->maAppData.mnLastInputTime = Time::GetSystemTicks(); + pSVData->maAppData.mnLastInputTime = tools::Time::GetSystemTicks(); // #127104# workaround for destroyed windows if( pWindow->ImplGetWindowImpl() == NULL ) @@ -915,7 +915,7 @@ static bool ImplHandleKey( vcl::Window* pWindow, sal_uInt16 nSVEvent, bool bCtrlF6 = (aKeyCode.GetCode() == KEY_F6) && aKeyCode.IsMod1(); // determine last input time - pSVData->maAppData.mnLastInputTime = Time::GetSystemTicks(); + pSVData->maAppData.mnLastInputTime = tools::Time::GetSystemTicks(); // handle tracking window if ( nSVEvent == EVENT_KEYINPUT ) @@ -2299,7 +2299,7 @@ bool ImplWindowFrameProc( vcl::Window* pWindow, SalFrame* /*pFrame*/, MouseEvent* pMouseEvt = (MouseEvent*) pEvent; SalMouseEvent aSalMouseEvent; - aSalMouseEvent.mnTime = Time::GetSystemTicks(); + aSalMouseEvent.mnTime = tools::Time::GetSystemTicks(); aSalMouseEvent.mnX = pMouseEvt->GetPosPixel().X(); aSalMouseEvent.mnY = pMouseEvt->GetPosPixel().Y(); aSalMouseEvent.mnButton = 0; @@ -2319,7 +2319,7 @@ bool ImplWindowFrameProc( vcl::Window* pWindow, SalFrame* /*pFrame*/, MouseEvent* pMouseEvt = (MouseEvent*) pEvent; SalMouseEvent aSalMouseEvent; - aSalMouseEvent.mnTime = Time::GetSystemTicks(); + aSalMouseEvent.mnTime = tools::Time::GetSystemTicks(); aSalMouseEvent.mnX = pMouseEvt->GetPosPixel().X(); aSalMouseEvent.mnY = pMouseEvt->GetPosPixel().Y(); aSalMouseEvent.mnButton = pMouseEvt->GetButtons(); @@ -2336,7 +2336,7 @@ bool ImplWindowFrameProc( vcl::Window* pWindow, SalFrame* /*pFrame*/, MouseEvent* pMouseEvt = (MouseEvent*) pEvent; SalMouseEvent aSalMouseEvent; - aSalMouseEvent.mnTime = Time::GetSystemTicks(); + aSalMouseEvent.mnTime = tools::Time::GetSystemTicks(); aSalMouseEvent.mnX = pMouseEvt->GetPosPixel().X(); aSalMouseEvent.mnY = pMouseEvt->GetPosPixel().Y(); aSalMouseEvent.mnButton = pMouseEvt->GetButtons(); @@ -2527,7 +2527,7 @@ bool ImplWindowFrameProc( vcl::Window* pWindow, SalFrame* /*pFrame*/, { ZoomEvent* pZoomEvent = (ZoomEvent*) pEvent; SalWheelMouseEvent aSalWheelMouseEvent; - aSalWheelMouseEvent.mnTime = Time::GetSystemTicks(); + aSalWheelMouseEvent.mnTime = tools::Time::GetSystemTicks(); aSalWheelMouseEvent.mnX = pZoomEvent->GetCenter().getX(); aSalWheelMouseEvent.mnY = pZoomEvent->GetCenter().getY(); // Pass on the scale as a percentage * 100 of current zoom factor @@ -2543,7 +2543,7 @@ bool ImplWindowFrameProc( vcl::Window* pWindow, SalFrame* /*pFrame*/, { ScrollEvent* pScrollEvent = (ScrollEvent*) pEvent; SalWheelMouseEvent aSalWheelMouseEvent; - aSalWheelMouseEvent.mnTime = Time::GetSystemTicks(); + aSalWheelMouseEvent.mnTime = tools::Time::GetSystemTicks(); aSalWheelMouseEvent.mbDeltaIsPixel = true; // event location holds delta values instead aSalWheelMouseEvent.mnX = long(pScrollEvent->GetXOffset()); |