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

[Tamás Zolnai]

 vcl/source/window/floatwin.cxx |    5 ++++-
 vcl/source/window/paint.cxx    |    5 +++++
 2 files changed, 9 insertions(+), 1 deletion(-)

New commits:
commit 6aa2a9a29d52330f453306d9f2e6d1398175cd81
Author: Tamás Zolnai <tamas.zolnai at collabora.com>
Date:   Wed May 16 17:36:36 2018 +0200

    lok: Always specify the invalidate rectangle explicitely
    
    It will be needed for a later change in online code.
    
    Change-Id: Ic8f898b78ccaaaec849a1894b5e70fb730d70d6d
    Reviewed-on: https://gerrit.libreoffice.org/54443
    Tested-by: Jenkins <ci at libreoffice.org>
    Reviewed-by: Tamás Zolnai <tamas.zolnai at collabora.com>
    (cherry picked from commit cee3840c01292dc3ef98d996d00f57f43eb35e9e)
    Reviewed-on: https://gerrit.libreoffice.org/54535
    Reviewed-by: Andras Timar <andras.timar at collabora.com>
    Tested-by: Andras Timar <andras.timar at collabora.com>

diff --git a/vcl/source/window/floatwin.cxx b/vcl/source/window/floatwin.cxx
index 61c61fe5a4f7..a7b1ca76f47e 100644
--- a/vcl/source/window/floatwin.cxx
+++ b/vcl/source/window/floatwin.cxx
@@ -616,8 +616,11 @@ void FloatingWindow::LogicInvalidate(const tools::Rectangle* /*pRectangle*/)
 {
     if (VclPtr<vcl::Window> pParent = GetParentWithLOKNotifier())
     {
+        std::vector<vcl::LOKPayloadItem> aPayload;
+        const tools::Rectangle aRect(Point(0,0), Size(GetSizePixel().Width()+1, GetSizePixel().Height()+1));
+        aPayload.push_back(std::make_pair(OString("rectangle"), aRect.toString()));
         const vcl::ILibreOfficeKitNotifier* pNotifier = pParent->GetLOKNotifier();
-        pNotifier->notifyWindow(GetLOKWindowId(), "invalidate");
+        pNotifier->notifyWindow(GetLOKWindowId(), "invalidate", aPayload);
     }
 }
 
diff --git a/vcl/source/window/paint.cxx b/vcl/source/window/paint.cxx
index dd3323fa2b60..8d10d77513e4 100644
--- a/vcl/source/window/paint.cxx
+++ b/vcl/source/window/paint.cxx
@@ -1218,6 +1218,11 @@ void Window::LogicInvalidate(const tools::Rectangle* pRectangle)
         std::vector<vcl::LOKPayloadItem> aPayload;
         if (pRectangle)
             aPayload.push_back(std::make_pair(OString("rectangle"), pRectangle->toString()));
+        else
+        {
+            const tools::Rectangle aRect(Point(0, 0), GetSizePixel());
+            aPayload.push_back(std::make_pair(OString("rectangle"), aRect.toString()));
+        }
 
         pNotifier->notifyWindow(GetLOKWindowId(), "invalidate", aPayload);
     }