diff options
| author | Marina Plakalovic <makkica@openoffice.org> | 2012-12-14 23:40:18 +0100 |
|---|---|---|
| committer | Eike Rathke <erack@redhat.com> | 2012-12-15 21:42:39 +0100 |
| commit | f2cb873631b8b21b54a55beaba532f4bd616a9c6 (patch) | |
| tree | 09c0fecd4bd9b265069dc512cd67db4674626220 /sc/source/ui/formdlg/dwfunctr.cxx | |
| parent | ef54346f1912c635d74c7dee8703f5f46647881d (diff) | |
calcishmakkica: #i90269# #i95144# #i101466# implement SUMIFS, AVERAGEIFS, COUNTIFS
Merged from Apache OO with adaptions.
http://svn.apache.org/viewvc?rev=1381447&view=rev
Original Apache OO committer: Andrew Rist <arist@apache.org>
Original Author: Marina Plakalovic <makkica@openoffice.org>
Original Committer: Eike Rathke [er] <eike.rathke@oracle.com>
# HG changeset patch
# User Eike Rathke [er] <eike.rathke@oracle.com>
# Date 1288810126 -3600
# Node ID 02cf226fcde498f6fd926d45df497e9fb412fe0f
# Parent 528da6bfd0daed4355d745590d5ac3a319b08fb4
Change-Id: I08754653cd2ff20536ad3e9f260f747cb127ccdd
Diffstat (limited to 'sc/source/ui/formdlg/dwfunctr.cxx')
| -rw-r--r-- | sc/source/ui/formdlg/dwfunctr.cxx | 10 |
1 files changed, 8 insertions, 2 deletions
diff --git a/sc/source/ui/formdlg/dwfunctr.cxx b/sc/source/ui/formdlg/dwfunctr.cxx index 8d48abb55f36..cc978c0f7866 100644 --- a/sc/source/ui/formdlg/dwfunctr.cxx +++ b/sc/source/ui/formdlg/dwfunctr.cxx @@ -867,10 +867,16 @@ void ScFunctionDockWin::DoEnter(sal_Bool /* bOk */) //@@ ??? aFirstArgStr = comphelper::string::strip(aFirstArgStr, ' '); aFirstArgStr.SearchAndReplaceAll(' ', '_'); aArgStr = aFirstArgStr; - if ( nArgs != VAR_ARGS ) + if ( nArgs != VAR_ARGS && nArgs != PAIRED_VAR_ARGS ) { // no VarArgs or Fix plus VarArgs, but not VarArgs only rtl::OUString aArgSep("; "); - sal_uInt16 nFix = ( nArgs < VAR_ARGS ? nArgs : nArgs - VAR_ARGS + 1 ); + sal_uInt16 nFix; + if (nArgs >= PAIRED_VAR_ARGS) + nFix = nArgs - PAIRED_VAR_ARGS + 2; + else if (nArgs >= VAR_ARGS) + nFix = nArgs - VAR_ARGS + 1; + else + nFix = nArgs; for ( sal_uInt16 nArg = 1; nArg < nFix && !pDesc->pDefArgFlags[nArg].bOptional; nArg++ ) { |