mir/libreoffice
2
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

INTEGRATION: CWS warnings01 (1.8.48); FILE MERGED

Browse Source 
2005/09/22 22:29:05 sb 1.8.48.2: RESYNC: (1.8-1.9); FILE MERGED
2005/09/05 13:32:29 sb 1.8.48.1: #i53898# Made code warning-free.
This commit is contained in:
Jens-Heiner Rechtien
2006-06-20 01:25:07 +00:00
parent b3ebac8fc0
commit 4e56ed5205
1 changed files with 9 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
codemaker/source/javamaker/javaoptions.cxx
View File

@@ -4,9 +4,9 @@
* *
* $RCSfile: javaoptions.cxx,v $ * $RCSfile: javaoptions.cxx,v $
* *
* $Revision: 1.9 $ * $Revision: 1.10 $
* *
* last change: $Author: rt $ $Date: 2005-09-08 02:17:45 $ * last change: $Author: hr $ $Date: 2006-06-20 02:25:07 $
* *
* The Contents of this file are made available subject to * The Contents of this file are made available subject to
* the terms of GNU Lesser General Public License Version 2.1. * the terms of GNU Lesser General Public License Version 2.1.
@@ -220,7 +220,6 @@ sal_Bool JavaOptions::initOptions(int ac, char* av[], sal_Bool bCmdFile)
default: default:
throw IllegalArgument("the option is unknown" + OString(av[i])); throw IllegalArgument("the option is unknown" + OString(av[i]));
break;
} }
} else } else
{ {
@@ -246,9 +245,9 @@ sal_Bool JavaOptions::initOptions(int ac, char* av[], sal_Bool bCmdFile)
ret = initOptions(rargc, rargv, 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 } else
@@ -259,7 +258,11 @@ sal_Bool JavaOptions::initOptions(int ac, char* av[], sal_Bool bCmdFile)
} else } else
{ {
OUString system_filepath; 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())); m_inputFiles.push_back(OUStringToOString(system_filepath, osl_getThreadTextEncoding()));
} }
} }