[Libreoffice-commits] core.git: sdext/source

[Daniel Lohmann (via logerrit)]

 sdext/source/presenter/PresenterScreen.cxx |    6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

New commits:
commit 9db4f60bfc5aa90a9062e429a07889b60ae99e9c
Author:     Daniel Lohmann <libreofficecontribut...@dldld.de>
AuthorDate: Sun Nov 27 19:54:15 2022 +0100
Commit:     Samuel Mehrbrodt <samuel.mehrbr...@allotropia.de>
CommitDate: Thu Dec 1 10:53:32 2022 +0100

    tdf#92717 Presenter screen on one monitor
    
    If the presenter screen should be shown as normal window (not a
    full screen window) the presenter screen can also be shown on one
    monitor, as then the presenter screen can be minimized.
    
    This is a follow up to a15bcda0e21be04bec424172192f2416b7f52422
    
    Change-Id: I6fd19aa120a0b0e894b156b4bd10059741f91dc5
    Reviewed-on: https://gerrit.libreoffice.org/c/core/+/143355
    Reviewed-by: Samuel Mehrbrodt <samuel.mehrbr...@allotropia.de>
    Tested-by: Samuel Mehrbrodt <samuel.mehrbr...@allotropia.de>

diff --git a/sdext/source/presenter/PresenterScreen.cxx 
b/sdext/source/presenter/PresenterScreen.cxx
index c4f2cda50f3e..cf24a26f7bf1 100644
--- a/sdext/source/presenter/PresenterScreen.cxx
+++ b/sdext/source/presenter/PresenterScreen.cxx
@@ -465,17 +465,19 @@ sal_Int32 PresenterScreen::GetPresenterScreenNumber (
             // There is either only one screen or the full screen
             // presentation spans all available screens.  The presenter
             // screen is shown only when a special flag in the configuration
-            // is set.
+            // is set or when the presenter screen will be shown as
+            // non-full screen window
             Reference<XComponentContext> xContext (mxContextWeak);
             PresenterConfigurationAccess aConfiguration (
                 xContext,
                 "/org.openoffice.Office.PresenterScreen/",
                 PresenterConfigurationAccess::READ_ONLY);
             bool bStartAlways (false);
+            bool bPresenterScreenFullScreen = 
isPresenterScreenFullScreen(xContext);
             if (aConfiguration.GetConfigurationNode(
                 "Presenter/StartAlways") >>= bStartAlways)
             {
-                if (bStartAlways)
+                if (bStartAlways || !bPresenterScreenFullScreen)
                     return GetPresenterScreenFromScreen(nScreenNumber);
             }
             return -1;