sd/source/ui/unoidl/unomodel.cxx | 20 ++++++++++----------
1 file changed, 10 insertions(+), 10 deletions(-)
New commits:
commit 6a7ba6684766b8a506d8038f75e16684cb9c0ef1
Author: Marco Cecchetti <marco.cecche...@collabora.com>
AuthorDate: Mon Sep 2 18:04:51 2024 +0200
Commit: Miklos Vajna <vmik...@collabora.com>
CommitDate: Wed Nov 13 09:17:13 2024 +0100
lok: slideshow: not export endless and repeat property per each slide
Endless and loopAndRepeatDuration properties has to be exported as
presentation property
Change-Id: I223ab488c8be0726f84a229a63595be6f9455c76
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/176468
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 070616a101a0..f083334354bc 100644
--- a/sd/source/ui/unoidl/unomodel.cxx
+++ b/sd/source/ui/unoidl/unomodel.cxx
@@ -4255,6 +4255,16 @@ OString SdXImpressDocument::getPresentationInfo() const
aJsonWriter.put("docWidth", aDocSize.getWidth());
aJsonWriter.put("docHeight", aDocSize.getHeight());
+ sd::PresentationSettings const& rSettings =
mpDoc->getPresentationSettings();
+
+ const bool bIsEndless = rSettings.mbEndless;
+ aJsonWriter.put("isEndless", bIsEndless);
+
+ if (bIsEndless) {
+ const sal_Int32 nPauseTimeout = rSettings.mnPauseTimeout;
+ aJsonWriter.put("loopAndRepeatDuration", nPauseTimeout);
+ }
+
auto aSlideList = aJsonWriter.startArray("slides");
sal_Int32 nSlideCount = xDrawPages->getCount();
for (sal_Int32 i = 0; i < nSlideCount; ++i)
@@ -4413,16 +4423,6 @@ OString SdXImpressDocument::getPresentationInfo() const
}
}
- sd::PresentationSettings const& rSettings =
mpDoc->getPresentationSettings();
-
- const bool bIsEndless = rSettings.mbEndless;
- aJsonWriter.put("isEndless", bIsEndless);
-
- if (bIsEndless) {
- const sal_Int32 nPauseTimeout = rSettings.mnPauseTimeout;
- aJsonWriter.put("loopAndRepeatDuration", nPauseTimeout);
- }
-
AnimationsExporter aAnimationExporter(aJsonWriter, pSlide);
if (aAnimationExporter.hasEffects())
{
