[Libreoffice-commits] core.git: svx/source

[Miklos Vajna]

 svx/source/svdraw/svdmrkv.cxx |    8 +++++++-
 1 file changed, 7 insertions(+), 1 deletion(-)

New commits:
commit 901026cfbbf12f778e039a7b523bf30e8019e8ed
Author: Miklos Vajna <vmiklos at collabora.co.uk>
Date:   Thu Jun 9 19:28:12 2016 +0200

    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 at collabora.co.uk>
    Tested-by: Jenkins <ci at libreoffice.org>

diff --git a/svx/source/svdraw/svdmrkv.cxx b/svx/source/svdraw/svdmrkv.cxx
index 4f5d0bb..1323abd 100644
--- a/svx/source/svdraw/svdmrkv.cxx
+++ b/svx/source/svdraw/svdmrkv.cxx
@@ -230,7 +230,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());
     }
 }