commit daeba3f3cc376365b041c2441e3b6dbd46aa8235
author dldld <LibreOfficeContribution@dldld.de> Fri Apr 22 21:36:38 2022 +0200
committer Thorsten Behrens <thorsten.behrens@allotropia.de> Wed Apr 27 12:14:49 2022 +0200
tree cd131b6c035f22394d33e1ae459254fcace8da61
parent 4a8ea3d086e03098fcff2a744ccb632f50f173dd

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.behrens@allotropia.de>

sd/source/ui/slideshow/showwin.cxx

diff --git a/sd/source/ui/slideshow/showwin.cxx b/sd/source/ui/slideshow/showwin.cxx
index 417b7a12..35c0a40 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();

sd/source/ui/slideshow/slideshowimpl.cxx

diff --git a/sd/source/ui/slideshow/slideshowimpl.cxx b/sd/source/ui/slideshow/slideshowimpl.cxx
index d99e554..1d552cd 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();
        }