diff options
author | Michael Meeks <michael.meeks@collabora.com> | 2019-07-20 11:22:09 +0100 |
---|---|---|
committer | Michael Meeks <michael.meeks@collabora.com> | 2019-07-20 11:22:09 +0100 |
commit | 34116936e5a90400d1fff678719a081d69b484d7 (patch) | |
tree | 5cf9aeeac0d1e53fd9a0254be19b73e819a626fc | |
parent | 7623b7c64819b1488f3767405f226a6a22638a17 (diff) |
clipboard: encourage paste to show up by having some dummy content.private/mmeeks/copy-paste
Having an empty system clipboard is a hyper-unusual state, but quite
common for lok instances - so hide that with the dummy state.
Allows context-menu paste into new documents.
Change-Id: I9ce04cb8a0abfa054a67cb94922d7ac5992d1b29
-rw-r--r-- | desktop/source/lib/lokclipboard.cxx | 15 | ||||
-rw-r--r-- | desktop/source/lib/lokclipboard.hxx | 1 |
2 files changed, 16 insertions, 0 deletions
diff --git a/desktop/source/lib/lokclipboard.cxx b/desktop/source/lib/lokclipboard.cxx index f53202903761..17a9c5c54e4f 100644 --- a/desktop/source/lib/lokclipboard.cxx +++ b/desktop/source/lib/lokclipboard.cxx @@ -69,6 +69,9 @@ LOKClipboard::LOKClipboard() : cppu::WeakComponentImplHelper<css::datatransfer::clipboard::XSystemClipboard, css::lang::XServiceInfo>(m_aMutex) { + // Encourage 'paste' menu items to always show up. + uno::Reference<datatransfer::XTransferable> xTransferable(new LOKTransferable()); + setContents(xTransferable, uno::Reference<datatransfer::clipboard::XClipboardOwner>()); } Sequence<OUString> LOKClipboard::getSupportedServiceNames_static() @@ -150,6 +153,18 @@ LOKTransferable::LOKTransferable(const OUString& sMimeType, aContent <<= aSequence; m_aContent.push_back(aContent); } + +/// Use to ensure we have some dummy content on the clipboard to allow a 1st 'paste' +LOKTransferable::LOKTransferable() +{ + m_aContent.reserve(1); + m_aFlavors = css::uno::Sequence<css::datatransfer::DataFlavor>(1); + initFlavourFromMime(m_aFlavors[0], "text/plain"); + uno::Any aContent; + aContent <<= OUString(); + m_aContent.push_back(aContent); +} + // cf. sot/source/base/exchange.cxx for these two exceptional types. void LOKTransferable::initFlavourFromMime(css::datatransfer::DataFlavor& rFlavor, OUString aMimeType) diff --git a/desktop/source/lib/lokclipboard.hxx b/desktop/source/lib/lokclipboard.hxx index 1ade5c0a3e0b..3b8f9d8ee7c9 100644 --- a/desktop/source/lib/lokclipboard.hxx +++ b/desktop/source/lib/lokclipboard.hxx @@ -77,6 +77,7 @@ class LOKTransferable : public cppu::WeakImplHelper<css::datatransfer::XTransfer void initFlavourFromMime(css::datatransfer::DataFlavor& rFlavor, OUString sMimeType); public: + LOKTransferable(); LOKTransferable(const size_t nInCount, const char** pInMimeTypes, const size_t* pInSizes, const char** pInStreams); LOKTransferable(const OUString& sMimeType, const css::uno::Sequence<sal_Int8>& aSequence); |