[Libreoffice-commits] core.git: include/vcl sc/inc sc/source sd/source sw/inc sw/source

Miklos Vajna vmiklos at collabora.co.uk
Tue Jun 21 09:37:34 UTC 2016


 include/vcl/ITiledRenderable.hxx  |    9 ---------
 sc/inc/docuno.hxx                 |    3 ---
 sc/source/ui/unoobj/docuno.cxx    |    4 ----
 sd/source/ui/inc/unomodel.hxx     |    2 --
 sd/source/ui/unoidl/unomodel.cxx  |    4 ----
 sw/inc/unotxdoc.hxx               |    2 --
 sw/source/uibase/uno/unotxdoc.cxx |    4 ----
 7 files changed, 28 deletions(-)

New commits:
commit e65b5c19985d725779d8381cc3bd75c441c0ff2e
Author: Miklos Vajna <vmiklos at collabora.co.uk>
Date:   Tue Jun 21 10:45:37 2016 +0200

    Remove no longer needed vcl::ITiledRenderable::registerCallback()
    
    All clients has been changed to use
    SfxViewShell::registerLibreOfficeKitViewCallback() instead.
    
    Change-Id: I2538268dc9c4b449f68b5d2b05a72de584c29fd0
    Reviewed-on: https://gerrit.libreoffice.org/26540
    Reviewed-by: Miklos Vajna <vmiklos at collabora.co.uk>
    Tested-by: Jenkins <ci at libreoffice.org>

diff --git a/include/vcl/ITiledRenderable.hxx b/include/vcl/ITiledRenderable.hxx
index 9c82ba8..65043a0 100644
--- a/include/vcl/ITiledRenderable.hxx
+++ b/include/vcl/ITiledRenderable.hxx
@@ -102,15 +102,6 @@ public:
     virtual void initializeForTiledRendering(const css::uno::Sequence<css::beans::PropertyValue>& rArguments) = 0;
 
     /**
-     * Registers a callback that will be invoked whenever the tiled renderer
-     * wants to notify the client about an event.
-     *
-     * @param pCallback is the callback function
-     * @param pData is private data of the client that will be sent back when the callback is invoked
-     */
-    virtual void registerCallback(LibreOfficeKitCallback pCallback, void* pData) = 0;
-
-    /**
      * Posts a keyboard event on the document.
      *
      * @see lok::Document::postKeyEvent().
diff --git a/sc/inc/docuno.hxx b/sc/inc/docuno.hxx
index 80ab14d..69833ea 100644
--- a/sc/inc/docuno.hxx
+++ b/sc/inc/docuno.hxx
@@ -381,9 +381,6 @@ public:
     /// @see vcl::ITiledRenderable::initializeForTiledRendering().
     virtual void initializeForTiledRendering(const css::uno::Sequence<css::beans::PropertyValue>& rArguments) override;
 
-    /// @see vcl::ITiledRenderable::registerCallback().
-    virtual void registerCallback(LibreOfficeKitCallback pCallback, void* pData) override;
-
     /// @see vcl::ITiledRenderable::postKeyEvent().
     virtual void postKeyEvent(int nType, int nCharCode, int nKeyCode) override;
 
diff --git a/sc/source/ui/unoobj/docuno.cxx b/sc/source/ui/unoobj/docuno.cxx
index 2dfbc2c..af54d38 100644
--- a/sc/source/ui/unoobj/docuno.cxx
+++ b/sc/source/ui/unoobj/docuno.cxx
@@ -554,10 +554,6 @@ Size ScModelObj::getDocumentSize()
     return aSize;
 }
 
-void ScModelObj::registerCallback(LibreOfficeKitCallback /*pCallback*/, void* /*pData*/)
-{
-}
-
 void ScModelObj::postKeyEvent(int nType, int nCharCode, int nKeyCode)
 {
     SolarMutexGuard aGuard;
diff --git a/sd/source/ui/inc/unomodel.hxx b/sd/source/ui/inc/unomodel.hxx
index c1097d1..894ff3a 100644
--- a/sd/source/ui/inc/unomodel.hxx
+++ b/sd/source/ui/inc/unomodel.hxx
@@ -247,8 +247,6 @@ public:
 
     /// @see vcl::ITiledRenderable::initializeForTiledRendering().
     virtual void initializeForTiledRendering(const css::uno::Sequence<css::beans::PropertyValue>& rArguments) override;
-    /// @see vcl::ITiledRenderable::registerCallback().
-    virtual void registerCallback(LibreOfficeKitCallback pCallback, void* pData) override;
     /// @see vcl::ITiledRenderable::postKeyEvent().
     virtual void postKeyEvent(int nType, int nCharCode, int nKeyCode) override;
     /// @see vcl::ITiledRenderable::postMouseEvent().
diff --git a/sd/source/ui/unoidl/unomodel.cxx b/sd/source/ui/unoidl/unomodel.cxx
index ebc6103..af123a9 100644
--- a/sd/source/ui/unoidl/unomodel.cxx
+++ b/sd/source/ui/unoidl/unomodel.cxx
@@ -2415,10 +2415,6 @@ void SdXImpressDocument::initializeForTiledRendering(const css::uno::Sequence<cs
     SvtSaveOptions().SetWarnAlienFormat(false);
 }
 
-void SdXImpressDocument::registerCallback(LibreOfficeKitCallback /*pCallback*/, void* /*pData*/)
-{
-}
-
 void SdXImpressDocument::postKeyEvent(int nType, int nCharCode, int nKeyCode)
 {
     SolarMutexGuard aGuard;
diff --git a/sw/inc/unotxdoc.hxx b/sw/inc/unotxdoc.hxx
index 7fc6b2d..07c9ab0 100644
--- a/sw/inc/unotxdoc.hxx
+++ b/sw/inc/unotxdoc.hxx
@@ -416,8 +416,6 @@ public:
     virtual OUString getPartHash(int nPart) override;
     /// @see vcl::ITiledRenderable::initializeForTiledRendering().
     virtual void initializeForTiledRendering(const css::uno::Sequence<css::beans::PropertyValue>& rArguments) override;
-    /// @see vcl::ITiledRenderable::registerCallback().
-    virtual void registerCallback(LibreOfficeKitCallback pCallback, void* pData) override;
     /// @see vcl::ITiledRenderable::postKeyEvent().
     virtual void postKeyEvent(int nType, int nCharCode, int nKeyCode) override;
     /// @see vcl::ITiledRenderable::postMouseEvent().
diff --git a/sw/source/uibase/uno/unotxdoc.cxx b/sw/source/uibase/uno/unotxdoc.cxx
index 5815ec0..c5cae92 100644
--- a/sw/source/uibase/uno/unotxdoc.cxx
+++ b/sw/source/uibase/uno/unotxdoc.cxx
@@ -3299,10 +3299,6 @@ void SwXTextDocument::initializeForTiledRendering(const css::uno::Sequence<css::
     SvtSaveOptions().SetWarnAlienFormat(false);
 }
 
-void SwXTextDocument::registerCallback(LibreOfficeKitCallback /*pCallback*/, void* /*pData*/)
-{
-}
-
 void SwXTextDocument::postKeyEvent(int nType, int nCharCode, int nKeyCode)
 {
     SolarMutexGuard aGuard;


More information about the Libreoffice-commits mailing list