diff options
| author | Kurt Zenker <kz@openoffice.org> | 2011-04-13 18:08:13 +0200 |
|---|---|---|
| committer | Kurt Zenker <kz@openoffice.org> | 2011-04-13 18:08:13 +0200 |
| commit | c0e3769686c05658cd044094cbd494f1da43baca (patch) | |
| tree | 482d9b267af361491decafbf078dbf63ef75700a | |
| parent | d36b7a5f861f5eac28a854a8e75c8299203859ce (diff) | |
| parent | 144c7a2e1d711e13422a5c84b34ac33b1d940034 (diff) | |
CWS-TOOLING: integrate CWS impress211_OOO340
| -rwxr-xr-x[-rw-r--r--] | sdext/source/presenter/PresenterScreen.cxx | 7 | ||||
| -rw-r--r-- | sdext/source/presenter/description.xml | 2 |
2 files changed, 8 insertions, 1 deletions
diff --git a/sdext/source/presenter/PresenterScreen.cxx b/sdext/source/presenter/PresenterScreen.cxx index 22a1b2fe623f..d47f0aea4077 100644..100755 --- a/sdext/source/presenter/PresenterScreen.cxx +++ b/sdext/source/presenter/PresenterScreen.cxx @@ -496,6 +496,13 @@ sal_Int32 PresenterScreen::GetScreenNumber ( 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<XComponentContext> xContext (mxContextWeak); if ( ! xContext.is()) diff --git a/sdext/source/presenter/description.xml b/sdext/source/presenter/description.xml index 19fefec6de8a..fbe039e610be 100644 --- a/sdext/source/presenter/description.xml +++ b/sdext/source/presenter/description.xml @@ -17,7 +17,7 @@ </simple-license> </registration> - <version value="1.1.0" /> + <version value="1.1.1" /> <platform value="UPDATED_PLATFORM" /> |