diff options
| author | Michael Meeks <michael.meeks@collabora.com> | 2019-07-25 19:02:47 +0100 |
|---|---|---|
| committer | Michael Meeks <michael.meeks@collabora.com> | 2019-07-27 14:19:49 -0400 |
| commit | eb72b17cf376958fc378119d9fc74cd493804d0e (patch) | |
| tree | 800483074432c015faffaf2bb6dd04f7cede019e | |
| parent | 612b60785b6d71b455f0351fd78c22b32677e5ae (diff) | |
clipboard: repair unit test so that it runs in the lok mode.
feature/lok-clipboard
SwTransferable::AddSupportedFormats needs the kit to be active.
Change-Id: Id84210eb2e526785f35dfae609d861c310885314
| -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 7ad2f1e45817..39be487931f3 100644 --- a/desktop/qa/desktop_lib/test_desktop_lib.cxx +++ b/desktop/qa/desktop_lib/test_desktop_lib.cxx @@ -2635,6 +2635,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 f40a1db78a0f..6be51b3fc5b0 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); |