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 /svx | |
| 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 'svx')
| -rw-r--r-- | svx/source/svdraw/svdedxv.cxx | 6 |
1 files changed, 5 insertions, 1 deletions
diff --git a/svx/source/svdraw/svdedxv.cxx b/svx/source/svdraw/svdedxv.cxx index 2c7bd27a0b8c..cb88a6c79a88 100644 --- a/svx/source/svdraw/svdedxv.cxx +++ b/svx/source/svdraw/svdedxv.cxx @@ -63,6 +63,7 @@ #include <svx/sdr/table/tablecontroller.hxx> #include <drawinglayer/processor2d/processor2dtools.hxx> #include <comphelper/lok.hxx> +#include <sfx2/viewsh.hxx> #include <memory> @@ -460,7 +461,10 @@ OutlinerView* SdrObjEditView::ImpMakeOutlinerView(vcl::Window* pWin, bool /*bNoP } pOutlView->SetControlWord(nStat); pOutlView->SetBackgroundColor( aBackground ); - pOutlView->registerLibreOfficeKitCallback(GetModel()); + if (comphelper::LibreOfficeKit::isViewCallback()) + pOutlView->registerLibreOfficeKitViewCallback(SfxViewShell::Current()); + else + pOutlView->registerLibreOfficeKitCallback(GetModel()); if (pText!=nullptr) { pOutlView->SetAnchorMode((EVAnchorMode)(pText->GetOutlinerViewAnchorMode())); |