diff options
author | Miklos Vajna <vmiklos@collabora.co.uk> | 2016-02-19 08:42:40 +0100 |
---|---|---|
committer | Ashod Nakashian <ashod.nakashian@collabora.co.uk> | 2016-07-12 22:06:26 -0400 |
commit | f8f5e69fcfb76df2bf52cf6dbf01a8c6e75a440d (patch) | |
tree | 913536119855117fde792997aec454359a326a14 /editeng/source | |
parent | 8dcf22abfc6a07ececcef6bb830fdea825d416ec (diff) |
editeng: remove never read mpLibreOfficeKitCallback
As all callback invocations happen with SdrModel's callback pointer.
(cherry picked from commit 7073d20627ccfcdd705b53f9d8bc4b58fab9e82a)
Change-Id: I0111040c501b7927332f88cc4797b8ebab2bc57a
Diffstat (limited to 'editeng/source')
-rw-r--r-- | editeng/source/editeng/editview.cxx | 4 | ||||
-rw-r--r-- | editeng/source/editeng/impedit.cxx | 6 | ||||
-rw-r--r-- | editeng/source/editeng/impedit.hxx | 4 | ||||
-rw-r--r-- | editeng/source/outliner/outlvw.cxx | 4 |
4 files changed, 6 insertions, 12 deletions
diff --git a/editeng/source/editeng/editview.cxx b/editeng/source/editeng/editview.cxx index 3eb54507423f..828598f924c6 100644 --- a/editeng/source/editeng/editview.cxx +++ b/editeng/source/editeng/editview.cxx @@ -583,9 +583,9 @@ Color EditView::GetBackgroundColor() const return pImpEditView->GetBackgroundColor(); } -void EditView::registerLibreOfficeKitCallback(LibreOfficeKitCallback pCallback, void* pLibreOfficeKitData, OutlinerSearchable *pSearchable) +void EditView::registerLibreOfficeKitCallback(OutlinerSearchable *pSearchable) { - pImpEditView->registerLibreOfficeKitCallback(pCallback, pLibreOfficeKitData, pSearchable); + pImpEditView->registerLibreOfficeKitCallback(pSearchable); } void EditView::SetControlWord( EVControlBits nWord ) diff --git a/editeng/source/editeng/impedit.cxx b/editeng/source/editeng/impedit.cxx index c3eade27a367..726a44421eb3 100644 --- a/editeng/source/editeng/impedit.cxx +++ b/editeng/source/editeng/impedit.cxx @@ -79,8 +79,6 @@ ImpEditView::ImpEditView( EditView* pView, EditEngine* pEng, vcl::Window* pWindo pOutWin = pWindow; pPointer = nullptr; pBackgroundColor = nullptr; - mpLibreOfficeKitCallback = nullptr; - mpLibreOfficeKitData = nullptr; mpLibreOfficeKitSearchable = nullptr; nScrollDiffX = 0; nExtraCursorFlags = 0; @@ -119,10 +117,8 @@ void ImpEditView::SetBackgroundColor( const Color& rColor ) pBackgroundColor = new Color( rColor ); } -void ImpEditView::registerLibreOfficeKitCallback(LibreOfficeKitCallback pCallback, void* pData, OutlinerSearchable* pSearchable) +void ImpEditView::registerLibreOfficeKitCallback(OutlinerSearchable* pSearchable) { - mpLibreOfficeKitCallback = pCallback; - mpLibreOfficeKitData = pData; mpLibreOfficeKitSearchable = pSearchable; } diff --git a/editeng/source/editeng/impedit.hxx b/editeng/source/editeng/impedit.hxx index dd3e58f7a13b..639b6442c5df 100644 --- a/editeng/source/editeng/impedit.hxx +++ b/editeng/source/editeng/impedit.hxx @@ -222,8 +222,6 @@ private: EditView* pEditView; vcl::Cursor* pCursor; Color* pBackgroundColor; - LibreOfficeKitCallback mpLibreOfficeKitCallback; - void* mpLibreOfficeKitData; OutlinerSearchable* mpLibreOfficeKitSearchable; EditEngine* pEditEngine; VclPtr<vcl::Window> pOutWin; @@ -370,7 +368,7 @@ public: return ( pBackgroundColor ? *pBackgroundColor : pOutWin->GetBackground().GetColor() ); } /// @see vcl::ITiledRenderable::registerCallback(). - void registerLibreOfficeKitCallback(LibreOfficeKitCallback pCallback, void* pLibreOfficeKitData, OutlinerSearchable* pSearchable); + void registerLibreOfficeKitCallback(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 5abefba26ed8..29796786fce0 100644 --- a/editeng/source/outliner/outlvw.cxx +++ b/editeng/source/outliner/outlvw.cxx @@ -1427,9 +1427,9 @@ void OutlinerView::SetBackgroundColor( const Color& rColor ) pEditView->SetBackgroundColor( rColor ); } -void OutlinerView::registerLibreOfficeKitCallback(LibreOfficeKitCallback pCallback, void* pLibreOfficeKitData, OutlinerSearchable* pSearchable) +void OutlinerView::registerLibreOfficeKitCallback(OutlinerSearchable* pSearchable) { - pEditView->registerLibreOfficeKitCallback(pCallback, pLibreOfficeKitData, pSearchable); + pEditView->registerLibreOfficeKitCallback(pSearchable); } Color OutlinerView::GetBackgroundColor() |