diff options
| author | Juergen Schmidt <jsc@openoffice.org> | 2002-11-21 09:49:33 +0000 |
|---|---|---|
| committer | Juergen Schmidt <jsc@openoffice.org> | 2002-11-21 09:49:33 +0000 |
| commit | 28b696f1472e688bda64fd6da4c9c1c8030413ba (patch) | |
| tree | bb34fc5cdb15a1a8440e7fec6b26063e9e897f2a | |
| parent | a634061cb9349ddba60cc4ed52f767e1a8950815 (diff) | |
#105422# special work for command file
| -rw-r--r-- | codemaker/source/cppumaker/cppuoptions.cxx | 18 | ||||
| -rw-r--r-- | codemaker/source/javamaker/javaoptions.cxx | 17 |
2 files changed, 22 insertions, 13 deletions
diff --git a/codemaker/source/cppumaker/cppuoptions.cxx b/codemaker/source/cppumaker/cppuoptions.cxx index cdc10ec15ab5..4303c981a552 100644 --- a/codemaker/source/cppumaker/cppuoptions.cxx +++ b/codemaker/source/cppumaker/cppuoptions.cxx @@ -2,9 +2,9 @@ * * $RCSfile: cppuoptions.cxx,v $ * - * $Revision: 1.6 $ + * $Revision: 1.7 $ * - * last change: $Author: jsc $ $Date: 2002-11-20 16:17:48 $ + * last change: $Author: jsc $ $Date: 2002-11-21 10:48:18 $ * * The Contents of this file are made available subject to the terms of * either of the following licenses @@ -267,7 +267,6 @@ sal_Bool CppuOptions::initOptions(int ac, char* av[], sal_Bool bCmdFile) m_options["-G"] = OString(""); break; - case 'X': // support for eXtra type rdbs { if (av[i][2] == '\0') @@ -330,10 +329,15 @@ 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 ) ); - m_inputFiles.push_back(OUStringToOString(system_filepath, osl_getThreadTextEncoding())); -// m_inputFiles.push_back(av[i]); + if (bCmdFile) + { + m_inputFiles.push_back(av[i]); + } else + { + OUString system_filepath; + OSL_VERIFY( osl_Process_E_None == osl_getCommandArg( i-1, &system_filepath.pData ) ); + m_inputFiles.push_back(OUStringToOString(system_filepath, osl_getThreadTextEncoding())); + } } } } diff --git a/codemaker/source/javamaker/javaoptions.cxx b/codemaker/source/javamaker/javaoptions.cxx index 4311c08faed6..024e353e0af9 100644 --- a/codemaker/source/javamaker/javaoptions.cxx +++ b/codemaker/source/javamaker/javaoptions.cxx @@ -2,9 +2,9 @@ * * $RCSfile: javaoptions.cxx,v $ * - * $Revision: 1.5 $ + * $Revision: 1.6 $ * - * last change: $Author: jsc $ $Date: 2002-11-20 16:20:29 $ + * last change: $Author: jsc $ $Date: 2002-11-21 10:49:33 $ * * The Contents of this file are made available subject to the terms of * either of the following licenses @@ -251,10 +251,15 @@ sal_Bool JavaOptions::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 ) ); - m_inputFiles.push_back(OUStringToOString(system_filepath, osl_getThreadTextEncoding())); -// m_inputFiles.push_back(av[i]); + if (bCmdFile) + { + m_inputFiles.push_back(av[i]); + } else + { + OUString system_filepath; + OSL_VERIFY( osl_Process_E_None == osl_getCommandArg( i-1, &system_filepath.pData ) ); + m_inputFiles.push_back(OUStringToOString(system_filepath, osl_getThreadTextEncoding())); + } } } } |