View | Details | Raw Unified | Return to issue 119942
Collapse All | Expand All

(-)sc/source/filter/excel/excform.cxx (-1 / +32 lines)
Lines 1525-1530 Link Here
1525
    return rRangeList.Count() != 0;
1525
    return rRangeList.Count() != 0;
1526
}
1526
}
1527
1527
1528
static DefTokenId missArgForZeroList[] = {
1529
	ocCount,
1530
	ocCount2,
1531
	ocAverage,
1532
	ocMin,
1533
	ocMinA,
1534
	ocMax,
1535
	ocMaxA,
1536
	ocStDev,
1537
	ocStDevA,
1538
	ocVar,
1539
	ocVarP,
1540
	ocAveDev,
1541
	ocKurt,
1542
	ocSchiefe,
1543
	ocVarPA,
1544
	ocVarA,
1545
	ocDevSq
1546
};
1547
1548
#define missArgForZeroCount sizeof(missArgForZeroList)/sizeof(DefTokenId)
1549
1550
1551
sal_Bool lcl_isInMissArgForZeroList(DefTokenId id)
1552
{
1553
	for(short index = 0; index < missArgForZeroCount; index++)
1554
		if(missArgForZeroList[index] == id)
1555
			return sal_True;
1556
	return sal_False;
1557
1558
}
1528
void ExcelToSc::DoMulArgs( DefTokenId eId, sal_uInt8 nAnz, sal_uInt8 nMinParamCount )
1559
void ExcelToSc::DoMulArgs( DefTokenId eId, sal_uInt8 nAnz, sal_uInt8 nMinParamCount )
1529
{
1560
{
1530
	TokenId					eParam[ 256 ];
1561
	TokenId					eParam[ 256 ];
Lines 1575-1581 Link Here
1575
			nSkipEnd = 0;		// letzten Parameter bei Bedarf weglassen
1606
			nSkipEnd = 0;		// letzten Parameter bei Bedarf weglassen
1576
1607
1577
		// Joost-Spezialfaelle
1608
		// Joost-Spezialfaelle
1578
		else if( eId == ocIf )
1609
		else if( eId == ocIf || lcl_isInMissArgForZeroList(eId))
1579
		{
1610
		{
1580
			sal_uInt16			nNullParam = 0;
1611
			sal_uInt16			nNullParam = 0;
1581
			for( nLauf = 0 ; nLauf < nAnz ; nLauf++ )
1612
			for( nLauf = 0 ; nLauf < nAnz ; nLauf++ )

Return to issue 119942