diff options
| author | Miklos Vajna <vmiklos@collabora.co.uk> | 2015-10-28 09:44:37 +0100 |
|---|---|---|
| committer | Miklos Vajna <vmiklos@collabora.co.uk> | 2015-10-28 09:45:11 +0100 |
| commit | bfd79be417358822023691cf7b7b2946906100ca (patch) | |
| tree | 71b1854ff333bab5c7286609ebb96746308c8bb8 /sd | |
| parent | a827957f3f559738c221450e3e691361096ac9a4 (diff) | |
vcl: getWindow() -> setClipboard() in ITiledRenderable
It's cleaner to let the apps do this themselves than exposing their
underlying vcl::Window.
Change-Id: Iff2442dd325fa65a0cf3ad4aa7f918542dab1e4c
Diffstat (limited to 'sd')
| -rw-r--r-- | sd/source/ui/inc/unomodel.hxx | 4 | ||||
| -rw-r--r-- | sd/source/ui/unoidl/unomodel.cxx | 6 |
2 files changed, 5 insertions, 5 deletions
diff --git a/sd/source/ui/inc/unomodel.hxx b/sd/source/ui/inc/unomodel.hxx index 03dc4456067d..1e1d65f2d63c 100644 --- a/sd/source/ui/inc/unomodel.hxx +++ b/sd/source/ui/inc/unomodel.hxx @@ -259,8 +259,8 @@ public: virtual void setGraphicSelection(int nType, int nX, int nY) override; /// @see lok::Document::resetSelection(). virtual void resetSelection() override; - /// @see vcl::ITiledRenderable::getWindow(). - virtual vcl::Window* getWindow() override; + /// @see vcl::ITiledRenderable::setClipboard(). + virtual void setClipboard(const css::uno::Reference<css::datatransfer::clipboard::XClipboard>& xClipboard) override; /// @see vcl::ITiledRenderable::isMimeTypeSupported(). virtual bool isMimeTypeSupported() override; diff --git a/sd/source/ui/unoidl/unomodel.cxx b/sd/source/ui/unoidl/unomodel.cxx index 8c3d0a3d0722..c840f784e6a2 100644 --- a/sd/source/ui/unoidl/unomodel.cxx +++ b/sd/source/ui/unoidl/unomodel.cxx @@ -2533,15 +2533,15 @@ void SdXImpressDocument::resetSelection() pSdrView->UnmarkAll(); } -vcl::Window* SdXImpressDocument::getWindow() +void SdXImpressDocument::setClipboard(const uno::Reference<datatransfer::clipboard::XClipboard>& xClipboard) { SolarMutexGuard aGuard; DrawViewShell* pViewShell = GetViewShell(); if (!pViewShell) - return 0; + return; - return pViewShell->GetActiveWindow(); + pViewShell->GetActiveWindow()->SetClipboard(xClipboard); } bool SdXImpressDocument::isMimeTypeSupported() |