diff options
| author | Miklos Vajna <vmiklos@collabora.co.uk> | 2016-06-20 16:43:04 +0200 |
|---|---|---|
| committer | Ashod Nakashian <ashod.nakashian@collabora.co.uk> | 2016-07-20 01:46:23 -0400 |
| commit | 2283585d82b60bb613642613525e5e1fc0dd2376 (patch) | |
| tree | 2e40a65c3a8aa386c6e1b49aec207ccc9862f241 /sc | |
| parent | bce02c8547a87bc9c2270c341529d9a13142432a (diff) | |
Remove no longer needed SdrModel::libreOfficeKitCallback()
All former clients are changed to call
SfxViewShell::libreOfficeKitViewCallback() instead.
Reviewed-on: https://gerrit.libreoffice.org/26521
Reviewed-by: Miklos Vajna <vmiklos@collabora.co.uk>
Tested-by: Jenkins <ci@libreoffice.org>
(cherry picked from commit 3f6ad98c4764402dc6e876106867e49e3e888f8f)
Change-Id: Ic5dcf0a8a4241338fcd6941f13ce438157676481
Diffstat (limited to 'sc')
| -rw-r--r-- | sc/source/ui/docshell/docsh.cxx | 3 | ||||
| -rw-r--r-- | sc/source/ui/unoobj/docuno.cxx | 4 |
2 files changed, 2 insertions, 5 deletions
diff --git a/sc/source/ui/docshell/docsh.cxx b/sc/source/ui/docshell/docsh.cxx index f7d98a6be422..a2ac691a515f 100644 --- a/sc/source/ui/docshell/docsh.cxx +++ b/sc/source/ui/docshell/docsh.cxx @@ -3195,9 +3195,8 @@ bool ScDocShell::GetProtectionHash( /*out*/ css::uno::Sequence< sal_Int8 > &rPas return bRes; } -void ScDocShell::libreOfficeKitCallback(int nType, const char* pPayload) const +void ScDocShell::libreOfficeKitCallback(int /*nType*/, const char* /*pPayload*/) const { - aDocument.GetDrawLayer()->libreOfficeKitCallback(nType, pPayload); } /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/sc/source/ui/unoobj/docuno.cxx b/sc/source/ui/unoobj/docuno.cxx index 2d1de4f58a45..f15d572c865c 100644 --- a/sc/source/ui/unoobj/docuno.cxx +++ b/sc/source/ui/unoobj/docuno.cxx @@ -552,10 +552,8 @@ Size ScModelObj::getDocumentSize() return aSize; } -void ScModelObj::registerCallback(LibreOfficeKitCallback pCallback, void* pData) +void ScModelObj::registerCallback(LibreOfficeKitCallback /*pCallback*/, void* /*pData*/) { - SolarMutexGuard aGuard; - pDocShell->GetDocument().GetDrawLayer()->registerLibreOfficeKitCallback(pCallback, pData); } void ScModelObj::postKeyEvent(int nType, int nCharCode, int nKeyCode) |