strepsirrhini/office-gobmx
9
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

INTEGRATION: CWS os2port03 (1.3.52); FILE MERGED

Browse source 
2008/07/16 12:25:56 obr 1.3.52.2: RESYNC: (1.3-1.4); FILE MERGED
2008/01/14 17:01:00 ydario 1.3.52.1: remove slash from macro.hxx, it is used as path separator.
Issue number:i85203
Submitted by:ydario
This commit is contained in:
Oliver Bolte 2008-07-22 16:02:53 +00:00
parent d56fd2f2fe
commit 7dd416b76e
1 changed files with 3 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
sal/osl/os2/process_impl.cxx
View file

@ -7,7 +7,7 @@
* OpenOffice.org - a multi-platform office productivity suite * OpenOffice.org - a multi-platform office productivity suite
* *
* $RCSfile: process_impl.cxx,v $ * $RCSfile: process_impl.cxx,v $
* $Revision: 1.4 $ * $Revision: 1.5 $
* *
* This file is part of OpenOffice.org. * This file is part of OpenOffice.org.
* *
@ -195,7 +195,9 @@ void SAL_CALL osl_setCommandArgs (int argc, char ** argv)
{ {
osl_acquireMutex(g_command_args.m_mutex); osl_acquireMutex(g_command_args.m_mutex);
#if 0
OSL_ENSURE (g_command_args.m_nCount == 0, "osl_setCommandArgs(): CommandArgs already set."); OSL_ENSURE (g_command_args.m_nCount == 0, "osl_setCommandArgs(): CommandArgs already set.");
#endif
if (g_command_args.m_nCount == 0) if (g_command_args.m_nCount == 0)
{ {
rtl_uString** ppArgs = (rtl_uString**)rtl_allocateZeroMemory (argc * sizeof(rtl_uString*)); rtl_uString** ppArgs = (rtl_uString**)rtl_allocateZeroMemory (argc * sizeof(rtl_uString*));