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

[Tamás Zolnai (via logerrit)]

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

New commits:
commit 4474b0ee642a85adf1d0293ca6c4122c80265d59
Author:     Tamás Zolnai <tamas.zolnai at collabora.com>
AuthorDate: Wed Oct 14 20:06:02 2020 +0200
Commit:     Tamás Zolnai <tamas.zolnai at collabora.com>
CommitDate: Wed Oct 14 20:28:05 2020 +0200

    Revert "lok: text box insertion: default to insert directly for lok."
    
    Breaks a lot of cypress tests.
    
    This reverts commit 1952f042e724f39bf92a52947ef1c59f6e13441b.
    
    Change-Id: I2f11c094082bad7cb8e70350f724a0789318a8ac
    Reviewed-on: https://gerrit.libreoffice.org/c/core/+/104321
    Tested-by: Tamás Zolnai <tamas.zolnai at collabora.com>
    Reviewed-by: Tamás Zolnai <tamas.zolnai at collabora.com>

diff --git a/sc/source/ui/view/tabvwsh2.cxx b/sc/source/ui/view/tabvwsh2.cxx
index 7b278dab9269..d2efc23d5559 100644
--- a/sc/source/ui/view/tabvwsh2.cxx
+++ b/sc/source/ui/view/tabvwsh2.cxx
@@ -260,7 +260,6 @@ 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 d4b10e1fe8f9..3ae9b37171b0 100644
--- a/sd/source/ui/view/drviewse.cxx
+++ b/sd/source/ui/view/drviewse.cxx
@@ -249,8 +249,6 @@ 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();