commit 32e9332a218f9e7441df158c81869b924e520193
author Markus Mohrhard <markus.mohrhard@googlemail.com> Sat Apr 08 19:56:28 2017 +0200
committer Markus Mohrhard <markus.mohrhard@googlemail.com> Sat Apr 08 20:25:30 2017 +0000
tree 91d9dbae311e08d896de18742b352b459675469c
parent 79890a6d1bccbba8c40e42566c3d437d7a1aaace

support normal mark in deletion code

Change-Id: I8fd3ce2c180097546c21399d00337c619c880485
Reviewed-on: https://gerrit.libreoffice.org/36294
Tested-by: Jenkins <ci@libreoffice.org>
Reviewed-by: Markus Mohrhard <markus.mohrhard@googlemail.com>

sc/source/core/data/column.cxx

diff --git a/sc/source/core/data/column.cxx b/sc/source/core/data/column.cxx
index c8a450e..1f081ca 100644
--- a/sc/source/core/data/column.cxx
+++ b/sc/source/core/data/column.cxx
@@ -469,11 +469,23 @@ void ScColumn::ClearSelectionItems( const sal_uInt16* pWhich,const ScMarkData& r
    SCROW nTop;
    SCROW nBottom;

    if ( pAttrArray && rMark.IsMultiMarked() )
    if (pAttrArray)
    {
        ScMultiSelIter aMultiIter( rMark.GetMultiSelData(), nCol );
        while (aMultiIter.Next( nTop, nBottom ))
            pAttrArray->ClearItems(nTop, nBottom, pWhich);
        if (rMark.IsMultiMarked() )
        {
            ScMultiSelIter aMultiIter( rMark.GetMultiSelData(), nCol );
            while (aMultiIter.Next( nTop, nBottom ))
                pAttrArray->ClearItems(nTop, nBottom, pWhich);
        }
        else if (rMark.IsMarked())
        {
            ScRange aRange;
            rMark.GetMarkArea(aRange);
            if (aRange.aStart.Col() <= nCol && nCol <= aRange.aEnd.Col())
            {
                pAttrArray->ClearItems(aRange.aStart.Row(), aRange.aEnd.Row(), pWhich);
            }
        }
    }
}