sd/source/core/TransitionPreset.cxx | 4 +++-
sd/source/ui/unoidl/unomodel.cxx | 2 ++
2 files changed, 5 insertions(+), 1 deletion(-)
New commits:
commit 3f2870265671a79a2e9a16d6602d7e8f47dd484e
Author: Javiya Vivekkumar Dineshbhai <vivek.jav...@collabora.com>
AuthorDate: Wed Jul 24 16:56:19 2024 +0530
Commit: Tomaž Vajngerl <qui...@gmail.com>
CommitDate: Wed Jul 24 17:23:37 2024 +0200
slideshow: enable comb transition
Signed-off-by: Javiya Vivekkumar Dineshbhai <vivek.jav...@collabora.com>
Change-Id: Iac0c07f83904055a30c65e4133443772246d9502
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/170936
Tested-by: Jenkins CollaboraOffice <jenkinscollaboraoff...@gmail.com>
Reviewed-by: Tomaž Vajngerl <qui...@gmail.com>
diff --git a/sd/source/core/TransitionPreset.cxx
b/sd/source/core/TransitionPreset.cxx
index 45cb724e4347..0832688287f5 100644
--- a/sd/source/core/TransitionPreset.cxx
+++ b/sd/source/core/TransitionPreset.cxx
@@ -211,7 +211,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 844f2c8c46e6..df61e3f8c92a 100644
--- a/sd/source/ui/unoidl/unomodel.cxx
+++ b/sd/source/ui/unoidl/unomodel.cxx
@@ -391,6 +391,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>({
