diff options
| author | Miklos Vajna <vmiklos@collabora.co.uk> | 2015-10-28 09:44:37 +0100 |
|---|---|---|
| committer | Miklos Vajna <vmiklos@collabora.co.uk> | 2015-11-03 16:36:24 +0100 |
| commit | 155044c76e5baa2c6d5193a0a8bb5165daae8095 (patch) | |
| tree | 4279865d31ee8ea02d07569e33e6e4cda7db9f1a /sd | |
| parent | 4a669a434527d07f49bf2a35796ee4b421952bf6 (diff) | |
vcl: getWindow() -> setClipboard() in ITiledRenderable
It's cleaner to let the apps do this themselves than exposing their
underlying vcl::Window.
(cherry picked from commit bfd79be417358822023691cf7b7b2946906100ca)
Conflicts:
sc/inc/docuno.hxx
sd/source/ui/inc/unomodel.hxx
sw/inc/unotxdoc.hxx
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 107069ed2dcc..14162e371828 100644 --- a/sd/source/ui/inc/unomodel.hxx +++ b/sd/source/ui/inc/unomodel.hxx @@ -258,8 +258,8 @@ public: virtual void setGraphicSelection(int nType, int nX, int nY) SAL_OVERRIDE; /// @see lok::Document::resetSelection(). virtual void resetSelection() SAL_OVERRIDE; - /// @see vcl::ITiledRenderable::getWindow(). - virtual vcl::Window* getWindow() SAL_OVERRIDE; + /// @see vcl::ITiledRenderable::setClipboard(). + virtual void setClipboard(const css::uno::Reference<css::datatransfer::clipboard::XClipboard>& xClipboard) SAL_OVERRIDE; /// @see vcl::ITiledRenderable::isMimeTypeSupported(). virtual bool isMimeTypeSupported() SAL_OVERRIDE; diff --git a/sd/source/ui/unoidl/unomodel.cxx b/sd/source/ui/unoidl/unomodel.cxx index 31954b68f114..d2c6b5e37603 100644 --- a/sd/source/ui/unoidl/unomodel.cxx +++ b/sd/source/ui/unoidl/unomodel.cxx @@ -2539,15 +2539,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() |