INTEGRATION: CWS warnings01 (1.8.48); FILE MERGED

2006/04/07 20:38:39 sb 1.8.48.3: RESYNC: (1.9-1.10); FILE MERGED
2005/09/22 22:24:25 sb 1.8.48.2: RESYNC: (1.8-1.9); FILE MERGED
2005/09/05 13:32:25 sb 1.8.48.1: #i53898# Made code warning-free.
This commit is contained in:
Jens-Heiner Rechtien
2006-06-20 01:23:45 +00:00
parent c2828a5ef4
commit dada37c989

View File

@@ -4,9 +4,9 @@
*
* $RCSfile: cppuoptions.cxx,v $
*
* $Revision: 1.10 $
* $Revision: 1.11 $
*
* last change: $Author: vg $ $Date: 2006-03-15 09:13:03 $
* last change: $Author: hr $ $Date: 2006-06-20 02:23:45 $
*
* The Contents of this file are made available subject to
* the terms of GNU Lesser General Public License Version 2.1.
@@ -270,7 +270,6 @@ sal_Bool CppuOptions::initOptions(int ac, char* av[], sal_Bool bCmdFile)
default:
throw IllegalArgument("the option is unknown" + OString(av[i]));
break;
}
} else
{
@@ -296,9 +295,9 @@ sal_Bool CppuOptions::initOptions(int ac, char* av[], sal_Bool bCmdFile)
ret = initOptions(rargc, rargv, bCmdFile);
for (long i=0; i < rargc; i++)
for (long j=0; j < rargc; j++)
{
free(rargv[i]);
free(rargv[j]);
}
}
} else
@@ -309,7 +308,11 @@ sal_Bool CppuOptions::initOptions(int ac, char* av[], sal_Bool bCmdFile)
} else
{
OUString system_filepath;
OSL_VERIFY( osl_Process_E_None == osl_getCommandArg( i-1, &system_filepath.pData ) );
if (osl_getCommandArg( i-1, &system_filepath.pData )
!= osl_Process_E_None)
{
OSL_ASSERT(false);
}
m_inputFiles.push_back(OUStringToOString(system_filepath, osl_getThreadTextEncoding()));
}
}