diff options
| author | Miklos Vajna <vmiklos@collabora.co.uk> | 2016-08-02 11:43:39 +0200 |
|---|---|---|
| committer | Miklos Vajna <vmiklos@collabora.co.uk> | 2016-08-03 11:39:35 +0200 |
| commit | 3745f16b3139a45d93d694d22a3ca210480012fb (patch) | |
| tree | 06dab916b38bb1144a27f09d343789fbfee605ee /editeng/source/editeng/editview.cxx | |
| parent | 8eccd8f82572f5dfdeabca7010b13bf773aa6a97 (diff) | |
editeng: make SfxUndoAction::GetViewShellId() interface available
Extend the existing OutlinerViewCallable interface to be able to obtain
the view shell ID of a view shell, even from editeng.
Reviewed-on: https://gerrit.libreoffice.org/27788
Reviewed-by: Miklos Vajna <vmiklos@collabora.co.uk>
Tested-by: Jenkins <ci@libreoffice.org>
(cherry picked from commit 0762a119fc0a17b80dab1e49fb832a2214f85fdc)
Change-Id: I13708b0e4f58ee86643b913c7d21de022a685223
Diffstat (limited to 'editeng/source/editeng/editview.cxx')
| -rw-r--r-- | editeng/source/editeng/editview.cxx | 13 |
1 files changed, 7 insertions, 6 deletions
diff --git a/editeng/source/editeng/editview.cxx b/editeng/source/editeng/editview.cxx index 7ace1b879fbc..8dea0b8bb5b5 100644 --- a/editeng/source/editeng/editview.cxx +++ b/editeng/source/editeng/editview.cxx @@ -54,6 +54,7 @@ #include <editeng/acorrcfg.hxx> #include <editeng/unolingu.hxx> #include <editeng/fontitem.hxx> +#include <editeng/outliner.hxx> #include <unotools/lingucfg.hxx> #include <osl/file.hxx> @@ -401,9 +402,9 @@ void EditView::ShowCursor( bool bGotoCursor, bool bForceVisCursor, bool bActivat bGotoCursor = false; pImpEditView->ShowCursor( bGotoCursor, bForceVisCursor ); - if (comphelper::LibreOfficeKit::isActive() && !bActivate) + if (pImpEditView->mpViewShell && !bActivate) { - pImpEditView->libreOfficeKitViewCallback(LOK_CALLBACK_CURSOR_VISIBLE, OString::boolean(true).getStr()); + pImpEditView->mpViewShell->libreOfficeKitViewCallback(LOK_CALLBACK_CURSOR_VISIBLE, OString::boolean(true).getStr()); } } } @@ -412,9 +413,9 @@ void EditView::HideCursor(bool bDeactivate) { pImpEditView->GetCursor()->Hide(); - if (comphelper::LibreOfficeKit::isActive() && !bDeactivate) + if (pImpEditView->mpViewShell && !bDeactivate) { - pImpEditView->libreOfficeKitViewCallback(LOK_CALLBACK_CURSOR_VISIBLE, OString::boolean(false).getStr()); + pImpEditView->mpViewShell->libreOfficeKitViewCallback(LOK_CALLBACK_CURSOR_VISIBLE, OString::boolean(false).getStr()); } } @@ -588,9 +589,9 @@ Color EditView::GetBackgroundColor() const return pImpEditView->GetBackgroundColor(); } -void EditView::registerLibreOfficeKitViewCallback(OutlinerViewCallable *pCallable) +void EditView::RegisterViewShell(OutlinerViewShell* pViewShell) { - pImpEditView->registerLibreOfficeKitViewCallback(pCallable); + pImpEditView->RegisterViewShell(pViewShell); } void EditView::SetControlWord( EVControlBits nWord ) |