core.git: sd/source

[Javiya Vivekkumar Dineshbhai (via logerrit)]

 sd/source/core/TransitionPreset.cxx |   14 ++++++++++++++
 1 file changed, 14 insertions(+)

New commits:
commit db0f9087e4a075bb319a4153e9dab621be42c61e
Author:     Javiya Vivekkumar Dineshbhai <vivek.jav...@collabora.com>
AuthorDate: Mon Aug 12 18:24:46 2024 +0530
Commit:     Miklos Vajna <vmik...@collabora.com>
CommitDate: Fri Nov 8 13:56:12 2024 +0100

    lok: disabled misc shape wipe non supported transition
    
    Change-Id: I1a2f67e20fb39a711a6da41ee1152499cf91c28a
    Reviewed-on: https://gerrit.libreoffice.org/c/core/+/176266
    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 23f5d82f449d..c1fe6821ae8a 100644
--- a/sd/source/core/TransitionPreset.cxx
+++ b/sd/source/core/TransitionPreset.cxx
@@ -220,6 +220,14 @@ bool TransitionPreset::importTransitionsFile( 
TransitionPresetList& rList,
             TransitionSubType::HEART
     };
 
+    const std::set<sal_Int16> LOKMiscShapeWipeNonSupportedTransitionSubTypes = 
{
+            TransitionSubType::DIAMOND,
+            TransitionSubType::HEART,
+            TransitionSubType::CIRCLE,
+            TransitionSubType::VERTICAL,
+            TransitionSubType::TOPLEFT
+    };
+
     try {
         xAnimationNode = implImportEffects( xServiceFactory, aURL );
         Reference< XEnumerationAccess > xEnumerationAccess( xAnimationNode, 
UNO_QUERY_THROW );
@@ -241,6 +249,12 @@ bool TransitionPreset::importTransitionsFile( 
TransitionPresetList& rList,
                     {
                         continue;
                     }
+
+                    if( eTransitionType == TransitionType::MISCSHAPEWIPE
+                            && 
LOKMiscShapeWipeNonSupportedTransitionSubTypes.find(eTransitionSubType) != 
LOKMiscShapeWipeNonSupportedTransitionSubTypes.end() )
+                    {
+                        continue;
+                    }
                 }
 
                 OUString aPresetId( pPreset->getPresetId() );