summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorArmin Le Grand <Armin.Le.Grand@me.com>2024-04-18 11:59:26 +0200
committerArmin Le Grand <Armin.Le.Grand@me.com>2024-04-22 15:33:21 +0200
commitba431d2bcb70b64bf0eaec29a09916ea37755235 (patch)
tree9d4bd5c328b22e84a1e38f319c6868e42f316221
parent41368edc6e2b16d4e0ea89b822064bb75dfadc01 (diff)
Revert "IASS: Correct Buffering of last Slide"
This reverts commit 77eb3f1a76892b6070e77324e260204408383ef4. Reason for revert: Better solution in https://gerrit.libreoffice.org/c/core/+/166177 which is 052c668da38b70943d24770895abc8119aace2a6 Change-Id: I42248771c993bcd04c2fe368795db4e1fe7a2586 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/166212 Tested-by: Jenkins Reviewed-by: Armin Le Grand <Armin.Le.Grand@me.com>
-rw-r--r--sd/source/ui/slideshow/slideshowimpl.cxx12
-rw-r--r--slideshow/source/engine/slideshowimpl.cxx8
2 files changed, 0 insertions, 20 deletions
diff --git a/sd/source/ui/slideshow/slideshowimpl.cxx b/sd/source/ui/slideshow/slideshowimpl.cxx
index f8163de5b34e..e11d42a89be9 100644
--- a/sd/source/ui/slideshow/slideshowimpl.cxx
+++ b/sd/source/ui/slideshow/slideshowimpl.cxx
@@ -500,18 +500,6 @@ void AnimationSlideController::displayCurrentSlide( const Reference< XSlideShow
Any(aValue),
PropertyState_DIRECT_VALUE);
}
- else if (-1 == nNextSlideNumber)
- {
- // IASS: next slide does not exist, thus current slide is the last one.
- // we need to signal to stop Prefetch since else SlideShowImpl *keeps* the
- // last slide buffered and will just re-use it when asked to update, thus
- // updates will not work.
- aProperties.emplace_back( "Prefetch" ,
- -1,
- Any(false),
- PropertyState_DIRECT_VALUE);
- }
-
if (bSkipAllMainSequenceEffects)
{
// Add one property that prevents the slide transition from being
diff --git a/slideshow/source/engine/slideshowimpl.cxx b/slideshow/source/engine/slideshowimpl.cxx
index ee02fc8d8f69..1acc020414db 100644
--- a/slideshow/source/engine/slideshowimpl.cxx
+++ b/slideshow/source/engine/slideshowimpl.cxx
@@ -1041,14 +1041,6 @@ public:
seq[0] >>= mpSlideShowImpl->mxPrefetchSlide;
seq[1] >>= mpSlideShowImpl->mxPrefetchAnimationNode;
}
- else // rProperty.Value might be tested to 'bool' and 'false'
- {
- // IASS: There is no 'next' slide (last one is displayed),
- // so end/flush Prefetch since that might still hold the
- // last slide what would prevent updating/re-creating it
- mpSlideShowImpl->mxPrefetchSlide.clear();
- mpSlideShowImpl->mpPrefetchSlide.reset();
- }
}
else if ( rProperty.Name == "SkipAllMainSequenceEffects" )
{