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 /sw | |
| 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 'sw')
| -rw-r--r-- | sw/inc/unotxdoc.hxx | 4 | ||||
| -rw-r--r-- | sw/source/uibase/uno/unotxdoc.cxx | 4 |
2 files changed, 4 insertions, 4 deletions
diff --git a/sw/inc/unotxdoc.hxx b/sw/inc/unotxdoc.hxx index e590e2da3ce4..4a3307b276a0 100644 --- a/sw/inc/unotxdoc.hxx +++ b/sw/inc/unotxdoc.hxx @@ -434,8 +434,8 @@ public: virtual void resetSelection() SAL_OVERRIDE; /// @see vcl::ITiledRenderable::getPartPageRectangles(). virtual OUString getPartPageRectangles() 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/sw/source/uibase/uno/unotxdoc.cxx b/sw/source/uibase/uno/unotxdoc.cxx index 2a3c894915a8..58a61e849c9b 100644 --- a/sw/source/uibase/uno/unotxdoc.cxx +++ b/sw/source/uibase/uno/unotxdoc.cxx @@ -3188,11 +3188,11 @@ OUString SwXTextDocument::getPartPageRectangles() return pWrtShell->getPageRectangles(); } -vcl::Window* SwXTextDocument::getWindow() +void SwXTextDocument::setClipboard(const uno::Reference<datatransfer::clipboard::XClipboard>& xClipboard) { SolarMutexGuard aGuard; - return &pDocShell->GetView()->GetEditWin(); + pDocShell->GetView()->GetEditWin().SetClipboard(xClipboard); } bool SwXTextDocument::isMimeTypeSupported() |