sd/source/ui/unoidl/unomodel.cxx | 20 ++++++++++----------
1 file changed, 10 insertions(+), 10 deletions(-)
New commits:
commit bd63513cbb567e35a93754c9f492f059487adf87
Author: Marco Cecchetti <marco.cecche...@collabora.com>
AuthorDate: Mon Sep 2 18:04:51 2024 +0200
Commit: Szymon Kłos <szymon.k...@collabora.com>
CommitDate: Tue Sep 3 09:45:07 2024 +0200
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/+/172774
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 9e8a92470155..6c7b5d17cb85 100644
--- a/sd/source/ui/unoidl/unomodel.cxx
+++ b/sd/source/ui/unoidl/unomodel.cxx
@@ -4226,6 +4226,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);
+ }
+
::tools::ScopedJsonWriterArray aSlideList =
aJsonWriter.startArray("slides");
sal_Int32 nSlideCount = xSlides->getCount();
for (sal_Int32 i = 0; i < nSlideCount; ++i)
@@ -4372,16 +4382,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,
xSlide);
if (aAnimationExporter.hasEffects())
{
