sd/source/ui/unoidl/unomodel.cxx | 21 +++++++++++----------
1 file changed, 11 insertions(+), 10 deletions(-)
New commits:
commit b44002671360f6981442bca0f89aabfb69859e32
Author: Marco Cecchetti <marco.cecche...@collabora.com>
AuthorDate: Mon Sep 2 18:31:50 2024 +0200
Commit: Szymon Kłos <szymon.k...@collabora.com>
CommitDate: Tue Sep 3 09:46:01 2024 +0200
lok: slideshow: export slide duration also when there is no transitions
Change-Id: I234cb814a2096a0071de9cea3f7f8289c107b2b6
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/172775
Tested-by: Jenkins CollaboraOffice <jenkinscollaboraoff...@gmail.com>
Reviewed-by: Szymon Kłos <szymon.k...@collabora.com>
diff --git a/sd/source/ui/unoidl/unomodel.cxx b/sd/source/ui/unoidl/unomodel.cxx
index 6c7b5d17cb85..99d5d9718fec 100644
--- a/sd/source/ui/unoidl/unomodel.cxx
+++ b/sd/source/ui/unoidl/unomodel.cxx
@@ -4367,21 +4367,22 @@ OString SdXImpressDocument::getPresentationInfo() const
// convert transitionDuration time to ms
aJsonWriter.put("transitionDuration",
nTransitionDuration * 1000);
}
+ }
- sal_Int32 nChange(0);
- if(
xPropSet->getPropertySetInfo()->hasPropertyByName( "Change" ) &&
- (xPropSet->getPropertyValue( "Change" )
>>= nChange ) && nChange == 1 )
+ sal_Int32 nChange(0);
+ if(
xPropSet->getPropertySetInfo()->hasPropertyByName( "Change" ) &&
+ (xPropSet->getPropertyValue( "Change" ) >>=
nChange ) && nChange == 1 )
+ {
+ double fSlideDuration(0);
+ if(
xPropSet->getPropertySetInfo()->hasPropertyByName( "HighResDuration" ) &&
+ (xPropSet->getPropertyValue(
"HighResDuration" ) >>= fSlideDuration) )
{
- double fSlideDuration(0);
- if(
xPropSet->getPropertySetInfo()->hasPropertyByName( "HighResDuration" ) &&
- (xPropSet->getPropertyValue(
"HighResDuration" ) >>= fSlideDuration) )
- {
- // convert slide duration time to ms
- aJsonWriter.put("nextSlideDuration",
fSlideDuration * 1000);
- }
+ // convert slide duration time to ms
+ aJsonWriter.put("nextSlideDuration",
fSlideDuration * 1000);
}
}
+
AnimationsExporter aAnimationExporter(aJsonWriter,
xSlide);
if (aAnimationExporter.hasEffects())
{
