sd/source/core/TransitionPreset.cxx | 21 ++++++++++++++++++++- 1 file changed, 20 insertions(+), 1 deletion(-)
New commits: commit 803d79b9934267f58769275ad766b25effeaebba Author: Javiya Vivekkumar Dineshbhai <[email protected]> AuthorDate: Mon Aug 12 18:41:50 2024 +0530 Commit: Tomaž Vajngerl <[email protected]> CommitDate: Mon Aug 26 20:50:51 2024 +0200 lok: enable Zoom transition and RotateIn sub-trans. type Signed-off-by: Javiya Vivekkumar Dineshbhai <[email protected]> Change-Id: I017403afe90a249cf4c703d813d44b02b0c1430b Reviewed-on: https://gerrit.libreoffice.org/c/core/+/171794 Reviewed-by: Tomaž Vajngerl <[email protected]> Tested-by: Jenkins CollaboraOffice <[email protected]> diff --git a/sd/source/core/TransitionPreset.cxx b/sd/source/core/TransitionPreset.cxx index add0ababf60b..29dd607caca5 100644 --- a/sd/source/core/TransitionPreset.cxx +++ b/sd/source/core/TransitionPreset.cxx @@ -118,7 +118,8 @@ bool TransitionPreset::importTransitionsFile( TransitionPresetList& rList, TransitionType::MISCDIAGONALWIPE, TransitionType::BOXSNAKESWIPE, TransitionType::BLINDSWIPE, - TransitionType::MISCSHAPEWIPE + TransitionType::MISCSHAPEWIPE, + TransitionType::ZOOM }; const std::set<sal_Int16> LOKSupportedTransitionSubTypes = { @@ -216,7 +217,8 @@ bool TransitionPreset::importTransitionsFile( TransitionPresetList& rList, TransitionSubType::COMBVERTICAL, TransitionSubType::COMBHORIZONTAL, TransitionSubType::FANOUTHORIZONTAL, - TransitionSubType::HEART + TransitionSubType::HEART, + TransitionSubType::ROTATEIN }; const std::set<sal_Int16> LOKMiscShapeWipeNonSupportedTransitionSubTypes = { commit 883d01dd47111ffda512da075c1454eefc758da5 Author: Javiya Vivekkumar Dineshbhai <[email protected]> AuthorDate: Mon Aug 12 18:24:46 2024 +0530 Commit: Tomaž Vajngerl <[email protected]> CommitDate: Mon Aug 26 20:50:45 2024 +0200 lok: disabled misc shape wipe non supported transition Signed-off-by: Javiya Vivekkumar Dineshbhai <[email protected]> Change-Id: I1a2f67e20fb39a711a6da41ee1152499cf91c28a Reviewed-on: https://gerrit.libreoffice.org/c/core/+/171793 Tested-by: Jenkins CollaboraOffice <[email protected]> Reviewed-by: Tomaž Vajngerl <[email protected]> diff --git a/sd/source/core/TransitionPreset.cxx b/sd/source/core/TransitionPreset.cxx index c3a40e600e01..add0ababf60b 100644 --- a/sd/source/core/TransitionPreset.cxx +++ b/sd/source/core/TransitionPreset.cxx @@ -219,6 +219,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 ); @@ -240,6 +248,12 @@ bool TransitionPreset::importTransitionsFile( TransitionPresetList& rList, { continue; } + + if( eTransitionType == TransitionType::MISCSHAPEWIPE + && LOKMiscShapeWipeNonSupportedTransitionSubTypes.find(eTransitionSubType) != LOKMiscShapeWipeNonSupportedTransitionSubTypes.end() ) + { + continue; + } } OUString aPresetId( pPreset->getPresetId() ); commit 27c2b99bcdb1a1cc34dd022bcd897b30776d560e Author: Javiya Vivekkumar Dineshbhai <[email protected]> AuthorDate: Thu Aug 1 12:30:20 2024 +0530 Commit: Tomaž Vajngerl <[email protected]> CommitDate: Mon Aug 26 20:50:38 2024 +0200 lok: enable MiscShapeWipe transition and sub-tras. Heart, FanOutHoriz. Signed-off-by: Javiya Vivekkumar Dineshbhai <[email protected]> Change-Id: I6511da17b3222bc83c0870f100fb7e8eafc78bef Reviewed-on: https://gerrit.libreoffice.org/c/core/+/171367 Tested-by: Jenkins CollaboraOffice <[email protected]> Reviewed-by: Tomaž Vajngerl <[email protected]> diff --git a/sd/source/core/TransitionPreset.cxx b/sd/source/core/TransitionPreset.cxx index 0832688287f5..c3a40e600e01 100644 --- a/sd/source/core/TransitionPreset.cxx +++ b/sd/source/core/TransitionPreset.cxx @@ -117,7 +117,8 @@ bool TransitionPreset::importTransitionsFile( TransitionPresetList& rList, TransitionType::SPIRALWIPE, TransitionType::MISCDIAGONALWIPE, TransitionType::BOXSNAKESWIPE, - TransitionType::BLINDSWIPE + TransitionType::BLINDSWIPE, + TransitionType::MISCSHAPEWIPE }; const std::set<sal_Int16> LOKSupportedTransitionSubTypes = { @@ -214,6 +215,8 @@ bool TransitionPreset::importTransitionsFile( TransitionPresetList& rList, TransitionSubType::FOURBOXHORIZONTAL, TransitionSubType::COMBVERTICAL, TransitionSubType::COMBHORIZONTAL, + TransitionSubType::FANOUTHORIZONTAL, + TransitionSubType::HEART }; try {
