diff options
author | Miklos Vajna <vmiklos@collabora.co.uk> | 2016-06-09 19:28:12 +0200 |
---|---|---|
committer | Ashod Nakashian <ashod.nakashian@collabora.co.uk> | 2016-07-12 22:06:18 -0400 |
commit | 9308bcce632efaa50bd0a12aaf26ef72492e9275 (patch) | |
tree | 8e75df2be50fbdc4565b41ecd94ed9b995d57c04 /svx | |
parent | 10ef69d693c5b5e0669fe69c438147340fd7afc3 (diff) |
svx: implement per-view LOK_CALLBACK_INVALIDATE_TILES
This is the last callback that was unconditionally invoked on the model
on load, before the SfxBindings timer starts.
Change-Id: Id494963459ac2bee4d0f9e642af88e04e94353c3
Reviewed-on: https://gerrit.libreoffice.org/26129
Reviewed-by: Miklos Vajna <vmiklos@collabora.co.uk>
Tested-by: Jenkins <ci@libreoffice.org>
(cherry picked from commit 901026cfbbf12f778e039a7b523bf30e8019e8ed)
Diffstat (limited to 'svx')
-rw-r--r-- | svx/source/svdraw/svdmrkv.cxx | 8 |
1 files changed, 7 insertions, 1 deletions
diff --git a/svx/source/svdraw/svdmrkv.cxx b/svx/source/svdraw/svdmrkv.cxx index fe18b10c1e6e..8394b3bd39a6 100644 --- a/svx/source/svdraw/svdmrkv.cxx +++ b/svx/source/svdraw/svdmrkv.cxx @@ -232,7 +232,13 @@ void SdrMarkView::ModelHasChanged() sSelection = aSelection.toString(); } - GetModel()->libreOfficeKitCallback(LOK_CALLBACK_INVALIDATE_TILES, sSelection.getStr()); + if (comphelper::LibreOfficeKit::isViewCallback()) + { + if(SfxViewShell* pViewShell = SfxViewShell::Current()) + pViewShell->libreOfficeKitViewCallback(LOK_CALLBACK_INVALIDATE_TILES, sSelection.getStr()); + } + else + GetModel()->libreOfficeKitCallback(LOK_CALLBACK_INVALIDATE_TILES, sSelection.getStr()); } } |