diff options
author | Miklos Vajna <vmiklos@collabora.co.uk> | 2016-01-14 14:20:40 +0100 |
---|---|---|
committer | Miklos Vajna <vmiklos@collabora.co.uk> | 2016-01-14 14:45:09 +0100 |
commit | 7b5d20983dfbfb458898eeab54828ba5fef5841f (patch) | |
tree | b067a0fbdb143073e17a44e20cc0384193be550c /editeng | |
parent | b9565ef0a73c235cd1e14fce9031db6e9237c524 (diff) |
editeng: handle SdrModel::isTiledSearching()
Given that the edit/outliner views can come and go, avoid the lifecycle
problems with just passing a pointer to the sdr model to editeng, and
then it'll always have the up to date "are we searching" information.
editeng can't depend on svx, so provide an interface class SdrModel can
implement.
Change-Id: I3b98011593b00ac0fab05b6b9c591dd20d94c579
Diffstat (limited to 'editeng')
-rw-r--r-- | editeng/source/editeng/editview.cxx | 4 | ||||
-rw-r--r-- | editeng/source/editeng/impedit.cxx | 17 | ||||
-rw-r--r-- | editeng/source/editeng/impedit.hxx | 4 | ||||
-rw-r--r-- | editeng/source/outliner/outlvw.cxx | 8 |
4 files changed, 26 insertions, 7 deletions
diff --git a/editeng/source/editeng/editview.cxx b/editeng/source/editeng/editview.cxx index d9d31483df5f..f936d4e7a0b1 100644 --- a/editeng/source/editeng/editview.cxx +++ b/editeng/source/editeng/editview.cxx @@ -588,9 +588,9 @@ void EditView::setTiledRendering(bool bTiledRendering) pImpEditView->setTiledRendering(bTiledRendering); } -void EditView::registerLibreOfficeKitCallback(LibreOfficeKitCallback pCallback, void* pLibreOfficeKitData) +void EditView::registerLibreOfficeKitCallback(LibreOfficeKitCallback pCallback, void* pLibreOfficeKitData, OutlinerSearchable *pSearchable) { - pImpEditView->registerLibreOfficeKitCallback(pCallback, pLibreOfficeKitData); + pImpEditView->registerLibreOfficeKitCallback(pCallback, pLibreOfficeKitData, pSearchable); } void EditView::SetControlWord( EVControlBits nWord ) diff --git a/editeng/source/editeng/impedit.cxx b/editeng/source/editeng/impedit.cxx index f14d57c2ecf1..0fc72ff5372c 100644 --- a/editeng/source/editeng/impedit.cxx +++ b/editeng/source/editeng/impedit.cxx @@ -26,6 +26,7 @@ #include <impedit.hxx> #include <editeng/editeng.hxx> #include <editeng/editview.hxx> +#include <editeng/outliner.hxx> #include <tools/poly.hxx> #include <editeng/unolingu.hxx> #include <com/sun/star/linguistic2/XDictionaryEntry.hpp> @@ -81,6 +82,7 @@ ImpEditView::ImpEditView( EditView* pView, EditEngine* pEng, vcl::Window* pWindo mbTiledRendering = false; mpLibreOfficeKitCallback = nullptr; mpLibreOfficeKitData = nullptr; + mpLibreOfficeKitSearchable = nullptr; nScrollDiffX = 0; nExtraCursorFlags = 0; nCursorBidiLevel = CURSOR_BIDILEVEL_DONTKNOW; @@ -123,14 +125,27 @@ void ImpEditView::setTiledRendering(bool bTiledRendering) mbTiledRendering = bTiledRendering; } -void ImpEditView::registerLibreOfficeKitCallback(LibreOfficeKitCallback pCallback, void* pData) +void ImpEditView::registerLibreOfficeKitCallback(LibreOfficeKitCallback pCallback, void* pData, OutlinerSearchable* pSearchable) { mpLibreOfficeKitCallback = pCallback; mpLibreOfficeKitData = pData; + mpLibreOfficeKitSearchable = pSearchable; } void ImpEditView::libreOfficeKitCallback(int nType, const char* pPayload) const { + if (mpLibreOfficeKitSearchable && mpLibreOfficeKitSearchable->isTiledSearching()) + { + switch (nType) + { + case LOK_CALLBACK_TEXT_SELECTION: + case LOK_CALLBACK_TEXT_SELECTION_START: + case LOK_CALLBACK_TEXT_SELECTION_END: + case LOK_CALLBACK_GRAPHIC_SELECTION: + return; + } + } + if (mpLibreOfficeKitCallback) mpLibreOfficeKitCallback(nType, pPayload, mpLibreOfficeKitData); } diff --git a/editeng/source/editeng/impedit.hxx b/editeng/source/editeng/impedit.hxx index 84163cce9359..5f180cd83d09 100644 --- a/editeng/source/editeng/impedit.hxx +++ b/editeng/source/editeng/impedit.hxx @@ -79,6 +79,7 @@ class EditView; class EditEngine; +class OutlinerSearchable; class SvxSearchItem; class SvxLRSpaceItem; @@ -224,6 +225,7 @@ private: bool mbTiledRendering; LibreOfficeKitCallback mpLibreOfficeKitCallback; void* mpLibreOfficeKitData; + OutlinerSearchable* mpLibreOfficeKitSearchable; EditEngine* pEditEngine; VclPtr<vcl::Window> pOutWin; Pointer* pPointer; @@ -370,7 +372,7 @@ public: void setTiledRendering(bool bTiledRendering); /// @see vcl::ITiledRenderable::registerCallback(). - void registerLibreOfficeKitCallback(LibreOfficeKitCallback pCallback, void* pLibreOfficeKitData); + void registerLibreOfficeKitCallback(LibreOfficeKitCallback pCallback, void* pLibreOfficeKitData, OutlinerSearchable* pSearchable); /// Invokes the registered callback, if there are any. void libreOfficeKitCallback(int nType, const char* pPayload) const; diff --git a/editeng/source/outliner/outlvw.cxx b/editeng/source/outliner/outlvw.cxx index 9de935e268e1..d624eb6fa689 100644 --- a/editeng/source/outliner/outlvw.cxx +++ b/editeng/source/outliner/outlvw.cxx @@ -1436,9 +1436,9 @@ void OutlinerView::setTiledRendering(bool bTiledRendering) pEditView->setTiledRendering(bTiledRendering); } -void OutlinerView::registerLibreOfficeKitCallback(LibreOfficeKitCallback pCallback, void* pLibreOfficeKitData) +void OutlinerView::registerLibreOfficeKitCallback(LibreOfficeKitCallback pCallback, void* pLibreOfficeKitData, OutlinerSearchable* pSearchable) { - pEditView->registerLibreOfficeKitCallback(pCallback, pLibreOfficeKitData); + pEditView->registerLibreOfficeKitCallback(pCallback, pLibreOfficeKitData, pSearchable); } Color OutlinerView::GetBackgroundColor() @@ -1466,7 +1466,9 @@ Selection OutlinerView::GetSurroundingTextSelection() const return pEditView->GetSurroundingTextSelection(); } - +OutlinerSearchable::~OutlinerSearchable() +{ +} // ===== some code for thesaurus sub menu within context menu |