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

[Henry Castro (via logerrit)]

 sd/source/ui/unoidl/unomodel.cxx |   22 ++++++++++++++++++++++
 1 file changed, 22 insertions(+)

New commits:
commit ec71c7cff445fff35013e64e30cbe6a6b1590ed1
Author:     Henry Castro <hcas...@collabora.com>
AuthorDate: Thu Sep 18 09:50:32 2025 -0400
Commit:     Caolán McNamara <caolan.mcnam...@collabora.com>
CommitDate: Thu Sep 18 17:19:49 2025 +0200

    sd: add title JSON property
    
    Add title string for screen reader announcements
    
    Change-Id: I8ad2c72f4dc87f85a9210a5a80dfdaeadf1f8a1e
    Signed-off-by: Henry Castro <hcas...@collabora.com>
    Reviewed-on: https://gerrit.libreoffice.org/c/core/+/191127
    Reviewed-by: Caolán McNamara <caolan.mcnam...@collabora.com>
    Tested-by: Caolán McNamara <caolan.mcnam...@collabora.com>

diff --git a/sd/source/ui/unoidl/unomodel.cxx b/sd/source/ui/unoidl/unomodel.cxx
index 8ee6a0b258a4..8566abf85f7c 100644
--- a/sd/source/ui/unoidl/unomodel.cxx
+++ b/sd/source/ui/unoidl/unomodel.cxx
@@ -1404,6 +1404,11 @@ void AnimationsExporter::exportAnimate(const 
Reference<XAnimate>& xAnimate)
         {
             anim::convertTarget(sTmp, aTemp);
             mrWriter.put("targetElement", sTmp.makeStringAndClear());
+            SdrObject* pObject = getTargetObject(aTemp);
+            if (pObject)
+            {
+                mrWriter.put("title", pObject->GetTitle());
+            }
         }
         nTemp = xAnimate->getSubItem();
         if (nTemp)
commit 0c6ba261a0c70108b44a125ba72eef2f844982e5
Author:     Henry Castro <hcas...@collabora.com>
AuthorDate: Thu Sep 18 09:46:33 2025 -0400
Commit:     Caolán McNamara <caolan.mcnam...@collabora.com>
CommitDate: Thu Sep 18 17:19:36 2025 +0200

    sd: add transitionLabel JSON property
    
    Add transition label for a11y screen reader announcements.
    
    Change-Id: I2b6396fff748e3422a7a8fc83821aae4c94cd4e9
    Signed-off-by: Henry Castro <hcas...@collabora.com>
    Reviewed-on: https://gerrit.libreoffice.org/c/core/+/191126
    Tested-by: Caolán McNamara <caolan.mcnam...@collabora.com>
    Reviewed-by: Caolán McNamara <caolan.mcnam...@collabora.com>

diff --git a/sd/source/ui/unoidl/unomodel.cxx b/sd/source/ui/unoidl/unomodel.cxx
index 607375fc2c84..8ee6a0b258a4 100644
--- a/sd/source/ui/unoidl/unomodel.cxx
+++ b/sd/source/ui/unoidl/unomodel.cxx
@@ -120,6 +120,7 @@
 #include <rtl/math.hxx>
 #include <tools/helpers.hxx>
 #include <tools/json_writer.hxx>
+#include <TransitionPreset.hxx>
 
 // Support creation of GraphicStorageHandler and EmbeddedObjectResolver
 #include <svx/xmleohlp.hxx>
@@ -4821,6 +4822,22 @@ OString SdXImpressDocument::getPresentationInfo(bool 
bAllyState) const
                             SAL_WARN("sd", "Transition sub-type unknown: " << 
nTransitionSubtype);
                         }
 
+                        if (bAllyState)
+                        {
+                            const TransitionPresetList& rList = 
TransitionPreset::getTransitionPresetList();
+                            auto aTransition = std::find_if(rList.begin(), 
rList.end(),
+                                                            [nTransitionType,
+                                                             
nTransitionSubtype](const TransitionPresetPtr& rxPreset) {
+                                                                return 
(rxPreset->getTransition() == nTransitionType)
+                                                                    && 
(rxPreset->getSubtype() == nTransitionSubtype);
+                                                            });
+
+                            if (aTransition != rList.end())
+                            {
+                                aJsonWriter.put("transitionLabel", 
(*aTransition)->getSetLabel());
+                            }
+                        }
+
                         bool nTransitionDirection = false;
                         pSlide->getPropertyValue("TransitionDirection") >>= 
nTransitionDirection;
                         aJsonWriter.put("transitionDirection", 
nTransitionDirection);