dwfunctr.cxx (b3f79822) dwfunctr.cxx (1b1b70fb)
1/**************************************************************
2 *
3 * Licensed to the Apache Software Foundation (ASF) under one
4 * or more contributor license agreements. See the NOTICE file
5 * distributed with this work for additional information
6 * regarding copyright ownership. The ASF licenses this file
7 * to you under the Apache License, Version 2.0 (the
8 * "License"); you may not use this file except in compliance

--- 898 unchanged lines hidden (view full) ---

907 if(nArgs>0)
908 {
909 // NOTE: Theoretically the first parameter could have the
910 // suppress flag as well, but practically it doesn't.
911 aFirstArgStr = *(pDesc->ppDefArgNames[0]);
912 aFirstArgStr.EraseLeadingAndTrailingChars();
913 aFirstArgStr.SearchAndReplaceAll(' ', '_');
914 aArgStr = aFirstArgStr;
1/**************************************************************
2 *
3 * Licensed to the Apache Software Foundation (ASF) under one
4 * or more contributor license agreements. See the NOTICE file
5 * distributed with this work for additional information
6 * regarding copyright ownership. The ASF licenses this file
7 * to you under the Apache License, Version 2.0 (the
8 * "License"); you may not use this file except in compliance

--- 898 unchanged lines hidden (view full) ---

907 if(nArgs>0)
908 {
909 // NOTE: Theoretically the first parameter could have the
910 // suppress flag as well, but practically it doesn't.
911 aFirstArgStr = *(pDesc->ppDefArgNames[0]);
912 aFirstArgStr.EraseLeadingAndTrailingChars();
913 aFirstArgStr.SearchAndReplaceAll(' ', '_');
914 aArgStr = aFirstArgStr;
915 if ( nArgs != VAR_ARGS )
915 if ( nArgs != VAR_ARGS && nArgs != PAIRED_VAR_ARGS )
916 { // no VarArgs or Fix plus VarArgs, but not VarArgs only
917 String aArgSep = String::CreateFromAscii(RTL_CONSTASCII_STRINGPARAM( "; " ));
916 { // no VarArgs or Fix plus VarArgs, but not VarArgs only
917 String aArgSep = String::CreateFromAscii(RTL_CONSTASCII_STRINGPARAM( "; " ));
918 sal_uInt16 nFix = ( nArgs < VAR_ARGS ? nArgs : nArgs - VAR_ARGS + 1 );
918 sal_uInt16 nFix;
919 if (nArgs >= PAIRED_VAR_ARGS)
920 nFix = nArgs - PAIRED_VAR_ARGS + 2;
921 else if (nArgs >= VAR_ARGS)
922 nFix = nArgs - VAR_ARGS + 1;
923 else
924 nFix = nArgs;
919 for ( sal_uInt16 nArg = 1;
920 nArg < nFix && !pDesc->pDefArgFlags[nArg].bOptional; nArg++ )
921 {
922 if (!pDesc->pDefArgFlags[nArg].bSuppress)
923 {
924 aArgStr += aArgSep;
925 String sTmp(*(pDesc->ppDefArgNames[nArg]));
926 sTmp.EraseLeadingAndTrailingChars();

--- 252 unchanged lines hidden --- 		925 for ( sal_uInt16 nArg = 1;
926 nArg < nFix && !pDesc->pDefArgFlags[nArg].bOptional; nArg++ )
927 {
928 if (!pDesc->pDefArgFlags[nArg].bSuppress)
929 {
930 aArgStr += aArgSep;
931 String sTmp(*(pDesc->ppDefArgNames[nArg]));
932 sTmp.EraseLeadingAndTrailingChars();

--- 252 unchanged lines hidden ---