sd/source/ui/view/sdwindow.cxx | 9 ++++++++-
1 file changed, 8 insertions(+), 1 deletion(-)
New commits:
commit 351aa7246deee977e90c0f0756df96e3b965effe
Author: Miklos Vajna <vmik...@collabora.co.uk>
Date: Mon Jun 13 15:37:42 2016 +0200
sd: implement per-view LOK_CALLBACK_INVALIDATE_TILES
With this, gtktiledviewer no longer crashes on load when opening a
sample ODP file.
Change-Id: I19857d6dcfab74c9fa282754e450c951f7ca564c
Reviewed-on: https://gerrit.libreoffice.org/26223
Reviewed-by: Miklos Vajna <vmik...@collabora.co.uk>
Tested-by: Jenkins <c...@libreoffice.org>
diff --git a/sd/source/ui/view/sdwindow.cxx b/sd/source/ui/view/sdwindow.cxx
index 2a40cf3..ab9917e 100644
--- a/sd/source/ui/view/sdwindow.cxx
+++ b/sd/source/ui/view/sdwindow.cxx
@@ -37,6 +37,7 @@
#include "drawdoc.hxx"
#include "AccessibleDrawDocumentView.hxx"
#include "WindowUpdater.hxx"
+#include "ViewShellBase.hxx"
#include <vcl/svapp.hxx>
#include <vcl/settings.hxx>
@@ -1016,7 +1017,13 @@ void Window::LogicInvalidate(const Rectangle* pRectangle)
aRectangle = OutputDevice::LogicToLogic(aRectangle, MAP_100TH_MM,
MAP_TWIP);
sRectangle = aRectangle.toString();
}
-
mpViewShell->GetDoc()->libreOfficeKitCallback(LOK_CALLBACK_INVALIDATE_TILES,
sRectangle.getStr());
+ if (comphelper::LibreOfficeKit::isViewCallback())
+ {
+ SfxViewShell& rSfxViewShell = mpViewShell->GetViewShellBase();
+
rSfxViewShell.libreOfficeKitViewCallback(LOK_CALLBACK_INVALIDATE_TILES,
sRectangle.getStr());
+ }
+ else
+
mpViewShell->GetDoc()->libreOfficeKitCallback(LOK_CALLBACK_INVALIDATE_TILES,
sRectangle.getStr());
}
} // end of namespace sd
_______________________________________________
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
