diff options
| author | Caolán McNamara <caolanm@redhat.com> | 2021-03-08 14:13:16 +0000 |
|---|---|---|
| committer | Caolán McNamara <caolanm@redhat.com> | 2021-03-09 16:57:56 +0100 |
| commit | 55b305e21f103b74669a31b6dbed8596ecc3ca09 (patch) | |
| tree | 884a5b657425a1161edf93e4ca04d98dfc9d52f8 /include/vcl | |
| parent | 3edfc84c7a1df53ccea921e2dc4e42088bafcb0c (diff) | |
fetch/set/clear primary selection without intermediate vcl::Window
the intermediate layer doesn't do anything useful
Change-Id: I00564f43db8914445ea4013c6f387c7d7c783427
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/112170
Tested-by: Jenkins
Reviewed-by: Caolán McNamara <caolanm@redhat.com>
Diffstat (limited to 'include/vcl')
| -rw-r--r-- | include/vcl/transfer.hxx | 6 | ||||
| -rw-r--r-- | include/vcl/window.hxx | 1 |
2 files changed, 3 insertions, 4 deletions
diff --git a/include/vcl/transfer.hxx b/include/vcl/transfer.hxx index d24fd560de31..cd2b58fc29b6 100644 --- a/include/vcl/transfer.hxx +++ b/include/vcl/transfer.hxx @@ -249,20 +249,20 @@ protected: virtual void DragFinished( sal_Int8 nDropAction ); virtual void ObjectReleased(); + void CopyToSelection(const css::uno::Reference<css::datatransfer::clipboard::XClipboard> &rClipboard) const; public: void PrepareOLE( const TransferableObjectDescriptor& rObjDesc ); void CopyToClipboard(const css::uno::Reference<css::datatransfer::clipboard::XClipboard> &rClipboard) const; - void CopyToSelection(const css::uno::Reference<css::datatransfer::clipboard::XClipboard> &rClipboard) const; // convenience versions of the above which extract the XClipboard from the pWindow void CopyToClipboard( vcl::Window *pWindow ) const; - void CopyToSelection( vcl::Window *pWindow ) const; + void CopyToPrimarySelection() const; void StartDrag( vcl::Window* pWindow, sal_Int8 nDragSourceActions ); - static void ClearSelection( vcl::Window *pWindow ); + static void ClearPrimarySelection(); static const css::uno::Sequence< sal_Int8 >& getUnoTunnelId(); diff --git a/include/vcl/window.hxx b/include/vcl/window.hxx index d2129d2b0163..51d6a7767c86 100644 --- a/include/vcl/window.hxx +++ b/include/vcl/window.hxx @@ -1310,7 +1310,6 @@ public: css::uno::Reference< css::datatransfer::clipboard::XClipboard > GetClipboard(); /// Sets a custom clipboard for the window's frame, instead of creating it on-demand using css::datatransfer::clipboard::SystemClipboard. void SetClipboard(css::uno::Reference<css::datatransfer::clipboard::XClipboard> const & xClipboard); - css::uno::Reference< css::datatransfer::clipboard::XClipboard > GetPrimarySelection(); /* * Widgets call this to inform their owner container that the widget wants |