diff options
| author | Michael Meeks <michael.meeks@collabora.com> | 2019-07-25 19:02:47 +0100 |
|---|---|---|
| committer | Michael Meeks <michael.meeks@collabora.com> | 2019-08-02 11:41:50 -0400 |
| commit | 666427b7a51eb16829d96563b53bcef2de541da1 (patch) | |
| tree | a27bedcec718636fd1201bd4b73fa4c6382ae47c /desktop | |
| parent | 6e33d3046186b10f4ef49f3de8ee87adb100bab9 (diff) | |
clipboard: repair unit test so that it runs in the lok mode.
SwTransferable::AddSupportedFormats needs the kit to be active.
Change-Id: Id84210eb2e526785f35dfae609d861c310885314
Diffstat (limited to 'desktop')
| -rw-r--r-- | desktop/qa/desktop_lib/test_desktop_lib.cxx | 3 | ||||
| -rw-r--r-- | desktop/source/lib/init.cxx | 1 |
2 files changed, 3 insertions, 1 deletions
diff --git a/desktop/qa/desktop_lib/test_desktop_lib.cxx b/desktop/qa/desktop_lib/test_desktop_lib.cxx index 6d6416a46e16..8a7934b9f0e2 100644 --- a/desktop/qa/desktop_lib/test_desktop_lib.cxx +++ b/desktop/qa/desktop_lib/test_desktop_lib.cxx @@ -2641,6 +2641,9 @@ void DesktopLOKTest::testShowHideDialog() void DesktopLOKTest::testComplexSelection() { + // needed for SwTransferable to cope with the selection. + comphelper::LibreOfficeKit::setActive(); + // Start with a blank text file and add contents. LibLODocument_Impl* pDocument = loadDoc("blank_text.odt"); static const OString aText("hello world"); diff --git a/desktop/source/lib/init.cxx b/desktop/source/lib/init.cxx index 9036abedba15..03c0d86267d1 100644 --- a/desktop/source/lib/init.cxx +++ b/desktop/source/lib/init.cxx @@ -878,7 +878,6 @@ ITiledRenderable* getTiledRenderable(LibreOfficeKitDocument* pThis) * we also need to ensure that this works for the first view which * has no clear 'createView' called for it (unfortunately). */ - rtl::Reference<LOKClipboard> forceSetClipboardForCurrentView(LibreOfficeKitDocument *pThis) { ITiledRenderable* pDoc = getTiledRenderable(pThis); |