sd/source/ui/slideshow/showwin.cxx | 2 +-
sd/source/ui/slideshow/slideshowimpl.cxx | 2 +-
2 files changed, 2 insertions(+), 2 deletions(-)
New commits:
commit daeba3f3cc376365b041c2441e3b6dbd46aa8235
Author: dldld <libreofficecontribut...@dldld.de>
AuthorDate: Fri Apr 22 21:36:38 2022 +0200
Commit: Thorsten Behrens <thorsten.behr...@allotropia.de>
CommitDate: Wed Apr 27 12:14:49 2022 +0200
tdf#141835 handle SHOWWINDOWMODE_END when resuming the slide show
The problem which is fixed with this commit is, that the slide show ends
when the presention screen has shown "Click to exit" after the last slide, and
then the slide show was moved to a specific slide. e.g. via Remote App or
Presenter Console. In this case the slide show should be resumed and the slide
should be displayed. Instead the slide show was ended.
Instead of only handling the BLANK mode for resuming a slide show also the
END mode is now inlcuded to resume the slide show.
Change-Id: I78e00dc882b2d7af8b7a6b215aaac122bbd9ead9
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/133337
Tested-by: Jenkins
Reviewed-by: Thorsten Behrens <thorsten.behr...@allotropia.de>
diff --git a/sd/source/ui/slideshow/showwin.cxx
b/sd/source/ui/slideshow/showwin.cxx
index 417b7a12306e..35c0a4027f04 100644
--- a/sd/source/ui/slideshow/showwin.cxx
+++ b/sd/source/ui/slideshow/showwin.cxx
@@ -432,7 +432,7 @@ void ShowWindow::RestartShow( sal_Int32 nPageIndexToRestart
)
{
AddWindowToPaintView();
- if( SHOWWINDOWMODE_BLANK == eOldShowWindowMode )
+ if( SHOWWINDOWMODE_BLANK == eOldShowWindowMode ||
SHOWWINDOWMODE_END == eOldShowWindowMode )
{
xSlideShow->pause(false);
Invalidate();
diff --git a/sd/source/ui/slideshow/slideshowimpl.cxx
b/sd/source/ui/slideshow/slideshowimpl.cxx
index d99e5549ebdc..1d552cded0ba 100644
--- a/sd/source/ui/slideshow/slideshowimpl.cxx
+++ b/sd/source/ui/slideshow/slideshowimpl.cxx
@@ -1383,7 +1383,7 @@ void SAL_CALL SlideshowImpl::resume()
if( mbIsPaused ) try
{
- if( mpShowWindow->GetShowWindowMode() == SHOWWINDOWMODE_BLANK )
+ if( mpShowWindow->GetShowWindowMode() == SHOWWINDOWMODE_BLANK ||
mpShowWindow->GetShowWindowMode() == SHOWWINDOWMODE_END )
{
mpShowWindow->RestartShow();
}
