core.git: sd/source

[Javiya Vivekkumar Dineshbhai (via logerrit)]

 sd/source/core/TransitionPreset.cxx |    4 +++-
 sd/source/ui/unoidl/unomodel.cxx    |    2 ++
 2 files changed, 5 insertions(+), 1 deletion(-)

New commits:
commit 1f16b88e9dbfe1477dd90e361394f5ffeac3e932
Author:     Javiya Vivekkumar Dineshbhai <vivek.jav...@collabora.com>
AuthorDate: Wed Jul 24 16:56:19 2024 +0530
Commit:     Miklos Vajna <vmik...@collabora.com>
CommitDate: Mon Oct 7 14:16:19 2024 +0200

    slideshow: enable comb transition
    
    Change-Id: Iac0c07f83904055a30c65e4133443772246d9502
    Reviewed-on: https://gerrit.libreoffice.org/c/core/+/171422
    Tested-by: Jenkins
    Reviewed-by: Miklos Vajna <vmik...@collabora.com>

diff --git a/sd/source/core/TransitionPreset.cxx 
b/sd/source/core/TransitionPreset.cxx
index f021aac93800..e146cb7412d5 100644
--- a/sd/source/core/TransitionPreset.cxx
+++ b/sd/source/core/TransitionPreset.cxx
@@ -212,7 +212,9 @@ bool TransitionPreset::importTransitionsFile( 
TransitionPresetList& rList,
             TransitionSubType::TWOBOXLEFT,
             TransitionSubType::TWOBOXRIGHT,
             TransitionSubType::FOURBOXVERTICAL,
-            TransitionSubType::FOURBOXHORIZONTAL
+            TransitionSubType::FOURBOXHORIZONTAL,
+            TransitionSubType::COMBVERTICAL,
+            TransitionSubType::COMBHORIZONTAL,
     };
 
     try {
diff --git a/sd/source/ui/unoidl/unomodel.cxx b/sd/source/ui/unoidl/unomodel.cxx
index 0242b2530e37..8e399591bc7a 100644
--- a/sd/source/ui/unoidl/unomodel.cxx
+++ b/sd/source/ui/unoidl/unomodel.cxx
@@ -387,6 +387,8 @@ constexpr auto constTransitionSubTypeToString = 
mapEnumToString<sal_Int16>({
     { animations::TransitionSubType::FROMTOP, "FromTop"},
     { animations::TransitionSubType::HORIZONTALLEFT, "HorizontalLeft"},
     { animations::TransitionSubType::HORIZONTALRIGHT, "HorizontalRight"},
+    { animations::TransitionSubType::COMBVERTICAL, "CombVertical"},
+    { animations::TransitionSubType::COMBHORIZONTAL, "CombHorizontal"},
 });
 
 constexpr auto constAnimationNodeTypeToString = mapEnumToString<sal_Int16>({