summaryrefslogtreecommitdiff
path: root/formula/source
diff options
context:
space:
mode:
authorWinfried Donkers <winfrieddonkers@libreoffice.org>2014-05-23 15:24:48 +0200
committerEike Rathke <erack@redhat.com>2014-07-08 10:23:03 +0000
commit08e3e6c223c266874a4acf3885997ea6426aa9bd (patch)
tree674b0bc1db69d92ecec7b8bf459890c795eed8bc /formula/source
parent579d9ae1c5873f78dbe0364c83842de8556f6ccb (diff)
fdo#73148 add options to Calc function AGGREGATE
matrix-ranges not supported Change-Id: I902c78da6d9c7a4a5f8c5e4a7e1678b69d49a6fe Reviewed-on: https://gerrit.libreoffice.org/9449 Reviewed-by: Eike Rathke <erack@redhat.com> Tested-by: Eike Rathke <erack@redhat.com>
Diffstat (limited to 'formula/source')
-rw-r--r--formula/source/core/api/FormulaCompiler.cxx3
1 files changed, 2 insertions, 1 deletions
diff --git a/formula/source/core/api/FormulaCompiler.cxx b/formula/source/core/api/FormulaCompiler.cxx
index 2e066af8d01d..5f63fcf9928a 100644
--- a/formula/source/core/api/FormulaCompiler.cxx
+++ b/formula/source/core/api/FormulaCompiler.cxx
@@ -1089,7 +1089,8 @@ bool FormulaCompiler::GetToken()
mpToken = new FormulaByteToken( ocStop );
return false;
}
- if( mpToken->GetOpCode() == ocSubTotal )
+ if ( mpToken->GetOpCode() == ocSubTotal ||
+ mpToken->GetOpCode() == ocAggregate )
glSubTotal = true;
else if ( mpToken->IsExternalRef() )
{