diff options
| author | Miklos Vajna <vmiklos@collabora.co.uk> | 2016-06-10 16:42:00 +0200 |
|---|---|---|
| committer | Miklos Vajna <vmiklos@collabora.co.uk> | 2016-06-10 15:15:06 +0000 |
| commit | 89bbd0ecbf18a1e9030e49443fa15d068b19f767 (patch) | |
| tree | 44cfc6a0e633f7cf2ca20c6e1c96f3a1f91107b0 /include/sfx2 | |
| parent | 30104ff4c76b7f31450f525b4a6d7ebad9823aad (diff) | |
editeng: implement per-view LOK_CALLBACK_INVALIDATE_VISIBLE_CURSOR
Given that the per-view callback is in SfxViewShell, and editeng doesn't
depend on sfx2, add an interface class in editeng to invert the
dependency.
With this, gtktiledviewer no longer crashes when starting editeng text
edit with per-view callbacks.
Change-Id: I783cdc646b890a6b597000f1d88428c8042417cf
Reviewed-on: https://gerrit.libreoffice.org/26169
Reviewed-by: Miklos Vajna <vmiklos@collabora.co.uk>
Tested-by: Jenkins <ci@libreoffice.org>
Diffstat (limited to 'include/sfx2')
| -rw-r--r-- | include/sfx2/viewsh.hxx | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/include/sfx2/viewsh.hxx b/include/sfx2/viewsh.hxx index 936df3814cdf..7ed08c11c11c 100644 --- a/include/sfx2/viewsh.hxx +++ b/include/sfx2/viewsh.hxx @@ -40,6 +40,7 @@ #include <vcl/vclptr.hxx> #include <sfx2/tabdlg.hxx> #include <LibreOfficeKit/LibreOfficeKitTypes.h> +#include <editeng/outliner.hxx> #include <functional> class SfxBaseController; @@ -140,7 +141,7 @@ template<class T> bool checkSfxViewShell(const SfxViewShell* pShell) return dynamic_cast<const T*>(pShell) != nullptr; } -class SFX2_DLLPUBLIC SfxViewShell: public SfxShell, public SfxListener +class SFX2_DLLPUBLIC SfxViewShell: public SfxShell, public SfxListener, public OutlinerViewCallable { #ifdef INCLUDED_SFX2_VIEWSH_HXX friend class SfxViewFrame; @@ -325,7 +326,7 @@ public: /// The actual per-view implementation of lok::Document::registerCallback(). void registerLibreOfficeKitViewCallback(LibreOfficeKitCallback pCallback, void* pLibreOfficeKitData); /// Invokes the registered callback, if there are any. - void libreOfficeKitViewCallback(int nType, const char* pPayload) const; + void libreOfficeKitViewCallback(int nType, const char* pPayload) const override; }; |