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 /sd/source/ui/dlg/animobjs.cxx | |
| 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 'sd/source/ui/dlg/animobjs.cxx')
| -rw-r--r-- | sd/source/ui/dlg/animobjs.cxx | 24 |
1 files changed, 12 insertions, 12 deletions
diff --git a/sd/source/ui/dlg/animobjs.cxx b/sd/source/ui/dlg/animobjs.cxx index cb4f70bae1f6..019103ef4efb 100644 --- a/sd/source/ui/dlg/animobjs.cxx +++ b/sd/source/ui/dlg/animobjs.cxx @@ -252,7 +252,7 @@ IMPL_LINK( AnimationWindow, ClickPlayHdl, void *, p ) bool bBtnGetOneObjectEnabled = aBtnGetOneObject.IsEnabled(); // calculate overall time - Time aTime( 0 ); + tools::Time aTime( 0 ); long nFullTime; if( aRbtBitmap.IsChecked() ) { @@ -296,7 +296,7 @@ IMPL_LINK( AnimationWindow, ClickPlayHdl, void *, p ) if( aRbtBitmap.IsChecked() ) { - Time *const pTime = m_FrameList[i].second; + tools::Time *const pTime = m_FrameList[i].second; assert(pTime); aTimeField.SetTime( *pTime ); @@ -378,7 +378,7 @@ IMPL_LINK( AnimationWindow, ClickRbtHdl, void *, p ) sal_uLong n = static_cast<sal_uLong>(aNumFldBitmap.GetValue()); if( n > 0 ) { - Time *const pTime = m_FrameList[n - 1].second; + tools::Time *const pTime = m_FrameList[n - 1].second; if( pTime ) aTimeField.SetTime( *pTime ); } @@ -506,7 +506,7 @@ IMPL_LINK_NOARG(AnimationWindow, ModifyTimeHdl) { sal_uLong nPos = static_cast<sal_uLong>(aNumFldBitmap.GetValue() - 1); - Time *const pTime = m_FrameList[nPos].second; + tools::Time *const pTime = m_FrameList[nPos].second; *pTime = aTimeField.GetTime(); @@ -627,11 +627,11 @@ void AnimationWindow::ResetAttrs() void AnimationWindow::WaitInEffect( sal_uLong nMilliSeconds, sal_uLong nTime, SfxProgress* pProgress ) const { - clock_t aEnd = Time::GetSystemTicks() + nMilliSeconds; - clock_t aCurrent = Time::GetSystemTicks(); + clock_t aEnd = tools::Time::GetSystemTicks() + nMilliSeconds; + clock_t aCurrent = tools::Time::GetSystemTicks(); while (aCurrent < aEnd) { - aCurrent = Time::GetSystemTicks(); + aCurrent = tools::Time::GetSystemTicks(); if( pProgress ) pProgress->SetState( nTime + nMilliSeconds + aCurrent - aEnd ); @@ -847,7 +847,7 @@ void AnimationWindow::AddObj (::sd::View& rView ) } long nTime = rAnimBmp.nWait; - Time* pTime = new Time( 0, 0, nTime / 100, nTime % 100 ); + ::tools::Time* pTime = new ::tools::Time( 0, 0, nTime / 100, nTime % 100 ); m_FrameList.insert( m_FrameList.begin() + m_nCurrentFrame + 1, ::std::make_pair(pBitmapEx, pTime)); @@ -874,7 +874,7 @@ void AnimationWindow::AddObj (::sd::View& rView ) SdrExchangeView::GetObjGraphic( pSnapShot->GetModel(), pSnapShot).GetBitmapEx() ); - Time* pTime = new Time( aTimeField.GetTime() ); + ::tools::Time* pTime = new ::tools::Time( aTimeField.GetTime() ); m_FrameList.insert( m_FrameList.begin() + m_nCurrentFrame + 1, @@ -895,7 +895,7 @@ void AnimationWindow::AddObj (::sd::View& rView ) BitmapEx *const pBitmapEx = new BitmapEx(rView.GetAllMarkedGraphic().GetBitmapEx()); - Time* pTime = new Time( aTimeField.GetTime() ); + ::tools::Time* pTime = new ::tools::Time( aTimeField.GetTime() ); m_FrameList.insert( m_FrameList.begin() + m_nCurrentFrame + 1, @@ -925,7 +925,7 @@ void AnimationWindow::AddObj (::sd::View& rView ) SdrExchangeView::GetObjGraphic( pObject->GetModel(), pObject).GetBitmapEx() ); - Time* pTime = new Time( aTimeField.GetTime() ); + ::tools::Time* pTime = new ::tools::Time( aTimeField.GetTime() ); m_FrameList.insert( m_FrameList.begin() + m_nCurrentFrame + 1, @@ -1015,7 +1015,7 @@ void AnimationWindow::CreateAnimObj (::sd::View& rView ) for (size_t i = 0; i < nCount; ++i) { - Time *const pTime = m_FrameList[i].second; + tools::Time *const pTime = m_FrameList[i].second; long nTime = pTime->GetNanoSec(); nTime += pTime->GetSec() * 100; |