sd/source/ui/unoidl/unomodel.cxx | 19 ++++++++++---------
1 file changed, 10 insertions(+), 9 deletions(-)
New commits:
commit 9d1bedcd6791463c6c8ae737d912cee505dd5699
Author: Marco Cecchetti <marco.cecche...@collabora.com>
AuthorDate: Mon Sep 2 18:31:50 2024 +0200
Commit: Miklos Vajna <vmik...@collabora.com>
CommitDate: Wed Nov 13 11:49:42 2024 +0100
lok: slideshow: export slide duration also when there is no transitions
Change-Id: I234cb814a2096a0071de9cea3f7f8289c107b2b6
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/176520
Tested-by: Jenkins
Reviewed-by: Miklos Vajna <vmik...@collabora.com>
diff --git a/sd/source/ui/unoidl/unomodel.cxx b/sd/source/ui/unoidl/unomodel.cxx
index f083334354bc..ee7cbc943f90 100644
--- a/sd/source/ui/unoidl/unomodel.cxx
+++ b/sd/source/ui/unoidl/unomodel.cxx
@@ -4408,21 +4408,22 @@ OString SdXImpressDocument::getPresentationInfo() const
// convert transitionDuration time to ms
aJsonWriter.put("transitionDuration",
nTransitionDuration * 1000);
}
+ }
- sal_Int32 nChange(0);
- if( pSlide->getPropertySetInfo()->hasPropertyByName(
"Change" ) &&
+ sal_Int32 nChange(0);
+ if( pSlide->getPropertySetInfo()->hasPropertyByName( "Change"
) &&
(pSlide->getPropertyValue( "Change" ) >>= nChange ) &&
nChange == 1 )
- {
- double fSlideDuration(0);
- if( pSlide->getPropertySetInfo()->hasPropertyByName(
"HighResDuration" ) &&
+ {
+ double fSlideDuration(0);
+ if( pSlide->getPropertySetInfo()->hasPropertyByName(
"HighResDuration" ) &&
(pSlide->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, pSlide);
if (aAnimationExporter.hasEffects())
{
