diff options
author | Miklos Vajna <vmiklos@collabora.co.uk> | 2016-06-23 08:47:05 +0200 |
---|---|---|
committer | Miklos Vajna <vmiklos@collabora.co.uk> | 2016-06-23 09:10:22 +0000 |
commit | ed2d342e97e43ff25f450ab6a5752baded6813e4 (patch) | |
tree | 46c29d579a6f31bcb7cc3c7eff62e9ad7c0ad3c3 | |
parent | 4d1118e5cc9f2a4dc20ea73fba4cb09d9e2a3ce5 (diff) |
Remove unused SfxObjectShell::libreOfficeKitCallback()
All clients have been converted to use
SfxViewShell::libreOfficeKitViewCallback() instead.
Change-Id: I793dad5194769f331037b12a1b1afba96ddea4ba
Reviewed-on: https://gerrit.libreoffice.org/26584
Reviewed-by: Miklos Vajna <vmiklos@collabora.co.uk>
Tested-by: Jenkins <ci@libreoffice.org>
-rw-r--r-- | include/sal/log-areas.dox | 1 | ||||
-rw-r--r-- | include/sfx2/objsh.hxx | 7 | ||||
-rw-r--r-- | sc/source/ui/docshell/docsh.cxx | 4 | ||||
-rw-r--r-- | sc/source/ui/inc/docsh.hxx | 2 | ||||
-rw-r--r-- | sd/source/ui/docshell/docshell.cxx | 4 | ||||
-rw-r--r-- | sd/source/ui/inc/DrawDocShell.hxx | 2 | ||||
-rw-r--r-- | sfx2/source/doc/objcont.cxx | 5 | ||||
-rw-r--r-- | sw/inc/docsh.hxx | 2 | ||||
-rw-r--r-- | sw/source/uibase/app/docsh.cxx | 4 |
9 files changed, 0 insertions, 31 deletions
diff --git a/include/sal/log-areas.dox b/include/sal/log-areas.dox index dd32631393c7..8a6fbdd15874 100644 --- a/include/sal/log-areas.dox +++ b/include/sal/log-areas.dox @@ -316,7 +316,6 @@ certain functionality. @li @c sfx.doc @li @c sfx.notify @li @c sfx.sidebar -@li @c sfx.tiledrendering @li @c sfx.view @section slideshow diff --git a/include/sfx2/objsh.hxx b/include/sfx2/objsh.hxx index ee86c347dc03..fd8e7105614e 100644 --- a/include/sfx2/objsh.hxx +++ b/include/sfx2/objsh.hxx @@ -722,13 +722,6 @@ public: SAL_DLLPRIVATE void CancelCheckOut( ); SAL_DLLPRIVATE void CheckIn( ); SAL_DLLPRIVATE css::uno::Sequence< css::document::CmisVersion > GetCmisVersions(); - - /** - * Interface shared by document shell. Allow LOK calls from sfx. - * Default behavior doesn't do anything. relevant SfxObjectShells should override - * the default behavior and implements LOK calls. - */ - virtual void libreOfficeKitCallback(int nType, const char* pPayload) const; }; #define SFX_GLOBAL_CLASSID \ diff --git a/sc/source/ui/docshell/docsh.cxx b/sc/source/ui/docshell/docsh.cxx index 12f8b5de7ef5..79cb8c844be0 100644 --- a/sc/source/ui/docshell/docsh.cxx +++ b/sc/source/ui/docshell/docsh.cxx @@ -3220,8 +3220,4 @@ bool ScDocShell::GetProtectionHash( /*out*/ css::uno::Sequence< sal_Int8 > &rPas return bRes; } -void ScDocShell::libreOfficeKitCallback(int /*nType*/, const char* /*pPayload*/) const -{ -} - /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/sc/source/ui/inc/docsh.hxx b/sc/source/ui/inc/docsh.hxx index 84346fb536b8..107c2dc990fa 100644 --- a/sc/source/ui/inc/docsh.hxx +++ b/sc/source/ui/inc/docsh.hxx @@ -422,8 +422,6 @@ public: virtual bool GetProtectionHash( /*out*/ css::uno::Sequence< sal_Int8 > &rPasswordHash ) override; void SnapVisArea( Rectangle& rRect ) const; - - virtual void libreOfficeKitCallback(int nType, const char* pPayload) const override; }; void UpdateAcceptChangesDialog(); diff --git a/sd/source/ui/docshell/docshell.cxx b/sd/source/ui/docshell/docshell.cxx index b948bd94680c..ccf257c54679 100644 --- a/sd/source/ui/docshell/docshell.cxx +++ b/sd/source/ui/docshell/docshell.cxx @@ -478,10 +478,6 @@ void DrawDocShell::ClearUndoBuffer() pUndoManager->Clear(); } -void DrawDocShell::libreOfficeKitCallback(int /*nType*/, const char* /*pPayload*/) const -{ -} - } // end of namespace sd /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/sd/source/ui/inc/DrawDocShell.hxx b/sd/source/ui/inc/DrawDocShell.hxx index cc5a8c0e3d1c..d377abf378c9 100644 --- a/sd/source/ui/inc/DrawDocShell.hxx +++ b/sd/source/ui/inc/DrawDocShell.hxx @@ -201,8 +201,6 @@ public: void ClearUndoBuffer(); - virtual void libreOfficeKitCallback(int nType, const char* pPayload) const override; - protected: SdDrawDocument* mpDoc; diff --git a/sfx2/source/doc/objcont.cxx b/sfx2/source/doc/objcont.cxx index e5681b887dbc..5192e9e8c3be 100644 --- a/sfx2/source/doc/objcont.cxx +++ b/sfx2/source/doc/objcont.cxx @@ -651,9 +651,4 @@ bool SfxObjectShell::IsModifyPasswordEntered() return pImpl->m_bModifyPasswordEntered; } -void SfxObjectShell::libreOfficeKitCallback(int /*nType*/, const char* /*pPayload*/) const -{ - SAL_INFO("sfx.tiledrendering", "SfxObjectShell::libreOfficeKitCallback interface not overridden for SfxObjectShell subclass typeId: " << typeid(*this).name()); -} - /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/sw/inc/docsh.hxx b/sw/inc/docsh.hxx index cce1600ae5b0..50ac3c954cd2 100644 --- a/sw/inc/docsh.hxx +++ b/sw/inc/docsh.hxx @@ -307,8 +307,6 @@ public: virtual void SetChangeRecording( bool bActivate ) override; virtual void SetProtectionPassword( const OUString &rPassword ) override; virtual bool GetProtectionHash( /*out*/ css::uno::Sequence< sal_Int8 > &rPasswordHash ) override; - - virtual void libreOfficeKitCallback(int nType, const char* pPayload) const override; }; /** Find the right DocShell and create a new one: diff --git a/sw/source/uibase/app/docsh.cxx b/sw/source/uibase/app/docsh.cxx index fada17aeaeb6..70fe182e63da 100644 --- a/sw/source/uibase/app/docsh.cxx +++ b/sw/source/uibase/app/docsh.cxx @@ -1338,8 +1338,4 @@ bool SwDocShell::GetProtectionHash( /*out*/ css::uno::Sequence< sal_Int8 > &rPas return bRes; } -void SwDocShell::libreOfficeKitCallback(int /*nType*/, const char* /*pPayload*/) const -{ -} - /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ |