sc/source/core/tool/interpr6.cxx | 6 +++++-
1 file changed, 5 insertions(+), 1 deletion(-)
New commits:
commit 23640b11ef01840e4bf25134e18c7a0e80323099
Author: Eike Rathke <er...@redhat.com>
AuthorDate: Fri Sep 6 13:53:28 2019 +0200
Commit: Xisco Faulí <xiscofa...@libreoffice.org>
CommitDate: Tue Sep 17 10:55:43 2019 +0200
Resolves: tdf#98844 calculate as shown with SUM() again
Change-Id: I0032bdb9a8f54baa2e599861e45691a255f45275
Reviewed-on: https://gerrit.libreoffice.org/78708
Reviewed-by: Eike Rathke <er...@redhat.com>
Tested-by: Jenkins
(cherry picked from commit 4321d8c8b09fd880a18b4106cdd1f90acc18a861)
Reviewed-on: https://gerrit.libreoffice.org/78727
Reviewed-by: Xisco Faulí <xiscofa...@libreoffice.org>
diff --git a/sc/source/core/tool/interpr6.cxx b/sc/source/core/tool/interpr6.cxx
index cbeaa8a2443a..3a77be206acc 100644
--- a/sc/source/core/tool/interpr6.cxx
+++ b/sc/source/core/tool/interpr6.cxx
@@ -817,8 +817,12 @@ void ScInterpreter::IterateParameters( ScIterFunc eFunc,
bool bTextAsZero )
if ( nGlobalError != FormulaError::NONE )
nGlobalError = FormulaError::NONE;
}
- else if ( ( eFunc == ifSUM || eFunc == ifCOUNT ) &&
mnSubTotalFlags == SubtotalFlags::NONE )
+ else if (((eFunc == ifSUM && !bCalcAsShown) || eFunc ==
ifCOUNT )
+ && mnSubTotalFlags == SubtotalFlags::NONE)
{
+ // Use fast span set array method.
+ // ifSUM with bCalcAsShown has to use the slow bells and
+ // whistles ScValueIterator below.
sc::RangeColumnSpanSet aSet( aRange );
if ( eFunc == ifSUM )
_______________________________________________
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
