Fix misc. bugs in presenter view switch screen feature: make it work.

1 files changed, 16 insertions, 0 deletions

diff --git a/sdext/source/presenter/PresenterController.cxx b/sdext/source/presenter/PresenterController.cxx
index 89c767d64f8f..d6a50f596f89 100644
--- a/sdext/source/presenter/PresenterController.cxx
+++ b/sdext/source/presenter/PresenterController.cxx
@@ -35,6 +35,7 @@
 #include "PresenterCurrentSlideObserver.hxx"
 #include "PresenterFrameworkObserver.hxx"
 #include "PresenterHelper.hxx"
+#include "PresenterScreen.hxx"
 #include "PresenterNotesView.hxx"
 #include "PresenterPaintManager.hxx"
 #include "PresenterPaneAnimator.hxx"
@@ -102,12 +103,14 @@ PresenterController::InstanceContainer PresenterController::maInstances;
 
 
 PresenterController::PresenterController (
+    const css::uno::WeakReference<css::lang::XEventListener> &rxScreen,
     const Reference<XComponentContext>& rxContext,
     const Reference<frame::XController>& rxController,
     const Reference<presentation::XSlideShowController>& rxSlideShowController,
     const rtl::Reference<PresenterPaneContainer>& rpPaneContainer,
     const Reference<XResourceId>& rxMainPaneId)
     : PresenterControllerInterfaceBase(m_aMutex),
+      mxScreen(rxScreen),
       mxComponentContext(rxContext),
       mxController(rxController),
       mxConfigurationController(),
@@ -1346,6 +1349,19 @@ void PresenterController::ThrowIfDisposed (void) const
     }
 }
 
+void PresenterController::SwitchMonitors (void)
+{
+    Reference<lang::XEventListener> xScreen( mxScreen );
+    if (!xScreen.is())
+        return;
+
+    PresenterScreen *pScreen = dynamic_cast<PresenterScreen *>(xScreen.get());
+    if (!pScreen)
+        return;
+
+    pScreen->SwitchMonitors();
+}
+
 
 } } // end of namespace ::sdext::presenter