[Libreoffice-commits] core.git: Branch 'feature/sparklines' - sc/inc sc/source

[Tomaž Vajngerl (via logerrit)]

 sc/inc/table.hxx               |    1 
 sc/source/core/data/table4.cxx |   56 +++++++++++++++++++++++++++++++++++++++++
 2 files changed, 57 insertions(+)

New commits:
commit 7a278d9326775cbb1e0dce1c9cf7c6c335d9ba00
Author:     Tomaž Vajngerl <tomaz.vajng...@collabora.co.uk>
AuthorDate: Mon Apr 4 00:56:47 2022 +0900
Commit:     Tomaž Vajngerl <tomaz.vajng...@collabora.co.uk>
CommitDate: Mon Apr 4 00:56:47 2022 +0900

    sc: take sparklines into account with auto fill
    
    Change-Id: I6bdb5f4291aece7ec02d8de0731b8f983b4f2bb2

diff --git a/sc/inc/table.hxx b/sc/inc/table.hxx
index 7b3c01e67989..c811dd6b4bde 100644
--- a/sc/inc/table.hxx
+++ b/sc/inc/table.hxx
@@ -482,6 +482,7 @@ public:
 
     sc::SparklineList& GetSparklineList();
     void CopySparklinesToTable(SCCOL nCol1, SCROW nRow1, SCCOL nCol2, SCROW 
nRow2, ScTable* pDestTab);
+    void FillSparkline(bool bVertical, SCCOLROW nFixed, SCCOLROW 
nIteratingStart, SCCOLROW nIteratingEnd, SCCOLROW nFillStart, SCCOLROW 
nFillEnd);
 
     // Notes / Comments
     std::unique_ptr<ScPostIt> ReleaseNote( SCCOL nCol, SCROW nRow );
diff --git a/sc/source/core/data/table4.cxx b/sc/source/core/data/table4.cxx
index a3d49aa1c190..5865b2245767 100644
--- a/sc/source/core/data/table4.cxx
+++ b/sc/source/core/data/table4.cxx
@@ -1204,10 +1204,66 @@ void ScTable::FillAuto( SCCOL nCol1, SCROW nRow1, SCCOL 
nCol2, SCROW nRow2,
                 nProgress = pProgress->GetState();
         }
 
+        if (bVertical)
+            FillSparkline(bVertical, nCol, nRow1, nRow2, nIStart, nIEnd);
+        else
+            FillSparkline(bVertical, nRow, nCol1, nCol2, nIStart, nIEnd);
+
         nActFormCnt += nMaxFormCnt;
     }
 }
 
+void  ScTable::FillSparkline(bool bVertical, SCCOLROW nFixed,
+                             SCCOLROW nStart, SCCOLROW nEnd,
+                             SCCOLROW nFillStart, SCCOLROW nFillEnd)
+{
+    bool bHasSparklines = false;
+    std::vector<std::shared_ptr<sc::Sparkline>> aSparklineSeries;
+
+    for (SCROW nCurrent = nStart; nCurrent <= nEnd; nCurrent++)
+    {
+        auto pSparkline = bVertical ? GetSparkline(nFixed, nCurrent) : 
GetSparkline(nCurrent, nFixed);
+        bHasSparklines = bHasSparklines || bool(pSparkline);
+        aSparklineSeries.push_back(pSparkline);
+    }
+
+    if (bHasSparklines)
+    {
+        for (SCCOLROW nCurrent = nFillStart; nCurrent <= nFillEnd; nCurrent++)
+        {
+            size_t nIndex = size_t(nFillStart - nCurrent) % 
aSparklineSeries.size();
+            if (auto& rpSparkline = aSparklineSeries[nIndex])
+            {
+                auto pGroup = rpSparkline->getSparklineGroup();
+
+                auto* pNewSparkline = bVertical ? CreateSparkline(nFixed, 
nCurrent, pGroup)
+                                                : CreateSparkline(nCurrent, 
nFixed, pGroup);
+                if (pNewSparkline)
+                {
+                    SCCOLROW nPosition = bVertical ? rpSparkline->getRow()
+                                                   : rpSparkline->getColumn();
+                    SCCOLROW nDelta = nCurrent - nPosition;
+                    ScRangeList aRangeList(rpSparkline->getInputRange());
+                    for (ScRange& rRange : aRangeList)
+                    {
+                        if (bVertical)
+                        {
+                            rRange.aStart.IncRow(nDelta);
+                            rRange.aEnd.IncRow(nDelta);
+                        }
+                        else
+                        {
+                            rRange.aStart.IncCol(nDelta);
+                            rRange.aEnd.IncCol(nDelta);
+                        }
+                    }
+                    pNewSparkline->setInputRange(aRangeList);
+                }
+            }
+        }
+    }
+}
+
 OUString ScTable::GetAutoFillPreview( const ScRange& rSource, SCCOL nEndX, 
SCROW nEndY )
 {
     OUString aValue;