[Libreoffice-commits] core.git: sc/source

[Eike Rathke]

 sc/source/core/tool/interpr6.cxx |    6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

New commits:
commit cd4bbac0a866432adf7a7104add3a55f43636576
Author: Eike Rathke <erack at redhat.com>
Date:   Tue Jul 7 00:29:57 2015 +0200

    also ifCOUNT2 return type is always number
    
    and an on-the-fly comment translation
    
    Change-Id: I7e2d24928c3b508db39053ea768c25048bfb5d87

diff --git a/sc/source/core/tool/interpr6.cxx b/sc/source/core/tool/interpr6.cxx
index 425af00..81cf0d1 100644
--- a/sc/source/core/tool/interpr6.cxx
+++ b/sc/source/core/tool/interpr6.cxx
@@ -819,9 +819,9 @@ double ScInterpreter::IterateParameters( ScIterFunc eFunc, bool bTextAsZero )
         case ifPRODUCT: if ( !nCount ) fRes = 0.0; break;
         default: ; // nothing
     }
-    // Bei Summen etc. macht ein bool-Ergebnis keinen Sinn
-    // und Anzahl ist immer Number (#38345#)
-    if( nFuncFmtType == css::util::NumberFormat::LOGICAL || eFunc == ifCOUNT )
+    // A boolean return type makes no sense on sums et al.
+    // Counts are always numbers.
+    if( nFuncFmtType == css::util::NumberFormat::LOGICAL || eFunc == ifCOUNT || eFunc == ifCOUNT2 )
         nFuncFmtType = css::util::NumberFormat::NUMBER;
     return fRes;
 }