summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorOliver Bolte <obo@openoffice.org>2008-07-22 16:02:53 +0000
committerOliver Bolte <obo@openoffice.org>2008-07-22 16:02:53 +0000
commitca1999f507033184149f4aa709ee22db85e2beb3 (patch)
tree0bfd06bb9d532b55ef84809f1eae3eb90ae2e84e
parente9b7436485b73723d44c2012d08e3b128e26614e (diff)
INTEGRATION: CWS os2port03 (1.3.52); FILE MERGED
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
-rw-r--r--sal/osl/os2/process_impl.cxx4
1 files changed, 3 insertions, 1 deletions
diff --git a/sal/osl/os2/process_impl.cxx b/sal/osl/os2/process_impl.cxx
index 07e7abaa5..681f83e69 100644
--- a/sal/osl/os2/process_impl.cxx
+++ b/sal/osl/os2/process_impl.cxx
@@ -7,7 +7,7 @@
* OpenOffice.org - a multi-platform office productivity suite
*
* $RCSfile: process_impl.cxx,v $
- * $Revision: 1.4 $
+ * $Revision: 1.5 $
*
* 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);
+#if 0
OSL_ENSURE (g_command_args.m_nCount == 0, "osl_setCommandArgs(): CommandArgs already set.");
+#endif
if (g_command_args.m_nCount == 0)
{
rtl_uString** ppArgs = (rtl_uString**)rtl_allocateZeroMemory (argc * sizeof(rtl_uString*));