[Libreoffice-commits] core.git: Branch 'feature/formula-core-rework' - 2 commits - sc/source

[Kohei Yoshida]

 sc/source/core/data/formulacell.cxx |   28 +---------------------------
 sc/source/core/tool/token.cxx       |    3 +++
 2 files changed, 4 insertions(+), 27 deletions(-)

New commits:
commit 35624096f9f74472c88ef29f1e0cf8f169cff6b3
Author: Kohei Yoshida <kohei.yoshida at gmail.com>
Date:   Wed Aug 7 23:09:43 2013 -0400

    Disable vectorization on named ranges for now.
    
    Change-Id: Ibc10d5eb9afff6062106c952aa2e7d3f9cb58100

diff --git a/sc/source/core/data/formulacell.cxx b/sc/source/core/data/formulacell.cxx
index 4a05c4c..fd103bc 100644
--- a/sc/source/core/data/formulacell.cxx
+++ b/sc/source/core/data/formulacell.cxx
@@ -3366,32 +3366,6 @@ public:
                     mrGroupTokens.AddToken(aTok);
                 }
                 break;
-                case svIndex:
-                {
-                    // Named range.
-                    ScRangeName* pNames = mrDoc.GetRangeName();
-                    if (!pNames)
-                        // This should never fail.
-                        return false;
-
-                    ScRangeData* pRange = pNames->findByIndex(p->GetIndex());
-                    if (!pRange)
-                        // No named range exists by that index.
-                        return false;
-
-                    ScTokenArray* pNamedTokens = pRange->GetCode();
-                    if (!pNamedTokens)
-                        // This named range is empty.
-                        return false;
-
-                    mrGroupTokens.AddOpCode(ocOpen);
-
-                    if (!convert(*pNamedTokens))
-                        return false;
-
-                    mrGroupTokens.AddOpCode(ocClose);
-                }
-                break;
                 default:
                     mrGroupTokens.AddToken(*pToken);
             }
diff --git a/sc/source/core/tool/token.cxx b/sc/source/core/tool/token.cxx
index d74182d..9f58380 100644
--- a/sc/source/core/tool/token.cxx
+++ b/sc/source/core/tool/token.cxx
@@ -1347,6 +1347,9 @@ void ScTokenArray::CheckToken( const FormulaToken& r )
                 ;
         }
     }
+
+    if (eOp == ocName)
+        meVectorState = FormulaVectorDisabled;
 }
 
 bool ScTokenArray::ImplGetReference( ScRange& rRange, const ScAddress& rPos, bool bValidOnly ) const
commit c167d9332761ee707eb5f631de03c05a6593e7c5
Author: Kohei Yoshida <kohei.yoshida at gmail.com>
Date:   Wed Aug 7 22:59:23 2013 -0400

    Uncomment this.
    
    Change-Id: I628c826905d0c1074fbc5c12e821c0efd6489bbf

diff --git a/sc/source/core/data/formulacell.cxx b/sc/source/core/data/formulacell.cxx
index d6254c2..4a05c4c 100644
--- a/sc/source/core/data/formulacell.cxx
+++ b/sc/source/core/data/formulacell.cxx
@@ -3410,7 +3410,7 @@ bool ScFormulaCell::InterpretFormulaGroup()
 
     // Re-build formulae groups if necessary - ideally this is done at
     // import / insert / delete etc. and is integral to the data structures
-//  pDocument->RebuildFormulaGroups();
+    pDocument->RebuildFormulaGroups();
 
     if (!mxGroup || !pCode)
         return false;