[Libreoffice-commits] core.git: Branch 'distro/collabora/cp-5.3' - vcl/source

[Pranav Kant]

 vcl/source/window/winproc.cxx |    4 ++++
 1 file changed, 4 insertions(+)

New commits:
commit d7cec9dc92f129558db97735d71ebabf32f92378
Author: Pranav Kant <pranavk at collabora.co.uk>
Date:   Fri Jan 26 22:25:43 2018 +0530

    lokdialog: Don't leak tooltip text window through tunnelling f/w
    
    Change-Id: I0491c86fdb1511ee4841aa670428c78aba24b8d0
    (cherry picked from commit 3dcf50fb383ebd8c38b1b931e41e3985adcc9bed)
    Reviewed-on: https://gerrit.libreoffice.org/48714
    Reviewed-by: Jan Holesovsky <kendy at collabora.com>
    Tested-by: Jan Holesovsky <kendy at collabora.com>

diff --git a/vcl/source/window/winproc.cxx b/vcl/source/window/winproc.cxx
index 47bcab8697c9..f184555a75f9 100644
--- a/vcl/source/window/winproc.cxx
+++ b/vcl/source/window/winproc.cxx
@@ -22,6 +22,7 @@
 
 #include <unotools/localedatawrapper.hxx>
 
+#include <comphelper/lok.hxx>
 #include <vcl/i18nhelp.hxx>
 #include <vcl/unohelp.hxx>
 #include <vcl/timer.hxx>
@@ -158,6 +159,9 @@ static bool ImplHandleMouseFloatMode( vcl::Window* pChild, const Point& rMousePo
 
 static void ImplHandleMouseHelpRequest( vcl::Window* pChild, const Point& rMousePos )
 {
+    if (comphelper::LibreOfficeKit::isActive())
+        return;
+
     ImplSVData* pSVData = ImplGetSVData();
     if ( !pSVData->maHelpData.mpHelpWin ||
          !( pSVData->maHelpData.mpHelpWin->IsWindowOrChild( pChild ) ||