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

[Tünde Tóth (via logerrit)]

 sc/source/ui/view/cellsh.cxx   |    3 ++-
 sc/source/ui/view/viewfunc.cxx |    3 ++-
 2 files changed, 4 insertions(+), 2 deletions(-)

New commits:
commit 27f75a3504559b57f0893b4ef20b4694da3984be
Author:     Tünde Tóth <toth.tunde at nisz.hu>
AuthorDate: Tue May 11 11:21:35 2021 +0200
Commit:     Andras Timar <andras.timar at collabora.com>
CommitDate: Sat Jul 17 22:23:54 2021 +0200

    tdf#57351 sc UI: fix disabled Insert Columns options
    
    In a sheet with active autofilter or standard filter,
    Insert Columns Before/After weren't available in the
    context menu of the column header and in Sheet->Insert
    Columns...
    
    Change-Id: I746d7d5a451848306d67d57e42d3981c471c66f2
    Reviewed-on: https://gerrit.libreoffice.org/c/core/+/115400
    Tested-by: László Németh <nemeth at numbertext.org>
    Reviewed-by: László Németh <nemeth at numbertext.org>

diff --git a/sc/source/ui/view/cellsh.cxx b/sc/source/ui/view/cellsh.cxx
index fc24d18a56be..610c15b837fc 100644
--- a/sc/source/ui/view/cellsh.cxx
+++ b/sc/source/ui/view/cellsh.cxx
@@ -254,7 +254,8 @@ void ScCellShell::GetBlockState( SfxItemSet& rSet )
                 if (nWhich == FID_INS_COLUMNS_AFTER)
                     eAction = sc::ColRowEditAction::InsertColumnsAfter;
 
-                bDisable = (!bSimpleArea) || GetViewData()->SimpleRowMarked();
+                bDisable = (!bSimpleArea && eMarkType != SC_MARK_SIMPLE_FILTERED)
+                           || GetViewData()->SimpleRowMarked();
                 if (!bEditable && nRow1 == 0 && nRow2 == rDoc.MaxRow())
                 {
                     // See if row insertions are allowed.
diff --git a/sc/source/ui/view/viewfunc.cxx b/sc/source/ui/view/viewfunc.cxx
index f59f5e37820c..3128dc46c0a0 100644
--- a/sc/source/ui/view/viewfunc.cxx
+++ b/sc/source/ui/view/viewfunc.cxx
@@ -1600,7 +1600,8 @@ void ScViewFunc::OnLOKSetWidthOrHeight(SCCOLROW nStart, bool bWidth)
 bool ScViewFunc::InsertCells( InsCellCmd eCmd, bool bRecord, bool bPartOfPaste )
 {
     ScRange aRange;
-    if (GetViewData().GetSimpleArea(aRange) == SC_MARK_SIMPLE)
+    ScMarkType eMarkType = GetViewData().GetSimpleArea(aRange);
+    if (eMarkType == SC_MARK_SIMPLE || eMarkType == SC_MARK_SIMPLE_FILTERED)
     {
         ScDocShell* pDocSh = GetViewData().GetDocShell();
         const ScMarkData& rMark = GetViewData().GetMarkData();