diff options
| author | Mert Tumer <mert.tumer@collabora.com> | 2020-01-20 22:08:40 +0300 |
|---|---|---|
| committer | Andras Timar <andras.timar@collabora.com> | 2020-02-11 16:35:58 +0100 |
| commit | 1cec037fb349c8535cd1e09f00c0eb08e45fd957 (patch) | |
| tree | 61a394658f150a1f9c7dbd59e45f4d2c96bac2c5 | |
| parent | abb9c7db8bcc06f907d39a7811711882161d5803 (diff) | |
Fix csv dialog pops up on mobile when copy/paste
Change-Id: I9e4b154090ad9da0d10a368656f6f63fe335cecf
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/87132
Reviewed-by: Michael Meeks <michael.meeks@collabora.com>
Tested-by: Jenkins CollaboraOffice <jenkinscollaboraoffice@gmail.com>
(cherry picked from commit f99605b6df506d51411d22d377eafd722685edbd)
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/88397
Tested-by: Jenkins
Reviewed-by: Andras Timar <andras.timar@collabora.com>
| -rw-r--r-- | sc/source/ui/view/viewfun5.cxx | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/sc/source/ui/view/viewfun5.cxx b/sc/source/ui/view/viewfun5.cxx index a682420fb071..c0a108c1045d 100644 --- a/sc/source/ui/view/viewfun5.cxx +++ b/sc/source/ui/view/viewfun5.cxx @@ -33,6 +33,7 @@ #include <svx/svdpage.hxx> #include <sfx2/dispatch.hxx> #include <sfx2/docfile.hxx> +#include <sfx2/lokhelper.hxx> #include <comphelper/classids.hxx> #include <sot/formats.hxx> #include <sot/filelist.hxx> @@ -336,7 +337,7 @@ bool ScViewFunc::PasteDataFormat( SotClipboardFormatId nFormatId, { // Do CSV dialog if more than one line. But not if invoked from Automation. sal_Int32 nDelim = pStrBuffer->indexOf('\n'); - if (!comphelper::Automation::AutomationInvokedZone::isActive() + if (!comphelper::LibreOfficeKit::isMobile(SfxLokHelper::getView()) && !comphelper::Automation::AutomationInvokedZone::isActive() && nDelim >= 0 && nDelim != pStrBuffer->getLength () - 1) { vcl::Window* pParent = GetActiveWin(); |