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

[Darshan-upadhyay1110 (via logerrit)]

 sd/source/ui/animations/SlideTransitionPane.cxx |    9 ++++++++-
 1 file changed, 8 insertions(+), 1 deletion(-)

New commits:
commit ba0ec3b5f6f2154205ad72ce444a48b4dfb9af88
Author:     Darshan-upadhyay1110 <darshan.upadh...@collabora.com>
AuthorDate: Wed Dec 11 15:31:30 2024 +0530
Commit:     Pedro Silva <pedro.si...@collabora.com>
CommitDate: Fri Dec 13 10:39:49 2024 +0100

    Broadcast the transition change
    
    - Now multiple user can see the simultaneous changes on transition sidebar
    
    Change-Id: Iae598d2cf106f3fdfb96ce409c31c69d196e8912
    Reviewed-on: https://gerrit.libreoffice.org/c/core/+/178298
    Reviewed-by: Szymon Kłos <szymon.k...@collabora.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 ed2c0c270f67..e30661a67fa0 100644
--- a/sd/source/ui/animations/SlideTransitionPane.cxx
+++ b/sd/source/ui/animations/SlideTransitionPane.cxx
@@ -543,10 +543,15 @@ void SlideTransitionPane::updateControls()
     {
          // ToDo: That 0 is "no transition" is documented nowhere except in the
         // CTOR of sdpage
+        OUString sSelectedId = mxTransitionsIconView->get_selected_id();
+        auto* pTransitionEntry = weld::fromId<TransitionEntry*>(sSelectedId);
+
         if( aEffect.mnType == 0 )
             mxTransitionsIconView->select(0);
-        else
+        else if(!pTransitionEntry)
             updateVariants(getPreset(aEffect));
+        else
+            updateVariants(pTransitionEntry->mpPreset);
     }
 
     if( aEffect.mbDurationAmbiguous )
@@ -876,6 +881,8 @@ impl::TransitionEffect 
SlideTransitionPane::getTransitionEffectFromControls() co
         aResult.mbLoopSoundAmbiguous = false;
     }
 
+    mpDrawDoc->Broadcast(SdrHint(SdrHintKind::ObjectChange));
+
     return aResult;
 }