From fdc87dd56548622e13353b4cf9864232ee0110fb Mon Sep 17 00:00:00 2001 From: Julien Nabet Date: Thu, 14 Dec 2023 13:35:24 +0100 Subject: [PATCH] tdf#151456: AnimatedImages in Basic Dialog : StepTime is ignored 2 problems here 1) Regression on test of "pThrobber" since 51e97b2ffd8f0ae0591d1880d621cba4596583b7 toolkit: first cut at switching to VclPtr. 2) as the author of the bug "Jurassik Pork" indicated, "mnStepTime" wasn't used after having been used in ctr of Throbber Thank you to him for the suggestion! Change-Id: I0d1a53738035c3e822ea84d5972363dd9d0b5d8d Reviewed-on: https://gerrit.libreoffice.org/c/core/+/160771 Tested-by: Jenkins Reviewed-by: Julien Nabet --- toolkit/source/awt/animatedimagespeer.cxx | 2 +- vcl/source/control/throbber.cxx | 1 + 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/toolkit/source/awt/animatedimagespeer.cxx b/toolkit/source/awt/animatedimagespeer.cxx index ac2dca5603be..379a82388ba2 100644 --- a/toolkit/source/awt/animatedimagespeer.cxx +++ b/toolkit/source/awt/animatedimagespeer.cxx @@ -182,7 +182,7 @@ namespace toolkit SolarMutexGuard aGuard; VclPtr pThrobber = GetAsDynamic(); - if ( pThrobber ) + if ( !pThrobber ) { VCLXWindow::setProperty( i_propertyName, i_value ); return; diff --git a/vcl/source/control/throbber.cxx b/vcl/source/control/throbber.cxx index c44cbb12d7b2..075e40d2de9b 100644 --- a/vcl/source/control/throbber.cxx +++ b/vcl/source/control/throbber.cxx @@ -152,6 +152,7 @@ void Throbber::initImages() void Throbber::start() { + maWaitTimer.SetTimeout(mnStepTime); maWaitTimer.Start(); }