diff options
| author | Miklos Vajna <vmiklos@collabora.co.uk> | 2016-06-10 16:42:00 +0200 |
|---|---|---|
| committer | Ashod Nakashian <ashod.nakashian@collabora.co.uk> | 2016-07-12 22:06:35 -0400 |
| commit | 6bda991914d6e0d08db1ec7f8b1fe80701a8b583 (patch) | |
| tree | 8d530348ca4cae8a7169e069ef8697e6c02ad683 /svx/source | |
| parent | ebd3cb79940bb08fa3aa1578859e3d6a550fae7e (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>
(cherry picked from commit 89bbd0ecbf18a1e9030e49443fa15d068b19f767)
Diffstat (limited to 'svx/source')
| -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 8b57d00f97b5..c6f4848c9047 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())); |