summaryrefslogtreecommitdiff
path: root/sdext
diff options
context:
space:
mode:
authorAndre Fische <andre.f.fischer Andre Fischerandre.f.fischer@oracle.com>2011-03-11 15:22:17 +0100
committerMichael Meeks <michael.meeks@suse.com>2012-06-28 19:59:05 +0100
commit2bc802ca844cdadf5a6897146f58dc523a878b8c (patch)
tree6d2dc11a556f147cd0963e074c1b47b9cde71d4d /sdext
parent4a29e35a9a88139b7ab8d030ed7a3964791443a1 (diff)
impress211: #i110990# Fixed remaining problems with display ids and indices.
Diffstat (limited to 'sdext')
-rwxr-xr-x[-rw-r--r--]sdext/source/presenter/PresenterScreen.cxx7
1 files changed, 7 insertions, 0 deletions
diff --git a/sdext/source/presenter/PresenterScreen.cxx b/sdext/source/presenter/PresenterScreen.cxx
index f89af706d239..44bb0230646c 100644..100755
--- 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)