From 2bc802ca844cdadf5a6897146f58dc523a878b8c Mon Sep 17 00:00:00 2001
From: Andre Fische <andre.f.fischer Andre Fischerandre.f.fischer@oracle.com>
Date: Fri, 11 Mar 2011 15:22:17 +0100
Subject: impress211: #i110990# Fixed remaining problems with display ids and
 indices.

---
 sdext/source/presenter/PresenterScreen.cxx | 7 +++++++
 1 file changed, 7 insertions(+)
 mode change 100644 => 100755 sdext/source/presenter/PresenterScreen.cxx

(limited to 'sdext/source')

diff --git a/sdext/source/presenter/PresenterScreen.cxx b/sdext/source/presenter/PresenterScreen.cxx
old mode 100644
new mode 100755
index f89af706d239..44bb0230646c
--- a/sdext/source/presenter/PresenterScreen.cxx
+++ b/sdext/source/presenter/PresenterScreen.cxx
@@ -476,6 +476,13 @@ sal_Int32 PresenterScreen::GetPresenterScreenNumber (
         sal_Int32 nDisplayNumber (-1);
         if ( ! (xProperties->getPropertyValue(A2S("Display")) >>= nDisplayNumber))
             return -1;
+        if (nDisplayNumber == -1)
+        {
+            // The special value -1 indicates that the slide show
+            // spans all available displays.  That leaves no room for
+            // the presenter screen.
+            return -1;
+        }
 
         Reference<beans::XPropertySet> xDisplayProperties = GetDisplayAccess();
         if (nDisplayNumber > 0)
-- 
cgit