diff options
| author | Miklos Vajna <vmiklos@collabora.co.uk> | 2016-06-09 15:19:14 +0200 |
|---|---|---|
| committer | Miklos Vajna <vmiklos@collabora.co.uk> | 2016-06-09 14:27:35 +0000 |
| commit | 5fd43512c37ed5c3937b94d0a8d53d7e9c2ac0d1 (patch) | |
| tree | 9bd3e96270a5ab1036bfd20bca3f2a224a5cd88d /svx | |
| parent | c488214817516c13603deb1c180fef02f4c700bf (diff) | |
svx lok: assert that per-view callbacks don't invoke the model callback
They should invoke SfxViewShell::libreOfficeKitViewCallback() instead.
Change-Id: Ie7150e9decb40de917a5257aa4090595bdc5e387
Reviewed-on: https://gerrit.libreoffice.org/26108
Reviewed-by: Miklos Vajna <vmiklos@collabora.co.uk>
Tested-by: Jenkins <ci@libreoffice.org>
Diffstat (limited to 'svx')
| -rw-r--r-- | svx/source/svdraw/svdmodel.cxx | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/svx/source/svdraw/svdmodel.cxx b/svx/source/svdraw/svdmodel.cxx index acef3ac0a307..1483a0f87f7e 100644 --- a/svx/source/svdraw/svdmodel.cxx +++ b/svx/source/svdraw/svdmodel.cxx @@ -91,6 +91,7 @@ #include <memory> #include <libxml/xmlwriter.h> #include <LibreOfficeKit/LibreOfficeKitEnums.h> +#include <comphelper/lok.hxx> using namespace ::com::sun::star; using namespace ::com::sun::star::uno; @@ -814,6 +815,9 @@ void SdrModel::registerLibreOfficeKitCallback(LibreOfficeKitCallback pCallback, void SdrModel::libreOfficeKitCallback(int nType, const char* pPayload) const { + // Per-view callbacks should always invoke SfxViewShell::libreOfficeKitViewCallback(). + assert(!comphelper::LibreOfficeKit::isViewCallback()); + if (mbTiledSearching) { switch (nType) |