diff options
| author | Andrzej Hunt <andrzej@ahunt.org> | 2015-11-11 10:05:25 +0100 |
|---|---|---|
| committer | Andrzej Hunt <andrzej@ahunt.org> | 2015-11-11 10:34:00 +0100 |
| commit | c34df1dadcec05c9a45ede4bab8e2fea9d3c0720 (patch) | |
| tree | aadaddfecae2aac4356c6a3010b306e1d833d6f0 /sd | |
| parent | d3ddd695fbde04d3f283b6e2c8cfeed113cf52e1 (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 'sd')
| -rw-r--r-- | sd/source/ui/inc/unomodel.hxx | 2 | ||||
| -rw-r--r-- | sd/source/ui/unoidl/unomodel.cxx | 14 |
2 files changed, 16 insertions, 0 deletions
diff --git a/sd/source/ui/inc/unomodel.hxx b/sd/source/ui/inc/unomodel.hxx index 14162e371828..e56549b57cbe 100644 --- a/sd/source/ui/inc/unomodel.hxx +++ b/sd/source/ui/inc/unomodel.hxx @@ -262,6 +262,8 @@ public: virtual void setClipboard(const css::uno::Reference<css::datatransfer::clipboard::XClipboard>& xClipboard) SAL_OVERRIDE; /// @see vcl::ITiledRenderable::isMimeTypeSupported(). virtual bool isMimeTypeSupported() SAL_OVERRIDE; + /// @see vcl::ITiledRenderable::getPointer(). + virtual Pointer getPointer() SAL_OVERRIDE; // XComponent diff --git a/sd/source/ui/unoidl/unomodel.cxx b/sd/source/ui/unoidl/unomodel.cxx index 9475ff56c505..28ca11878044 100644 --- a/sd/source/ui/unoidl/unomodel.cxx +++ b/sd/source/ui/unoidl/unomodel.cxx @@ -2568,6 +2568,20 @@ bool SdXImpressDocument::isMimeTypeSupported() return EditEngine::HasValidData(aDataHelper.GetTransferable()); } +Pointer SdXImpressDocument::getPointer() +{ + SolarMutexGuard aGuard; + DrawViewShell* pViewShell = GetViewShell(); + if (!pViewShell) + return Pointer(); + + Window* pWindow = pViewShell->GetActiveWindow(); + if (!pWindow) + return Pointer(); + + return pWindow->GetPointer(); +} + uno::Reference< i18n::XForbiddenCharacters > SdXImpressDocument::getForbiddenCharsTable() { uno::Reference< i18n::XForbiddenCharacters > xForb(mxForbidenCharacters); |