[Libreoffice-commits] core.git: Branch 'private/kohei/calc-shared-string' - 2 commits - sc/source

[Kohei Yoshida]

 sc/source/core/tool/token.cxx |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

New commits:
commit a24c3ea4c4fd6c13cd5bb11326aaf5c23557222c
Author: Kohei Yoshida <kohei.yoshida at collabora.com>
Date:   Wed Oct 16 12:26:05 2013 -0400

    Enable group calculation on SUMIFS.
    
    Change-Id: I0c02204d08c73668b2564360486f843e5e7b69d0

diff --git a/sc/source/core/tool/token.cxx b/sc/source/core/tool/token.cxx
index 83f7852..22c1738 100644
--- a/sc/source/core/tool/token.cxx
+++ b/sc/source/core/tool/token.cxx
@@ -1338,6 +1338,7 @@ void ScTokenArray::CheckToken( const FormulaToken& r )
             case ocMax:
             case ocMaxA:
             case ocSum:
+            case ocSumIfs:
             case ocSumProduct:
             case ocCount:
             case ocCount2:
commit be798354837d7a908830b649f194e3174176854a
Author: Kohei Yoshida <kohei.yoshida at collabora.com>
Date:   Wed Oct 16 12:14:13 2013 -0400

    We actually don't want to allow group-calc on matrix inverse.
    
    This one is accelerated for a single cell calculation case only.
    
    Change-Id: I1f66fc6bb20f08f45d47ae596fb201b838b17408

diff --git a/sc/source/core/tool/token.cxx b/sc/source/core/tool/token.cxx
index ab9e3a9..83f7852 100644
--- a/sc/source/core/tool/token.cxx
+++ b/sc/source/core/tool/token.cxx
@@ -1339,7 +1339,6 @@ void ScTokenArray::CheckToken( const FormulaToken& r )
             case ocMaxA:
             case ocSum:
             case ocSumProduct:
-            case ocMatInv:
             case ocCount:
             case ocCount2:
             case ocVLookup: