diff options
author | Miklos Vajna <vmiklos@collabora.co.uk> | 2016-06-22 08:01:04 +0200 |
---|---|---|
committer | Miklos Vajna <vmiklos@collabora.co.uk> | 2016-06-22 07:49:24 +0000 |
commit | 03e83de83bcc640cf359fe7997edcdadb5067b36 (patch) | |
tree | 1d9948adff36bfbeb3940b7d6a2f510c432f624a /editeng | |
parent | c65d731446bb62fdb1dd4321bf4c96bf1353c4d0 (diff) |
Remove no longer needed ImpEditView::mpLibreOfficeKitSearchable
All clients has been ported to use
ImpEditView::mpLibreOfficeKitViewCallable instead.
Change-Id: I3a2513ac5900f801a2e7aec79807f4e333dfba3d
Reviewed-on: https://gerrit.libreoffice.org/26561
Reviewed-by: Miklos Vajna <vmiklos@collabora.co.uk>
Tested-by: Jenkins <ci@libreoffice.org>
Diffstat (limited to 'editeng')
-rw-r--r-- | editeng/source/editeng/editview.cxx | 5 | ||||
-rw-r--r-- | editeng/source/editeng/impedit.cxx | 12 | ||||
-rw-r--r-- | editeng/source/editeng/impedit.hxx | 8 | ||||
-rw-r--r-- | editeng/source/outliner/outlvw.cxx | 9 |
4 files changed, 1 insertions, 33 deletions
diff --git a/editeng/source/editeng/editview.cxx b/editeng/source/editeng/editview.cxx index 20f8b482bcaf..84dba195f5f9 100644 --- a/editeng/source/editeng/editview.cxx +++ b/editeng/source/editeng/editview.cxx @@ -583,11 +583,6 @@ Color EditView::GetBackgroundColor() const return pImpEditView->GetBackgroundColor(); } -void EditView::registerLibreOfficeKitCallback(OutlinerSearchable *pSearchable) -{ - pImpEditView->registerLibreOfficeKitCallback(pSearchable); -} - void EditView::registerLibreOfficeKitViewCallback(OutlinerViewCallable *pCallable) { pImpEditView->registerLibreOfficeKitViewCallback(pCallable); diff --git a/editeng/source/editeng/impedit.cxx b/editeng/source/editeng/impedit.cxx index 0641e74b7466..61454ad73fb6 100644 --- a/editeng/source/editeng/impedit.cxx +++ b/editeng/source/editeng/impedit.cxx @@ -79,7 +79,6 @@ ImpEditView::ImpEditView( EditView* pView, EditEngine* pEng, vcl::Window* pWindo pOutWin = pWindow; pPointer = nullptr; pBackgroundColor = nullptr; - mpLibreOfficeKitSearchable = nullptr; mpLibreOfficeKitViewCallable = nullptr; nScrollDiffX = 0; nExtraCursorFlags = 0; @@ -118,17 +117,6 @@ void ImpEditView::SetBackgroundColor( const Color& rColor ) pBackgroundColor = new Color( rColor ); } -void ImpEditView::registerLibreOfficeKitCallback(OutlinerSearchable* pSearchable) -{ - mpLibreOfficeKitSearchable = pSearchable; -} - -void ImpEditView::libreOfficeKitCallback(int nType, const char* pPayload) const -{ - if (mpLibreOfficeKitSearchable) - mpLibreOfficeKitSearchable->libreOfficeKitCallback(nType, pPayload); -} - void ImpEditView::registerLibreOfficeKitViewCallback(OutlinerViewCallable* pCallable) { mpLibreOfficeKitViewCallable = pCallable; diff --git a/editeng/source/editeng/impedit.hxx b/editeng/source/editeng/impedit.hxx index 6c1c9f4e7d6d..66b03b8ec697 100644 --- a/editeng/source/editeng/impedit.hxx +++ b/editeng/source/editeng/impedit.hxx @@ -221,8 +221,6 @@ private: EditView* pEditView; vcl::Cursor* pCursor; Color* pBackgroundColor; - /// Model callback. - OutlinerSearchable* mpLibreOfficeKitSearchable; /// Per-view callback. OutlinerViewCallable* mpLibreOfficeKitViewCallable; EditEngine* pEditEngine; @@ -369,11 +367,7 @@ public: const Color& GetBackgroundColor() const { return ( pBackgroundColor ? *pBackgroundColor : pOutWin->GetBackground().GetColor() ); } - /// @see vcl::ITiledRenderable::registerCallback(). - void registerLibreOfficeKitCallback(OutlinerSearchable* pSearchable); - /// Invokes the registered model callback, if there are any. - void libreOfficeKitCallback(int nType, const char* pPayload) const; - /// @see vcl::ITiledRenderable::registerCallback(). + /// @see SfxViewShell::registerLibreOfficeKitViewCallback(). void registerLibreOfficeKitViewCallback(OutlinerViewCallable* pCallable); /// Invokes the registered view callback, if there are any. void libreOfficeKitViewCallback(int nType, const char* pPayload) const; diff --git a/editeng/source/outliner/outlvw.cxx b/editeng/source/outliner/outlvw.cxx index eec3ec9f0c76..ea011f2924c2 100644 --- a/editeng/source/outliner/outlvw.cxx +++ b/editeng/source/outliner/outlvw.cxx @@ -1421,11 +1421,6 @@ void OutlinerView::SetBackgroundColor( const Color& rColor ) pEditView->SetBackgroundColor( rColor ); } -void OutlinerView::registerLibreOfficeKitCallback(OutlinerSearchable* pSearchable) -{ - pEditView->registerLibreOfficeKitCallback(pSearchable); -} - void OutlinerView::registerLibreOfficeKitViewCallback(OutlinerViewCallable* pCallable) { pEditView->registerLibreOfficeKitViewCallback(pCallable); @@ -1456,10 +1451,6 @@ Selection OutlinerView::GetSurroundingTextSelection() const return pEditView->GetSurroundingTextSelection(); } -OutlinerSearchable::~OutlinerSearchable() -{ -} - // ===== some code for thesaurus sub menu within context menu |