Optimize ScViewFunc::GetSelectionScriptType().

This change reduces the duration of this method from somewhere in the
ballpark of 10 seconds down to a tiny fraction of a second.

Change-Id: I0278dc06a4f134b43cd08bd94693b6dec4893f1f

1 files changed, 22 insertions, 5 deletions

diff --git a/sc/source/core/data/columnspanset.cxx b/sc/source/core/data/columnspanset.cxx
index de785395e4c0..ea4f7060dbc6 100644
--- a/sc/source/core/data/columnspanset.cxx
+++ b/sc/source/core/data/columnspanset.cxx
@@ -15,6 +15,7 @@
 namespace sc {
 
 ColumnSpanSet::Action::~Action() {}
+void ColumnSpanSet::Action::startColumn(SCTAB /*nTab*/, SCCOL /*nCol*/) {}
 
 ColumnSpanSet::~ColumnSpanSet()
 {
@@ -30,11 +31,8 @@ ColumnSpanSet::~ColumnSpanSet()
     }
 }
 
-void ColumnSpanSet::set(SCCOL nCol, SCROW nRow, SCTAB nTab, bool bVal)
+ColumnSpanSet::ColumnSpansType& ColumnSpanSet::getColumnSpans(SCTAB nTab, SCCOL nCol)
 {
-    if (!ValidTab(nTab) || !ValidCol(nCol) || !ValidRow(nRow))
-        return;
-
     if (static_cast<size_t>(nTab) >= maDoc.size())
         maDoc.resize(nTab+1, NULL);
 
@@ -48,10 +46,27 @@ void ColumnSpanSet::set(SCCOL nCol, SCROW nRow, SCTAB nTab, bool bVal)
     if (!rTab[nCol])
         rTab[nCol] = new ColumnSpansType(0, MAXROW+1, false);
 
-    ColumnSpansType& rCol = *rTab[nCol];
+    return *rTab[nCol];
+}
+
+void ColumnSpanSet::set(SCTAB nTab, SCCOL nCol, SCROW nRow, bool bVal)
+{
+    if (!ValidTab(nTab) || !ValidCol(nCol) || !ValidRow(nRow))
+        return;
+
+    ColumnSpansType& rCol = getColumnSpans(nTab, nCol);
     rCol.insert_back(nRow, nRow+1, bVal);
 }
 
+void ColumnSpanSet::set(SCTAB nTab, SCCOL nCol, SCROW nRow1, SCROW nRow2, bool bVal)
+{
+    if (!ValidTab(nTab) || !ValidCol(nCol) || !ValidRow(nRow1) || !ValidRow(nRow2))
+        return;
+
+    ColumnSpansType& rCol = getColumnSpans(nTab, nCol);
+    rCol.insert_back(nRow1, nRow2+1, bVal);
+}
+
 void ColumnSpanSet::executeFromTop(Action& ac) const
 {
     for (size_t nTab = 0; nTab < maDoc.size(); ++nTab)
@@ -65,6 +80,7 @@ void ColumnSpanSet::executeFromTop(Action& ac) const
             if (!rTab[nCol])
                 continue;
 
+            ac.startColumn(nTab, nCol);
             ColumnSpansType& rCol = *rTab[nCol];
             ColumnSpansType::const_iterator it = rCol.begin(), itEnd = rCol.end();
             SCROW nRow1, nRow2;
@@ -94,6 +110,7 @@ void ColumnSpanSet::executeFromBottom(Action& ac) const
             if (!rTab[nCol])
                 continue;
 
+            ac.startColumn(nTab, nCol);
             ColumnSpansType& rCol = *rTab[nCol];
             ColumnSpansType::const_reverse_iterator it = rCol.rbegin(), itEnd = rCol.rend();
             SCROW nRow1, nRow2;