diff options
| author | Miklos Vajna <vmiklos@collabora.co.uk> | 2016-06-20 16:43:04 +0200 |
|---|---|---|
| committer | Miklos Vajna <vmiklos@collabora.co.uk> | 2016-06-20 15:16:07 +0000 |
| commit | 3f6ad98c4764402dc6e876106867e49e3e888f8f (patch) | |
| tree | 1cd35548cfb4dc55e5d2fc43ea48872791b1aa12 /sw/source | |
| parent | c544a8b674dd7ac9dd466a84a440ede030942438 (diff) | |
Remove no longer needed SdrModel::libreOfficeKitCallback()
All former clients are changed to call
SfxViewShell::libreOfficeKitViewCallback() instead.
Change-Id: Ic5dcf0a8a4241338fcd6941f13ce438157676481
Reviewed-on: https://gerrit.libreoffice.org/26521
Reviewed-by: Miklos Vajna <vmiklos@collabora.co.uk>
Tested-by: Jenkins <ci@libreoffice.org>
Diffstat (limited to 'sw/source')
| -rw-r--r-- | sw/source/core/view/viewsh.cxx | 12 | ||||
| -rw-r--r-- | sw/source/uibase/app/docsh.cxx | 7 | ||||
| -rw-r--r-- | sw/source/uibase/uno/unotxdoc.cxx | 7 |
3 files changed, 2 insertions, 24 deletions
diff --git a/sw/source/core/view/viewsh.cxx b/sw/source/core/view/viewsh.cxx index f2cb6a1fa4f6..0dd248da9dc2 100644 --- a/sw/source/core/view/viewsh.cxx +++ b/sw/source/core/view/viewsh.cxx @@ -115,18 +115,6 @@ void SwViewShell::ToggleHeaderFooterEdit() GetWin()->Invalidate(); } -void SwViewShell::registerLibreOfficeKitCallback(LibreOfficeKitCallback pCallback, void* pData) -{ - getIDocumentDrawModelAccess().GetDrawModel()->registerLibreOfficeKitCallback(pCallback, pData); - if (SwPostItMgr* pPostItMgr = GetPostItMgr()) - pPostItMgr->registerLibreOfficeKitCallback(getIDocumentDrawModelAccess().GetDrawModel()); -} - -void SwViewShell::libreOfficeKitCallback(int nType, const char* pPayload) const -{ - getIDocumentDrawModelAccess().GetDrawModel()->libreOfficeKitCallback(nType, pPayload); -} - void SwViewShell::setOutputToWindow(bool bOutputToWindow) { mbOutputToWindow = bOutputToWindow; diff --git a/sw/source/uibase/app/docsh.cxx b/sw/source/uibase/app/docsh.cxx index 40d5233821d1..fada17aeaeb6 100644 --- a/sw/source/uibase/app/docsh.cxx +++ b/sw/source/uibase/app/docsh.cxx @@ -1338,13 +1338,8 @@ bool SwDocShell::GetProtectionHash( /*out*/ css::uno::Sequence< sal_Int8 > &rPas return bRes; } -void SwDocShell::libreOfficeKitCallback(int nType, const char* pPayload) const +void SwDocShell::libreOfficeKitCallback(int /*nType*/, const char* /*pPayload*/) const { - if (!m_pDoc) - return; - - SwDrawModel* pDrawModel = m_pDoc->getIDocumentDrawModelAccess().GetDrawModel(); - pDrawModel->libreOfficeKitCallback(nType, pPayload); } /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/sw/source/uibase/uno/unotxdoc.cxx b/sw/source/uibase/uno/unotxdoc.cxx index 3256047eb187..5815ec08493b 100644 --- a/sw/source/uibase/uno/unotxdoc.cxx +++ b/sw/source/uibase/uno/unotxdoc.cxx @@ -3299,13 +3299,8 @@ void SwXTextDocument::initializeForTiledRendering(const css::uno::Sequence<css:: SvtSaveOptions().SetWarnAlienFormat(false); } -void SwXTextDocument::registerCallback(LibreOfficeKitCallback pCallback, void* pData) +void SwXTextDocument::registerCallback(LibreOfficeKitCallback /*pCallback*/, void* /*pData*/) { - SolarMutexGuard aGuard; - - SwDoc* pDoc = pDocShell->GetDoc(); - SwViewShell* pViewShell = pDoc->getIDocumentLayoutAccess().GetCurrentViewShell(); - pViewShell->registerLibreOfficeKitCallback(pCallback, pData); } void SwXTextDocument::postKeyEvent(int nType, int nCharCode, int nKeyCode) |