diff options
| author | Miklos Vajna <vmiklos@collabora.co.uk> | 2016-02-19 08:42:40 +0100 |
|---|---|---|
| committer | Miklos Vajna <vmiklos@collabora.co.uk> | 2016-02-19 08:43:02 +0100 |
| commit | 7073d20627ccfcdd705b53f9d8bc4b58fab9e82a (patch) | |
| tree | d85ba8bc3b748058c7f546d8aa2a140fa363077b /sw | |
| parent | f6c96946911db267bc79b4bdb4ced7d7414d3cac (diff) | |
editeng: remove never read mpLibreOfficeKitCallback
As all callback invocations happen with SdrModel's callback pointer.
Change-Id: I0111040c501b7927332f88cc4797b8ebab2bc57a
Diffstat (limited to 'sw')
| -rw-r--r-- | sw/inc/PostItMgr.hxx | 2 | ||||
| -rw-r--r-- | sw/source/core/view/viewsh.cxx | 2 | ||||
| -rw-r--r-- | sw/source/uibase/docvw/PostItMgr.cxx | 4 | ||||
| -rw-r--r-- | sw/source/uibase/docvw/SidebarWin.cxx | 5 |
4 files changed, 5 insertions, 8 deletions
diff --git a/sw/inc/PostItMgr.hxx b/sw/inc/PostItMgr.hxx index b4f96a675347..8f9a22017f3d 100644 --- a/sw/inc/PostItMgr.hxx +++ b/sw/inc/PostItMgr.hxx @@ -291,7 +291,7 @@ class SwPostItMgr: public SfxListener void DrawNotesForPage(OutputDevice *pOutDev, sal_uInt32 nPage); void PaintTile(OutputDevice& rRenderContext, const Rectangle& rRect); /// Informs already created annotations about a newly registered LOK callback. - void registerLibreOfficeKitCallback(LibreOfficeKitCallback pCallback, void* pData, OutlinerSearchable* pSearchable); + void registerLibreOfficeKitCallback(OutlinerSearchable* pSearchable); }; #endif diff --git a/sw/source/core/view/viewsh.cxx b/sw/source/core/view/viewsh.cxx index ecd8d671c8c4..01e0378a5d4e 100644 --- a/sw/source/core/view/viewsh.cxx +++ b/sw/source/core/view/viewsh.cxx @@ -119,7 +119,7 @@ void SwViewShell::registerLibreOfficeKitCallback(LibreOfficeKitCallback pCallbac { getIDocumentDrawModelAccess().GetDrawModel()->registerLibreOfficeKitCallback(pCallback, pData); if (SwPostItMgr* pPostItMgr = GetPostItMgr()) - pPostItMgr->registerLibreOfficeKitCallback(pCallback, pData, getIDocumentDrawModelAccess().GetDrawModel()); + pPostItMgr->registerLibreOfficeKitCallback(getIDocumentDrawModelAccess().GetDrawModel()); } void SwViewShell::libreOfficeKitCallback(int nType, const char* pPayload) const diff --git a/sw/source/uibase/docvw/PostItMgr.cxx b/sw/source/uibase/docvw/PostItMgr.cxx index d968eb22bc17..b0ddb3bc863d 100644 --- a/sw/source/uibase/docvw/PostItMgr.cxx +++ b/sw/source/uibase/docvw/PostItMgr.cxx @@ -881,7 +881,7 @@ void SwPostItMgr::PaintTile(OutputDevice& rRenderContext, const Rectangle& /*rRe } } -void SwPostItMgr::registerLibreOfficeKitCallback(LibreOfficeKitCallback pCallback, void* pData, OutlinerSearchable* pSearchable) +void SwPostItMgr::registerLibreOfficeKitCallback(OutlinerSearchable* pSearchable) { for (SwSidebarItem* pItem : mvPostItFields) { @@ -889,7 +889,7 @@ void SwPostItMgr::registerLibreOfficeKitCallback(LibreOfficeKitCallback pCallbac if (!pPostIt) continue; - pPostIt->GetOutlinerView()->registerLibreOfficeKitCallback(pCallback, pData, pSearchable); + pPostIt->GetOutlinerView()->registerLibreOfficeKitCallback(pSearchable); } } diff --git a/sw/source/uibase/docvw/SidebarWin.cxx b/sw/source/uibase/docvw/SidebarWin.cxx index 4bc6cfc13887..50a2735d510b 100644 --- a/sw/source/uibase/docvw/SidebarWin.cxx +++ b/sw/source/uibase/docvw/SidebarWin.cxx @@ -615,10 +615,7 @@ void SwSidebarWin::InitControls() { // If there is a callback already registered, inform the new outliner view about it. SwDrawModel* pDrawModel = mrView.GetWrtShellPtr()->getIDocumentDrawModelAccess().GetDrawModel(); - LibreOfficeKitCallback pCallback = nullptr; - void* pData = nullptr; - pDrawModel->getLibreOfficeKitCallback(pCallback, pData); - mpOutlinerView->registerLibreOfficeKitCallback(pCallback, pData, pDrawModel); + mpOutlinerView->registerLibreOfficeKitCallback(pDrawModel); } //create Scrollbars |