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

[Jan Holesovsky]

 sdext/source/presenter/PresenterWindowManager.cxx |    7 ++++++-
 1 file changed, 6 insertions(+), 1 deletion(-)

New commits:
commit 6aa46396f6cb3de4e34a7684c59162bb6a3f37fe
Author: Jan Holesovsky <kendy at collabora.com>
Date:   Mon Jun 6 09:26:55 2016 +0200

    Reintroduce some code removed with "Remove unneeded Pane code in ..."
    
    This code was removed in 71cf1aefca1ecf10272308d7c75201bd39d3b0f6, but it was
    guarded by an "ifndef", not by an "ifdef", so it should still stay (unless I'm
    missing something).
    
    Change-Id: Ib344e73d39d1fcd3b84784977769708726d8ed1e

diff --git a/sdext/source/presenter/PresenterWindowManager.cxx b/sdext/source/presenter/PresenterWindowManager.cxx
index 02e409a..557b4f9 100644
--- a/sdext/source/presenter/PresenterWindowManager.cxx
+++ b/sdext/source/presenter/PresenterWindowManager.cxx
@@ -108,6 +108,7 @@ void SAL_CALL PresenterWindowManager::disposing()
         {
             (*iPane)->mxBorderWindow->removeWindowListener(this);
             (*iPane)->mxBorderWindow->removeFocusListener(this);
+            (*iPane)->mxBorderWindow->removeMouseListener(this);
         }
     }
 }
@@ -306,7 +307,11 @@ void SAL_CALL PresenterWindowManager::mousePressed (const css::awt::MouseEvent&
 void SAL_CALL PresenterWindowManager::mouseReleased (const css::awt::MouseEvent& rEvent)
     throw(css::uno::RuntimeException, std::exception)
 {
-    (void)rEvent;
+    if (mbIsMouseClickPending)
+    {
+        mbIsMouseClickPending = false;
+        mpPresenterController->HandleMouseClick(rEvent);
+    }
 }
 
 void SAL_CALL PresenterWindowManager::mouseEntered (const css::awt::MouseEvent& rEvent)