include/svx/svdmodel.hxx | 3 ++- include/vcl/ITiledRenderable.hxx | 8 +++----- sw/inc/viewsh.hxx | 3 ++- 3 files changed, 7 insertions(+), 7 deletions(-)
New commits: commit 084f73cbb278c291a917804d3c18c5c4a8099991 Author: Miklos Vajna <[email protected]> Date: Mon Mar 23 13:57:44 2015 +0100 vcl::ITiledRenderable: can mark these methods as pure virtual Change-Id: Ic6b594ee3ed668f5038a1f998ec9e514ecb75169 diff --git a/include/vcl/ITiledRenderable.hxx b/include/vcl/ITiledRenderable.hxx index 5340f06..76a18f0 100644 --- a/include/vcl/ITiledRenderable.hxx +++ b/include/vcl/ITiledRenderable.hxx @@ -89,9 +89,7 @@ public: * Setup various document properties that are needed for the document to * be renderable via tiled rendering. */ - virtual void initializeForTiledRendering() - { - } + virtual void initializeForTiledRendering() = 0; /** * Registers a callback that will be invoked whenever the tiled renderer @@ -100,14 +98,14 @@ public: * @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*/) { } + virtual void registerCallback(LibreOfficeKitCallback pCallback, void* pData) = 0; /** * Posts a mouse event on the document. * * @see lok::Document::postMouseEvent(). */ - virtual void postMouseEvent(int /*nType*/, int /*nX*/, int /*nY*/, int /*nCount*/) { } + virtual void postMouseEvent(int nType, int nX, int nY, int nCount) = 0; /** * Sets the start or end of a text selection. commit 24e0a35df5c47dba287b8df916b4d2dbeb0a3b7e Author: Miklos Vajna <[email protected]> Date: Mon Mar 23 13:57:18 2015 +0100 svx, sw: can avoid vcl/ITiledRenderable.hxx include here Change-Id: I27f1770d0e1d3409d51887565f67d4d456ca9692 diff --git a/include/svx/svdmodel.hxx b/include/svx/svdmodel.hxx index 388e82e..4d238a2 100644 --- a/include/svx/svdmodel.hxx +++ b/include/svx/svdmodel.hxx @@ -37,7 +37,8 @@ #include <svx/xtable.hxx> #include <svx/pageitem.hxx> #include <vcl/field.hxx> -#include <vcl/ITiledRenderable.hxx> +#define LOK_USE_UNSTABLE_API +#include <LibreOfficeKit/LibreOfficeKitTypes.h> class OutputDevice; #include <svx/svdtypes.hxx> diff --git a/sw/inc/viewsh.hxx b/sw/inc/viewsh.hxx index 2bc8260..994ef9e 100644 --- a/sw/inc/viewsh.hxx +++ b/sw/inc/viewsh.hxx @@ -30,7 +30,8 @@ #include <stack> #include <vcl/mapmod.hxx> #include <vcl/print.hxx> -#include <vcl/ITiledRenderable.hxx> +#define LOK_USE_UNSTABLE_API +#include <LibreOfficeKit/LibreOfficeKitTypes.h> namespace com { namespace sun { namespace star { namespace accessibility { class XAccessible; } } } } _______________________________________________ Libreoffice-commits mailing list [email protected] http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
