From 09eccdc87db5258ea779e2bcc12437f802624ee5 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Attila=20Sz=C5=B1cs?= <szucs.attila3@nisz.hu>
Date: Fri, 13 Nov 2020 09:42:00 +0100
Subject: [PATCH] tdf#137624 sc: autofill mixed sequences in merged cells
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Improve FillAnalyse, FillSeries to continue linear sequences
of mixed values in merged cells (mixed values are string + number,
like 'a1','a2' or '1a').

It discovers the linear sequence only if the string parts are
identical. It recognizes user lists only if all elements are in
the same user list.

Co-authored-by: Tibor Nagy (NISZ)

Change-Id: I8810a0f1d637436222e3d0b9219da38ccb7c6346
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/105784
Tested-by: László Németh <nemeth@numbertext.org>
Reviewed-by: László Németh <nemeth@numbertext.org>
---
 sc/qa/unit/copy_paste_test.cxx                |  52 ++++++++++++
 .../ods/tdf137624_autofillMergedMixed.ods     | Bin 0 -> 17389 bytes
 sc/source/core/data/table4.cxx                |  75 +++++++++++++-----
 3 files changed, 105 insertions(+), 22 deletions(-)
 create mode 100644 sc/qa/unit/data/ods/tdf137624_autofillMergedMixed.ods

diff --git a/sc/qa/unit/copy_paste_test.cxx b/sc/qa/unit/copy_paste_test.cxx
index 62ee0bcc53f0..87d8311bdc9b 100644
--- a/sc/qa/unit/copy_paste_test.cxx
+++ b/sc/qa/unit/copy_paste_test.cxx
@@ -51,6 +51,7 @@ public:
     void tdf137653_137654_autofillUserlist();
     void tdf113500_autofillMixed();
     void tdf137625_autofillMergedUserlist();
+    void tdf137624_autofillMergedMixed();
 
     CPPUNIT_TEST_SUITE(ScCopyPasteTest);
     CPPUNIT_TEST(testCopyPasteXLS);
@@ -67,6 +68,7 @@ public:
     CPPUNIT_TEST(tdf137653_137654_autofillUserlist);
     CPPUNIT_TEST(tdf113500_autofillMixed);
     CPPUNIT_TEST(tdf137625_autofillMergedUserlist);
+    CPPUNIT_TEST(tdf137624_autofillMergedMixed);
     CPPUNIT_TEST_SUITE_END();
 
 private:
@@ -930,7 +932,57 @@ void ScCopyPasteTest::tdf137625_autofillMergedUserlist()
     }
 }
 
+void ScCopyPasteTest::tdf137624_autofillMergedMixed()
+{
+    ScDocShellRef xDocSh = loadDocAndSetupModelViewController("tdf137624_autofillMergedMixed.", FORMAT_ODS, true);
+    ScDocument& rDoc = xDocSh->GetDocument();
 
+    // Get the document controller
+    ScTabViewShell* pView = xDocSh->GetBestViewShell(false);
+    CPPUNIT_ASSERT(pView != nullptr);
+
+    // add 1aa,2bb,3cc,4dd,5ee,6ff to userlist, to test that autofill won't confuse it with 1aa,3aa
+    // delete every userlist to make sure there won't be any string that is in 2 different userlist
+    ScGlobal::GetUserList()->clear();
+    addToUserList({ "1aa,2bb,3cc,4dd,5ee,6ff" });
+
+    // fillauto mixed (string + number), these areas contain only merged cells
+    pView->FillAuto(FILL_TO_RIGHT, 7, 5, 12, 7, 6);   //H6:M8
+    pView->FillAuto(FILL_TO_LEFT, 7, 5, 12, 7, 6);    //H6:M8
+    pView->FillAuto(FILL_TO_BOTTOM, 1, 20, 3, 23, 4); //B21:D24
+    pView->FillAuto(FILL_TO_TOP, 1, 20, 3, 23, 4);    //B21:D24
+
+    // compare the results of fill-right / -left with the reference stored in the test file
+    // this compares the whole area blindly, for specific test cases, check the test file
+    for (int nCol = 1; nCol <= 18; nCol++)
+    {
+        for (int nRow = 5; nRow <= 7; nRow++)
+        {
+            CellType nType1 = rDoc.GetCellType(ScAddress(nCol, nRow, 0));
+            CellType nType2 = rDoc.GetCellType(ScAddress(nCol, nRow + 4, 0));
+            OUString aStr1 = rDoc.GetString(nCol, nRow, 0);
+            OUString aStr2 = rDoc.GetString(nCol, nRow + 4, 0);
+
+            CPPUNIT_ASSERT_EQUAL(nType1, nType2);
+            CPPUNIT_ASSERT_EQUAL(aStr1, aStr2);
+        }
+    }
+
+    // compare the results of fill-up / -down
+    for (int nCol = 1; nCol <= 3; nCol++)
+    {
+        for (int nRow = 16; nRow <= 27; nRow++)
+        {
+            CellType nType1 = rDoc.GetCellType(ScAddress(nCol, nRow, 0));
+            CellType nType2 = rDoc.GetCellType(ScAddress(nCol + 4, nRow, 0));
+            OUString aStr1 = rDoc.GetString(nCol, nRow, 0);
+            OUString aStr2 = rDoc.GetString(nCol + 4, nRow, 0);
+
+            CPPUNIT_ASSERT_EQUAL(nType1, nType2);
+            CPPUNIT_ASSERT_EQUAL(aStr1, aStr2);
+        }
+    }
+}
 
 ScCopyPasteTest::ScCopyPasteTest()
       : ScBootstrapFixture( "sc/qa/unit/data" )
diff --git a/sc/qa/unit/data/ods/tdf137624_autofillMergedMixed.ods b/sc/qa/unit/data/ods/tdf137624_autofillMergedMixed.ods
new file mode 100644
index 0000000000000000000000000000000000000000..cc1b6a7c6ab8bc1984bdd8188e81b2557e900f84
GIT binary patch
literal 17389
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

literal 0
HcmV?d00001

diff --git a/sc/source/core/data/table4.cxx b/sc/source/core/data/table4.cxx
index 2e29cecff86b..a777aca898ae 100644
--- a/sc/source/core/data/table4.cxx
+++ b/sc/source/core/data/table4.cxx
@@ -420,25 +420,9 @@ void ScTable::FillAnalyse( SCCOL nCol1, SCROW nRow1, SCCOL nCol2, SCROW nRow2,
             }
             else if (eCellType == CELLTYPE_STRING || eCellType == CELLTYPE_EDIT)
             {
-                OUString aStr;
+                OUString aStr,aStr2;
                 GetString(nColCurr, nRowCurr, aStr);
 
-                bool bAllSame = true;
-                for (SCSIZE i = 0; i < nValueCount; ++i)
-                {
-                    OUString aTestStr;
-                    GetString(static_cast<SCCOL>(nCol1 + rNonOverlappedCellIdx[i] * nAddX),
-                              static_cast<SCROW>(nRow1 + rNonOverlappedCellIdx[i] * nAddY),
-                              aTestStr);
-                    if (aStr != aTestStr)
-                    {
-                        bAllSame = false;
-                        break;
-                    }
-                }
-                if (bAllSame && nValueCount > 1)
-                    return;
-
                 rListData = const_cast<ScUserListData*>(ScGlobal::GetUserList()->GetData(aStr));
                 if (rListData)
                 {
@@ -450,10 +434,10 @@ void ScTable::FillAnalyse( SCCOL nCol1, SCROW nRow1, SCCOL nCol2, SCROW nRow2,
                     {
                         nColCurr = nCol1 + rNonOverlappedCellIdx[i] * nAddX;
                         nRowCurr = nRow1 + rNonOverlappedCellIdx[i] * nAddY;
-                        GetString(nColCurr, nRowCurr, aStr);
+                        GetString(nColCurr, nRowCurr, aStr2);
 
                         nPrevListIndex = rListIndex;
-                        if (!rListData->GetSubIndex(aStr, rListIndex, bMatchCase))
+                        if (!rListData->GetSubIndex(aStr2, rListIndex, bMatchCase))
                             rListData = nullptr;
                         else
                         {
@@ -472,7 +456,45 @@ void ScTable::FillAnalyse( SCCOL nCol1, SCROW nRow1, SCCOL nCol2, SCROW nRow2,
                         return;
                     }
                 }
-                // TODO: check / handle if it is a string containing a number
+                short nFlag1, nFlag2;
+                sal_Int32 nVal1, nVal2;
+                nFlag1 = lcl_DecompValueString(aStr, nVal1, &rMinDigits);
+                if (nFlag1)
+                {
+                    bool bVal = true;
+                    rInc = 1;
+                    for (SCSIZE i = 1; i < nValueCount && bVal; i++)
+                    {
+                        nColCurr = nCol1 + rNonOverlappedCellIdx[i] * nAddX;
+                        nRowCurr = nRow1 + rNonOverlappedCellIdx[i] * nAddY;
+                        ScRefCellValue aCell = GetCellValue(nColCurr, nRowCurr);
+                        CellType eType = aCell.meType;
+                        if (eType == CELLTYPE_STRING || eType == CELLTYPE_EDIT)
+                        {
+                            aStr2 = aCell.getString(&rDocument);
+                            nFlag2 = lcl_DecompValueString(aStr2, nVal2, &rMinDigits);
+                            if (nFlag1 == nFlag2 && aStr == aStr2)
+                            {
+                                double nDiff = approxDiff(nVal2, nVal1);
+                                if (i == 1)
+                                    rInc = nDiff;
+                                else if (!::rtl::math::approxEqual(nDiff, rInc, 13))
+                                    bVal = false;
+                                nVal1 = nVal2;
+                            }
+                            else
+                                bVal = false;
+                        }
+                        else
+                            bVal = false;
+                    }
+                    if (bVal)
+                    {
+                        rCmd = FILL_LINEAR;
+                        rSkipOverlappedCells = true;
+                        return;
+                    }
+                }
             }
         }
     }
@@ -2341,16 +2363,25 @@ void ScTable::FillSeries( SCCOL nCol1, SCROW nRow1, SCCOL nCol2, SCROW nRow2,
                     tools::Long nIndex = 0;
                     bool bError = false;
                     bool bOverflow = false;
+                    bool bNonEmpty = true;
 
                     bool bIsOrdinalSuffix = aValue == ScGlobal::GetOrdinalSuffix(
                                 static_cast<sal_Int32>(nStartVal));
 
+                    sal_Int32 nFillerIdx = 0;
+                    if (bSkipOverlappedCells && !aIsNonEmptyCell[0])
+                        --nIndex;
                     rInner = nIStart;
                     while (true)
                     {
+                        if (bSkipOverlappedCells)
+                        {
+                            nFillerIdx = (nFillerIdx + 1) % nFillerCount;
+                            bNonEmpty = aIsNonEmptyCell[nFillerIdx];
+                        }
                         if(!ColHidden(nCol) && !RowHidden(nRow))
                         {
-                            if (!bError)
+                            if (!bError && bNonEmpty)
                             {
                                 switch (eFillCmd)
                                 {
@@ -2381,7 +2412,7 @@ void ScTable::FillSeries( SCCOL nCol1, SCROW nRow1, SCCOL nCol2, SCROW nRow2,
 
                             if (bError)
                                 aCol[nCol].SetError(static_cast<SCROW>(nRow), FormulaError::NoValue);
-                            else if (!bOverflow)
+                            else if (!bOverflow && bNonEmpty)
                             {
                                 nStringValue = static_cast<sal_Int32>(nVal);
                                 if ( nHeadNoneTail < 0 )