diff options
| author | Miklos Vajna <vmiklos@collabora.co.uk> | 2016-09-29 12:49:23 +0200 |
|---|---|---|
| committer | Miklos Vajna <vmiklos@collabora.co.uk> | 2016-09-29 13:01:40 +0200 |
| commit | dadbb11c16197ad80b96e11af5ddcb3c5e888f66 (patch) | |
| tree | dce58535fc4658730ca72f977569c934b2533da4 /sd | |
| parent | eba87071c5004744603e5b423e956e56be61604c (diff) | |
LOK: conditionally include part number in invalidation payload
Since desktop/ code queues, compresses and only emits callbacks on idle,
it's possible that two invalidations are in the queue, and there was a
setPart() call between them. In this case it's impossible to tell what
part the invalidation was sent for.
Fix this by conditionally including the part number in the invalidation
payload. It's off by default, a new feature flag is added to request
this behavior.
gtktiledviewer enables this feature flag by default, though just to show
the part number in the debug output. Android doesn't enable it.
(cherry picked from commit d5263c2c564c88e3dafe4c1ab8d3d9c1c48ede73)
Conflicts:
desktop/qa/desktop_lib/test_desktop_lib.cxx
Change-Id: I73e6def848c0eb61d64e71026002c7a0e750aab4
Diffstat (limited to 'sd')
| -rw-r--r-- | sd/source/ui/view/sdwindow.cxx | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/sd/source/ui/view/sdwindow.cxx b/sd/source/ui/view/sdwindow.cxx index 2c9150992c8e..b70ae1013045 100644 --- a/sd/source/ui/view/sdwindow.cxx +++ b/sd/source/ui/view/sdwindow.cxx @@ -43,6 +43,7 @@ #include <vcl/settings.hxx> #include <LibreOfficeKit/LibreOfficeKitEnums.h> #include <comphelper/lok.hxx> +#include <sfx2/lokhelper.hxx> namespace sd { @@ -1021,7 +1022,7 @@ void Window::LogicInvalidate(const Rectangle* pRectangle) sRectangle = aRectangle.toString(); } SfxViewShell& rSfxViewShell = mpViewShell->GetViewShellBase(); - rSfxViewShell.libreOfficeKitViewCallback(LOK_CALLBACK_INVALIDATE_TILES, sRectangle.getStr()); + SfxLokHelper::notifyInvalidation(&rSfxViewShell, sRectangle); } } // end of namespace sd |