[Libreoffice-commits] core.git: Branch 'libreoffice-6-4' - sc/source

[Noel Grandin (via logerrit)]

 sc/source/core/data/markdata.cxx |   15 +++++++++++----
 1 file changed, 11 insertions(+), 4 deletions(-)

New commits:
commit c21b6629a8af2b4d87840fcee8d39b3f77f08c98
Author:     Noel Grandin <noel.grandin at collabora.co.uk>
AuthorDate: Wed Jan 15 09:25:23 2020 +0200
Commit:     Noel Grandin <noel.grandin at collabora.co.uk>
CommitDate: Wed Jan 15 11:25:44 2020 +0100

    tdf#129393 Calc: cannot format whole row of unprotected cells
    
    regression from
            commit 3c3a371c799d00475deb13b4c3e0a8860c7e4fb3
            tdf#125254 Performance: A spreadsheet opens too slow, part2
    
    Change-Id: I87e06a58d6a4eb1a32bdf7e9267a4fe9d6dc4f2a
    Reviewed-on: https://gerrit.libreoffice.org/c/core/+/86826
    Tested-by: Jenkins
    Reviewed-by: Noel Grandin <noel.grandin at collabora.co.uk>
    Signed-off-by: Xisco Fauli <xiscofauli at libreoffice.org>
    Reviewed-on: https://gerrit.libreoffice.org/c/core/+/86830

diff --git a/sc/source/core/data/markdata.cxx b/sc/source/core/data/markdata.cxx
index 66f067648bb1..8922ab01b674 100644
--- a/sc/source/core/data/markdata.cxx
+++ b/sc/source/core/data/markdata.cxx
@@ -375,10 +375,17 @@ ScMarkData::ScMarkData(SCROW nMaxRow, SCCOL nMaxCol, const ScRangeList& rList)
     for (const ScRange& rRange : rList)
         maTabMarked.insert( rRange.aStart.Tab() );
 
-    bMultiMarked = true;
-    aMultiRange = rList.Combine();
-
-    aMultiSel.Set( rList );
+    if (rList.size() > 1)
+    {
+        bMultiMarked = true;
+        aMultiRange = rList.Combine();
+        aMultiSel.Set( rList );
+    }
+    else if (rList.size() == 1)
+    {
+        const ScRange& rRange = rList[ 0 ];
+        SetMarkArea( rRange );
+    }
 }