diff options
author | Jan-Marek Glogowski <glogow@fbihome.de> | 2019-07-09 20:29:05 +0000 |
---|---|---|
committer | Caolán McNamara <caolanm@redhat.com> | 2019-07-15 15:45:41 +0200 |
commit | afadb14164ccd559a36f00efa0f01bac1813bc0e (patch) | |
tree | 02e576a570fb26f64405dec139e4da86a3535942 /include/vcl | |
parent | Revert "tdf#108687 vcl: always enable tabstop on radio buttons" (diff) | |
download | core-afadb14164ccd559a36f00efa0f01bac1813bc0e.tar.gz core-afadb14164ccd559a36f00efa0f01bac1813bc0e.zip |
tdf#126316 revert Clipboard to PrimarySelection
Regression from commit ce9795954d39 ("fix crash in header/footer
calc dialog"), which replaced some GetPrimarySelection() calls
with GetClipboard() calls.
This replaces the Window class calls for clipboard with global
GetSystem* calls in vcl/transfer.hxx. Not sure if this is the
best place, but the crowded Window class is definitly not.
Reviewed-on: https://gerrit.libreoffice.org/75318
Tested-by: Jenkins
Reviewed-by: Jan-Marek Glogowski <glogow@fbihome.de>
(cherry picked from commit f8f43e55ec4ae7e436a5043fe6f4bae7b39cc6ad)
Change-Id: Ic5f9e575c1ac5d43df234426c5616eca616dea30
Reviewed-on: https://gerrit.libreoffice.org/75370
Tested-by: Jenkins
Reviewed-by: Caolán McNamara <caolanm@redhat.com>
Tested-by: Caolán McNamara <caolanm@redhat.com>
Diffstat (limited to 'include/vcl')
-rw-r--r-- | include/vcl/transfer.hxx | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/include/vcl/transfer.hxx b/include/vcl/transfer.hxx index 3e1c4ee5b325..888fe254e115 100644 --- a/include/vcl/transfer.hxx +++ b/include/vcl/transfer.hxx @@ -31,6 +31,7 @@ #include <com/sun/star/lang/XServiceInfo.hpp> #include <com/sun/star/lang/XUnoTunnel.hpp> #include <com/sun/star/datatransfer/XTransferable2.hpp> +#include <com/sun/star/datatransfer/clipboard/XClipboard.hpp> #include <com/sun/star/datatransfer/clipboard/XClipboardOwner.hpp> #include <com/sun/star/datatransfer/dnd/DNDConstants.hpp> #include <com/sun/star/datatransfer/dnd/XDragGestureListener.hpp> @@ -503,6 +504,9 @@ public: const Link<sal_Int8,void>& rCallbck ); }; +css::uno::Reference<css::datatransfer::clipboard::XClipboard> VCL_DLLPUBLIC GetSystemClipboard(); +css::uno::Reference<css::datatransfer::clipboard::XClipboard> VCL_DLLPUBLIC GetSystemPrimarySelection(); + #endif /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ |