[Libreoffice-commits] core.git: Branch 'distro/collabora/cp-6.2' - sc/source

Mert Tumer (via logerrit) logerrit at kemper.freedesktop.org
Tue Jan 21 15:37:08 UTC 2020


 sc/source/ui/view/viewfun5.cxx |    3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

New commits:
commit f99605b6df506d51411d22d377eafd722685edbd
Author:     Mert Tumer <mert.tumer at collabora.com>
AuthorDate: Mon Jan 20 22:08:40 2020 +0300
Commit:     Michael Meeks <michael.meeks at collabora.com>
CommitDate: Tue Jan 21 16:36:38 2020 +0100

    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 at collabora.com>
    Tested-by: Jenkins CollaboraOffice <jenkinscollaboraoffice at gmail.com>

diff --git a/sc/source/ui/view/viewfun5.cxx b/sc/source/ui/view/viewfun5.cxx
index 3c293013f0af..de6cfd7e137a 100644
--- a/sc/source/ui/view/viewfun5.cxx
+++ b/sc/source/ui/view/viewfun5.cxx
@@ -34,6 +34,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>
@@ -337,7 +338,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();


More information about the Libreoffice-commits mailing list