Kaydet (Commit) c5ee4105 authored tarafından Noel Grandin's avatar Noel Grandin

simplify logic in ScFuncDesc::getFormula

Change-Id: I05fd812d1fd76e57d5305d859b2ad64d471adfb1
üst 418b5df9
......@@ -242,23 +242,17 @@ OUString ScFuncDesc::getFormula( const ::std::vector< OUString >& _aArguments )
aFormula.append( *pFuncName );
aFormula.appendAscii( "(" );
::std::vector< OUString >::const_iterator aIter = _aArguments.begin();
::std::vector< OUString >::const_iterator aEnd = _aArguments.end();
if ( nArgCount > 0 && aIter != aEnd )
if ( nArgCount > 0 && !_aArguments.empty() && !_aArguments[0].isEmpty())
{
bool bLastArg = aIter->isEmpty();
::std::vector< OUString >::const_iterator aIter = _aArguments.begin();
::std::vector< OUString >::const_iterator aEnd = _aArguments.end();
while( aIter != aEnd && !bLastArg )
aFormula.append( *aIter );
++aIter;
while( aIter != aEnd && !aIter->isEmpty() )
{
aFormula.append( *(aIter) );
if ( aIter != (aEnd-1) )
{
bLastArg = (aIter+1)->isEmpty();
if ( !bLastArg )
aFormula.append( sep );
}
aFormula.append( sep );
aFormula.append( *aIter );
++aIter;
}
}
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment