[Libreoffice-commits] core.git: 2 commits - vcl/source

[Pranav Kant]

 vcl/source/window/paint.cxx   |    1 +
 vcl/source/window/winproc.cxx |    4 ++++
 2 files changed, 5 insertions(+)

New commits:
commit 3dcf50fb383ebd8c38b1b931e41e3985adcc9bed
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

diff --git a/vcl/source/window/winproc.cxx b/vcl/source/window/winproc.cxx
index 66233e765941..efe671705472 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>
@@ -157,6 +158,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 ) ||
commit a39cefd99c40f121b60c882dba6000894b6996d9
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

diff --git a/vcl/source/window/paint.cxx b/vcl/source/window/paint.cxx
index 5179f5648f0f..17e6db733711 100644
--- a/vcl/source/window/paint.cxx
+++ b/vcl/source/window/paint.cxx
@@ -1299,6 +1299,7 @@ void Window::Update()
          }
 
         pUpdateWindow->ImplCallPaint(nullptr, pUpdateWindow->mpWindowImpl->mnPaintFlags);
+        pUpdateWindow->LogicInvalidate(nullptr);
 
         if (xWindow->IsDisposed())
            return;