[Libreoffice-commits] core.git: include/svx svx/source sw/inc sw/source

[Miklos Vajna]

 include/svx/svdmodel.hxx        |    2 --
 svx/source/svdraw/svdmodel.cxx  |    5 -----
 sw/inc/drawdoc.hxx              |    2 --
 sw/source/core/draw/drawdoc.cxx |    6 ------
 4 files changed, 15 deletions(-)

New commits:
commit 5d54dd644dc44fb02754bc765a3550c38857ccca
Author: Miklos Vajna <vmiklos at collabora.co.uk>
Date:   Mon Feb 29 09:07:32 2016 +0100

    svx: remove unused SdrModel::getLibreOfficeKitCallback()
    
    Change-Id: Id6a12d40ea43512d2ee22f51034a6a8023f40e9e

diff --git a/include/svx/svdmodel.hxx b/include/svx/svdmodel.hxx
index 6bf3fd2..b6ec9bc 100644
--- a/include/svx/svdmodel.hxx
+++ b/include/svx/svdmodel.hxx
@@ -336,8 +336,6 @@ public:
     OutputDevice*        GetRefDevice() const                   { return pRefOutDev.get(); }
     /// The actual implementation of the vcl::ITiledRenderable::registerCallback() API.
     void                 registerLibreOfficeKitCallback(LibreOfficeKitCallback pCallback, void* pLibreOfficeKitData);
-    /// Gets the LOK callback registered by registerLibreOfficeKitCallback().
-    LibreOfficeKitCallback getLibreOfficeKitCallback() const;
     /// Gets the LOK data registered by registerLibreOfficeKitCallback().
     void*                getLibreOfficeKitData() const;
     /// Invokes the registered callback, if there are any.
diff --git a/svx/source/svdraw/svdmodel.cxx b/svx/source/svdraw/svdmodel.cxx
index 8096a1d..bed3398 100644
--- a/svx/source/svdraw/svdmodel.cxx
+++ b/svx/source/svdraw/svdmodel.cxx
@@ -842,11 +842,6 @@ bool SdrModel::isTiledSearching() const
     return mbTiledSearching;
 }
 
-LibreOfficeKitCallback SdrModel::getLibreOfficeKitCallback() const
-{
-    return mpLibreOfficeKitCallback;
-}
-
 void* SdrModel::getLibreOfficeKitData() const
 {
     return mpLibreOfficeKitData;
diff --git a/sw/inc/drawdoc.hxx b/sw/inc/drawdoc.hxx
index 97efdb5..339fbc7 100644
--- a/sw/inc/drawdoc.hxx
+++ b/sw/inc/drawdoc.hxx
@@ -41,8 +41,6 @@ public:
     virtual SdrPage* AllocPage(bool bMasterPage) override;
 
     virtual css::uno::Reference<css::embed::XStorage> GetDocumentStorage() const override;
-    /// Get the callback and callback data, previously given to registerLibreOfficeKitCallback().
-    void getLibreOfficeKitCallback(LibreOfficeKitCallback& rCallback, void*& rLibreOfficeKitData);
 
 protected:
     /// override of <SdrModel::createUnoModel()> is needed to provide corresponding uno model.
diff --git a/sw/source/core/draw/drawdoc.cxx b/sw/source/core/draw/drawdoc.cxx
index 4e295d7..786d86f 100644
--- a/sw/source/core/draw/drawdoc.cxx
+++ b/sw/source/core/draw/drawdoc.cxx
@@ -129,12 +129,6 @@ uno::Reference<embed::XStorage> SwDrawModel::GetDocumentStorage() const
     return m_pDoc->GetDocStorage();
 }
 
-void SwDrawModel::getLibreOfficeKitCallback(LibreOfficeKitCallback& rCallback, void*& rLibreOfficeKitData)
-{
-    rCallback = mpLibreOfficeKitCallback;
-    rLibreOfficeKitData = mpLibreOfficeKitData;
-}
-
 uno::Reference< uno::XInterface > SwDrawModel::createUnoModel()
 {
     uno::Reference< uno::XInterface > xModel;