sd/source/ui/dlg/animobjs.cxx | 8 ++++---- sd/source/ui/inc/animobjs.hxx | 2 +- 2 files changed, 5 insertions(+), 5 deletions(-)
New commits: commit 69054d064b315c8827ea7fc69d59ccf6f4d297c4 Author: Swarnadeep Paul <[email protected]> AuthorDate: Sat Feb 28 11:54:19 2026 +0530 Commit: Michael Weghorn <[email protected]> CommitDate: Wed Mar 4 07:17:39 2026 +0100 tdf#114441 sd: Use sal_Int64 for animation timers Replaced platform-dependent sal_uLong with sal_Int64 to safely handle time/tick calculations. Change-Id: I453745b9584d2e5af7ef6517191d75a2e09ef320 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/200663 Reviewed-by: Michael Weghorn <[email protected]> Tested-by: Jenkins diff --git a/sd/source/ui/dlg/animobjs.cxx b/sd/source/ui/dlg/animobjs.cxx index 8e07225c561e..530072faba7c 100644 --- a/sd/source/ui/dlg/animobjs.cxx +++ b/sd/source/ui/dlg/animobjs.cxx @@ -279,7 +279,7 @@ IMPL_LINK( AnimationWindow, ClickPlayHdl, weld::Button&, rButton, void ) pProgress.reset(new SfxProgress( nullptr, u"Animator:"_ustr, nFullTime )); // "Animator:" here we should think about something smart } - sal_uLong nTmpTime = 0; + sal_uInt64 nTmpTime = 0; size_t i = 0; bool bCount = i < nCount; if (bCount) @@ -300,7 +300,7 @@ IMPL_LINK( AnimationWindow, ClickPlayHdl, weld::Button&, rButton, void ) ::tools::Time const & rTime = m_FrameList[i].second; m_xFormatter->SetTime( rTime ); - sal_uLong nTime = rTime.GetMSFromTime(); + sal_Int32 nTime = rTime.GetMSFromTime(); WaitInEffect( nTime, nTmpTime, pProgress.get() ); nTmpTime += nTime; @@ -499,7 +499,7 @@ IMPL_LINK_NOARG(AnimationWindow, ModifyBitmapHdl, weld::SpinButton&, void) IMPL_LINK_NOARG(AnimationWindow, ModifyTimeHdl, weld::FormattedSpinButton&, void) { - sal_uLong nPos = m_xNumFldBitmap->get_value() - 1; + sal_Int64 nPos = m_xNumFldBitmap->get_value() - 1; ::tools::Time & rTime = m_FrameList[nPos].second; @@ -617,7 +617,7 @@ void AnimationWindow::ResetAttrs() UpdateControl(); } -void AnimationWindow::WaitInEffect( sal_uLong nMilliSeconds, sal_uLong nTime, +void AnimationWindow::WaitInEffect( sal_Int64 nMilliSeconds, sal_Int64 nTime, SfxProgress* pProgress ) const { sal_uInt64 aEnd = ::tools::Time::GetSystemTicks() + nMilliSeconds; diff --git a/sd/source/ui/inc/animobjs.hxx b/sd/source/ui/inc/animobjs.hxx index f38cc8531946..832bd7fe4981 100644 --- a/sd/source/ui/inc/animobjs.hxx +++ b/sd/source/ui/inc/animobjs.hxx @@ -140,7 +140,7 @@ private: void UpdateControl(bool bDisableCtrls = false); void ResetAttrs(); - void WaitInEffect( sal_uLong nMilliSeconds, sal_uLong nTime, + void WaitInEffect( sal_Int64 nMilliSeconds, sal_Int64 nTime, SfxProgress* pStbMgr ) const; Fraction GetScale(); };
