core.git: Branch 'distro/collabora/co-24.04' - 2 commits - sd/source sd/uiconfig

[Javiya Vivekkumar Dineshbhai (via logerrit)]

 sd/source/ui/animations/SlideTransitionPane.cxx  |    2 +-
 sd/uiconfig/simpress/ui/slidetransitionspanel.ui |    4 ++--
 2 files changed, 3 insertions(+), 3 deletions(-)

New commits:
commit b37e4b02102e075b3ac0d49f45019e8590157cc3
Author:     Javiya Vivekkumar Dineshbhai <vivek.jav...@collabora.com>
AuthorDate: Wed Aug 14 23:46:32 2024 +0530
Commit:     Tomaž Vajngerl <qui...@gmail.com>
CommitDate: Wed Aug 14 23:35:15 2024 +0200

    slideshow: improve grammar for repeat slideshow in sidebar
    
    Signed-off-by: Javiya Vivekkumar Dineshbhai <vivek.jav...@collabora.com>
    Change-Id: Ibe3ca1c11a9dcbb82cadc0ab531e9a69fe275769
    Reviewed-on: https://gerrit.libreoffice.org/c/core/+/171876
    Tested-by: Jenkins CollaboraOffice <jenkinscollaboraoff...@gmail.com>
    Reviewed-by: Tomaž Vajngerl <qui...@gmail.com>

diff --git a/sd/uiconfig/simpress/ui/slidetransitionspanel.ui 
b/sd/uiconfig/simpress/ui/slidetransitionspanel.ui
index 16bc2d0ffa12..fc2704ef4e40 100644
--- a/sd/uiconfig/simpress/ui/slidetransitionspanel.ui
+++ b/sd/uiconfig/simpress/ui/slidetransitionspanel.ui
@@ -370,7 +370,7 @@
                 </child>
                 <child>
                   <object class="GtkRadioButton" id="rb_auto_repeat">
-                    <property name="label" translatable="yes" 
context="slidetransitionspanel|rb_auto_repeat">After Slideshow:</property>
+                    <property name="label" translatable="yes" 
context="slidetransitionspanel|rb_auto_repeat">After :</property>
                     <property name="visible">True</property>
                     <property name="can-focus">True</property>
                     <property name="receives-default">False</property>
@@ -419,7 +419,7 @@
               <object class="GtkLabel" id="lable3">
                 <property name="visible">True</property>
                 <property name="can-focus">False</property>
-                <property name="label" translatable="yes" 
context="slidetransitionspanel|rb_auto_repeat">Repeat After</property>
+                <property name="label" translatable="yes" 
context="slidetransitionspanel|rb_auto_repeat">Repeat Slideshow</property>
                 <attributes>
                   <attribute name="weight" value="bold"/>
                 </attributes>
commit 8f1a575b8779548aa25c7a4723d16a91cd7a3333
Author:     Javiya Vivekkumar Dineshbhai <vivek.jav...@collabora.com>
AuthorDate: Wed Aug 14 23:33:07 2024 +0530
Commit:     Tomaž Vajngerl <qui...@gmail.com>
CommitDate: Wed Aug 14 23:35:07 2024 +0200

    lok: fix repeat slideshow after duration issue
    
    Signed-off-by: Javiya Vivekkumar Dineshbhai <vivek.jav...@collabora.com>
    Change-Id: I0b84d003ab3345bc89482e9940a4f0d11f33e427
    Reviewed-on: https://gerrit.libreoffice.org/c/core/+/171875
    Reviewed-by: Tomaž Vajngerl <qui...@gmail.com>
    Tested-by: Jenkins CollaboraOffice <jenkinscollaboraoff...@gmail.com>

diff --git a/sd/source/ui/animations/SlideTransitionPane.cxx 
b/sd/source/ui/animations/SlideTransitionPane.cxx
index 28ea788f5d70..f431d91fb9d2 100644
--- a/sd/source/ui/animations/SlideTransitionPane.cxx
+++ b/sd/source/ui/animations/SlideTransitionPane.cxx
@@ -841,7 +841,7 @@ impl::TransitionEffect 
SlideTransitionPane::getTransitionEffectFromControls() co
             if ( mxMF_REPEAT_AUTO_AFTER->get_sensitive() )
             {
                 rSettings.mbEndless = true;
-                rSettings.mnPauseTimeout = 
static_cast<sal_uInt32>(mxMF_REPEAT_AUTO_AFTER->get_value(FieldUnit::SECOND));
+                rSettings.mnPauseTimeout = 
static_cast<sal_uInt32>(mxMF_REPEAT_AUTO_AFTER->get_value(FieldUnit::SECOND) / 
100.0) ;
             }
         }
     }