[Libreoffice-commits] core.git: Branch 'refs/tags/cp-5.3-39' - 2 commits - vcl/source

[Pranav Kant]

Rebased ref, commits from common ancestor:
commit 150d6f4e7490b06ff7c1c9062f718a1afe446afd
Author: Pranav Kant <pranavk at collabora.co.uk>
Date:   Fri Jan 26 15:53:32 2018 +0530

    lokdialog: Call LOK invalidate explicitly here
    
    In some cases, Window::Update is called directly by the child classes.
    This is not good for LOK clients because they rely on 'invalidate'
    callbacks for painting the window.
    
    Change-Id: I05402d7597841c96a25b7f5ac4cc60dda6ec5a16
    (cherry-picked from a39cefd99c40f121b60c882dba6000894b6996d9)
    Reviewed-on: https://gerrit.libreoffice.org/48677
    Reviewed-by: Jan Holesovsky <kendy at collabora.com>
    Tested-by: Jan Holesovsky <kendy at collabora.com>

diff --git a/vcl/source/window/paint.cxx b/vcl/source/window/paint.cxx
index fcfbc4bf905c..a3fe6a6612b3 100644
--- a/vcl/source/window/paint.cxx
+++ b/vcl/source/window/paint.cxx
@@ -1324,6 +1324,7 @@ void Window::Update()
          }
 
         pUpdateWindow->ImplCallPaint(nullptr, pUpdateWindow->mpWindowImpl->mnPaintFlags);
+        pUpdateWindow->LogicInvalidate(nullptr);
 
         if (xWindow->IsDisposed())
            return;
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 ) ||