diff options
| author | Jan Holesovsky <kendy@collabora.com> | 2017-11-27 15:03:19 +0100 |
|---|---|---|
| committer | Jan Holesovsky <kendy@collabora.com> | 2017-11-29 10:16:58 +0100 |
| commit | b4487b0fd22ce1fc595851f63a3f7bba36681f2c (patch) | |
| tree | 8f988ad2cd4ee030255f765f805904ebb2c43c23 /vcl | |
| parent | e2ae221f6164ba240da7d6470fd52c1982fa07d2 (diff) | |
lokdialog: Move the LogicInvalidate from Dialog down to Window.
Another step towards the autofilter popup working...
Change-Id: I4907a23fcd0fc64da0c7f51e2f36b1657a17638c
Diffstat (limited to 'vcl')
| -rw-r--r-- | vcl/source/window/dialog.cxx | 15 | ||||
| -rw-r--r-- | vcl/source/window/paint.cxx | 16 |
2 files changed, 16 insertions, 15 deletions
diff --git a/vcl/source/window/dialog.cxx b/vcl/source/window/dialog.cxx index 702575f53d65..2881754ff13e 100644 --- a/vcl/source/window/dialog.cxx +++ b/vcl/source/window/dialog.cxx @@ -895,21 +895,6 @@ void Dialog::CloseFloatingWindow() pNotifier->notifyWindowChild(GetLOKWindowId(), "close", Point(0, 0)); } -void Dialog::LogicInvalidate(const tools::Rectangle* pRectangle) -{ - if (comphelper::LibreOfficeKit::isDialogPainting()) - return; - - if (const vcl::ILibreOfficeKitNotifier* pNotifier = GetLOKNotifier()) - { - std::vector<vcl::LOKPayloadItem> aPayload; - if (pRectangle) - aPayload.push_back(std::make_pair(OString("rectangle"), pRectangle->toString())); - - pNotifier->notifyWindow(GetLOKWindowId(), "invalidate", aPayload); - } -} - void Dialog::ensureRepaint() { // ensure repaint diff --git a/vcl/source/window/paint.cxx b/vcl/source/window/paint.cxx index a77e09db9f13..3aa954b90536 100644 --- a/vcl/source/window/paint.cxx +++ b/vcl/source/window/paint.cxx @@ -1189,6 +1189,22 @@ void Window::Invalidate( const vcl::Region& rRegion, InvalidateFlags nFlags ) } } +void Window::LogicInvalidate(const tools::Rectangle* pRectangle) +{ + if (comphelper::LibreOfficeKit::isDialogPainting()) + return; + + if (const vcl::ILibreOfficeKitNotifier* pNotifier = GetLOKNotifier()) + { + // In case we are routing the window, notify the client + std::vector<vcl::LOKPayloadItem> aPayload; + if (pRectangle) + aPayload.push_back(std::make_pair(OString("rectangle"), pRectangle->toString())); + + pNotifier->notifyWindow(GetLOKWindowId(), "invalidate", aPayload); + } +} + void Window::Validate() { if ( !comphelper::LibreOfficeKit::isActive() && (!IsDeviceOutputNecessary() || !mnOutWidth || !mnOutHeight) ) |