summaryrefslogtreecommitdiff
path: root/include
diff options
context:
space:
mode:
authorAndrzej Hunt <andrzej@ahunt.org>2015-11-11 10:05:25 +0100
committerAndrzej Hunt <andrzej@ahunt.org>2015-11-11 10:34:00 +0100
commitc34df1dadcec05c9a45ede4bab8e2fea9d3c0720 (patch)
treeaadaddfecae2aac4356c6a3010b306e1d833d6f0 /include
parentd3ddd695fbde04d3f283b6e2c8cfeed113cf52e1 (diff)
Implement LOK_CALLBACK_MOUSE_POINTER
Reviewed-on: https://gerrit.libreoffice.org/19883 Reviewed-by: Andrzej Hunt <andrzej@ahunt.org> Tested-by: Andrzej Hunt <andrzej@ahunt.org> (cherry picked from commit 81b8ca683d44ba9c37f2dc8c74470a86ce70513f) Conflicts: sc/inc/docuno.hxx sd/source/ui/inc/unomodel.hxx sw/inc/unotxdoc.hxx Change-Id: I8d1f63208baf277b0a9d15908f3ea7ff3b56bf10
Diffstat (limited to 'include')
-rw-r--r--include/LibreOfficeKit/LibreOfficeKitEnums.h9
-rw-r--r--include/vcl/ITiledRenderable.hxx3
2 files changed, 11 insertions, 1 deletions
diff --git a/include/LibreOfficeKit/LibreOfficeKitEnums.h b/include/LibreOfficeKit/LibreOfficeKitEnums.h
index bf6267585a0a..37837ea49b86 100644
--- a/include/LibreOfficeKit/LibreOfficeKitEnums.h
+++ b/include/LibreOfficeKit/LibreOfficeKitEnums.h
@@ -202,7 +202,14 @@ typedef enum
*
* Rectangle format is the same as LOK_CALLBACK_INVALIDATE_TILES.
*/
- LOK_CALLBACK_CELL_CURSOR
+ LOK_CALLBACK_CELL_CURSOR,
+
+ /**
+ * The current mouse pointer style.
+ *
+ * Payload is a css mouse pointer style.
+ */
+ LOK_CALLBACK_MOUSE_POINTER
}
LibreOfficeKitCallbackType;
diff --git a/include/vcl/ITiledRenderable.hxx b/include/vcl/ITiledRenderable.hxx
index e3ad01b698d8..7f9bed1acce6 100644
--- a/include/vcl/ITiledRenderable.hxx
+++ b/include/vcl/ITiledRenderable.hxx
@@ -14,6 +14,7 @@
#define LOK_USE_UNSTABLE_API
#include <LibreOfficeKit/LibreOfficeKitTypes.h>
#include <tools/gen.hxx>
+#include <vcl/pointr.hxx>
#include <vcl/virdev.hxx>
namespace vcl
@@ -171,6 +172,8 @@ public:
return OString();
}
+ virtual Pointer getPointer() = 0;
+
/// Sets the clipboard of the component.
virtual void setClipboard(const css::uno::Reference<css::datatransfer::clipboard::XClipboard>& xClipboard) = 0;