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

[Michael Meeks (via logerrit)]

 sc/source/ui/view/tabvwsh2.cxx |    1 +
 sd/source/ui/view/drviewse.cxx |    2 ++
 2 files changed, 3 insertions(+)

New commits:
commit 1952f042e724f39bf92a52947ef1c59f6e13441b
Author:     Michael Meeks <michael.meeks at collabora.com>
AuthorDate: Wed Aug 26 16:43:15 2020 +0100
Commit:     Andras Timar <andras.timar at collabora.com>
CommitDate: Tue Oct 13 23:15:33 2020 +0200

    lok: text box insertion: default to insert directly for lok.
    
    The various bits of positioning functionality are not helpful.
    
    Change-Id: I26a62fc939a1e24a8a811c06c8c1a8da831a73f0
    Reviewed-on: https://gerrit.libreoffice.org/c/core/+/101415
    Tested-by: Andras Timar <andras.timar at collabora.com>
    Reviewed-by: Andras Timar <andras.timar at collabora.com>

diff --git a/sc/source/ui/view/tabvwsh2.cxx b/sc/source/ui/view/tabvwsh2.cxx
index d2efc23d5559..7b278dab9269 100644
--- a/sc/source/ui/view/tabvwsh2.cxx
+++ b/sc/source/ui/view/tabvwsh2.cxx
@@ -260,6 +260,7 @@ void ScTabViewShell::ExecDraw(SfxRequest& rReq)
         case SID_DRAW_TEXT_VERTICAL:
         case SID_DRAW_TEXT_MARQUEE:
         case SID_DRAW_NOTEEDIT:
+            bCreateDirectly = comphelper::LibreOfficeKit::isActive();
             pTabView->SetDrawFuncPtr(new FuText(*this, pWin, pView, pDoc, aNewReq));
             break;
 
diff --git a/sd/source/ui/view/drviewse.cxx b/sd/source/ui/view/drviewse.cxx
index 3ae9b37171b0..d4b10e1fe8f9 100644
--- a/sd/source/ui/view/drviewse.cxx
+++ b/sd/source/ui/view/drviewse.cxx
@@ -249,6 +249,8 @@ void DrawViewShell::FuPermanent(SfxRequest& rReq)
 
             rReq.Done();
 
+            bCreateDirectly = comphelper::LibreOfficeKit::isActive();
+
             const SfxItemSet* pArgs = rReq.GetArgs();
             if (pArgs && pArgs->HasItem(FN_PARAM_1))
                 bCreateDirectly = static_cast<const SfxBoolItem&>(pArgs->Get(FN_PARAM_1)).GetValue();