From 666427b7a51eb16829d96563b53bcef2de541da1 Mon Sep 17 00:00:00 2001 From: Michael Meeks Date: Thu, 25 Jul 2019 19:02:47 +0100 Subject: clipboard: repair unit test so that it runs in the lok mode. SwTransferable::AddSupportedFormats needs the kit to be active. Change-Id: Id84210eb2e526785f35dfae609d861c310885314 --- desktop/qa/desktop_lib/test_desktop_lib.cxx | 3 +++ desktop/source/lib/init.cxx | 1 - 2 files changed, 3 insertions(+), 1 deletion(-) (limited to 'desktop') 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 forceSetClipboardForCurrentView(LibreOfficeKitDocument *pThis) { ITiledRenderable* pDoc = getTiledRenderable(pThis); -- cgit