summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMiklos Vajna <vmiklos@collabora.co.uk>2016-06-23 08:47:05 +0200
committerMiklos Vajna <vmiklos@collabora.co.uk>2016-07-20 18:01:18 +0200
commit918a02ba8ba9a35fdd2c2ea2ad6864de0c7cb7c5 (patch)
treea095601d75a26119f04e4aa1cb0b6383a5dbbf05
parent2996f4c670d1a32a646dd1a552036ea1f18e5113 (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> (cherry picked from commit ed2d342e97e43ff25f450ab6a5752baded6813e4)
-rw-r--r--include/sal/log-areas.dox1
-rw-r--r--include/sfx2/objsh.hxx7
-rw-r--r--sc/source/ui/docshell/docsh.cxx4
-rw-r--r--sc/source/ui/inc/docsh.hxx2
-rw-r--r--sd/source/ui/docshell/docshell.cxx4
-rw-r--r--sd/source/ui/inc/DrawDocShell.hxx2
-rw-r--r--sfx2/source/doc/objcont.cxx5
-rw-r--r--sw/inc/docsh.hxx2
-rw-r--r--sw/source/uibase/app/docsh.cxx4
9 files changed, 0 insertions, 31 deletions
diff --git a/include/sal/log-areas.dox b/include/sal/log-areas.dox
index 310fb128aebc..04ad05a1999b 100644
--- a/include/sal/log-areas.dox
+++ b/include/sal/log-areas.dox
@@ -305,7 +305,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 d79984626b68..edc3ee4709d0 100644
--- a/include/sfx2/objsh.hxx
+++ b/include/sfx2/objsh.hxx
@@ -723,13 +723,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 a2ac691a515f..73936d664e6e 100644
--- a/sc/source/ui/docshell/docsh.cxx
+++ b/sc/source/ui/docshell/docsh.cxx
@@ -3195,8 +3195,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 bf228f79fa46..7780e7dc0b7e 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 e9afba04347b..4c2e87d3174d 100644
--- a/sd/source/ui/docshell/docshell.cxx
+++ b/sd/source/ui/docshell/docshell.cxx
@@ -464,10 +464,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 b43f84b9f877..b355c597ac12 100644
--- a/sd/source/ui/inc/DrawDocShell.hxx
+++ b/sd/source/ui/inc/DrawDocShell.hxx
@@ -203,8 +203,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 bd8d904f6618..1b5584c730e8 100644
--- a/sfx2/source/doc/objcont.cxx
+++ b/sfx2/source/doc/objcont.cxx
@@ -652,9 +652,4 @@ bool SfxObjectShell::IsModifyPasswordEntered()
return pImp->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 84774c17d327..83e4fad9c848 100644
--- a/sw/inc/docsh.hxx
+++ b/sw/inc/docsh.hxx
@@ -308,8 +308,6 @@ public:
virtual void SetChangeRecording( bool bActivate ) override;
virtual bool 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 efd89626ee62..e112b71de0d6 100644
--- a/sw/source/uibase/app/docsh.cxx
+++ b/sw/source/uibase/app/docsh.cxx
@@ -1337,8 +1337,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: */