summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorVladimir Glazounov <vg@openoffice.org>2007-10-15 12:00:59 +0000
committerVladimir Glazounov <vg@openoffice.org>2007-10-15 12:00:59 +0000
commit8cd31f813291d6799f947a0eafa831648875789b (patch)
treeab2796d828d52bc8e0cdd1edba4cf6bc092bb2cd
parentc0a1f056bfedc5a4acb3aa7303dcd69dd0d46231 (diff)
INTEGRATION: CWS sb71 (1.5.52); FILE MERGED
2007/08/23 18:15:24 sb 1.5.52.3: RESYNC: (1.6-1.7); FILE MERGED 2007/05/30 14:47:25 sb 1.5.52.2: RESYNC: (1.5-1.6); FILE MERGED 2007/04/24 07:44:55 sb 1.5.52.1: #i75466# Removed wrong (and superfluous) asserts.
-rw-r--r--desktop/source/pkgchk/unopkg/unopkg_app.cxx12
1 files changed, 4 insertions, 8 deletions
diff --git a/desktop/source/pkgchk/unopkg/unopkg_app.cxx b/desktop/source/pkgchk/unopkg/unopkg_app.cxx
index 4ceab707a4..c17701ce76 100644
--- a/desktop/source/pkgchk/unopkg/unopkg_app.cxx
+++ b/desktop/source/pkgchk/unopkg/unopkg_app.cxx
@@ -5,9 +5,9 @@
*
* $RCSfile: unopkg_app.cxx,v $
*
- * $Revision: 1.7 $
+ * $Revision: 1.8 $
*
- * last change: $Author: ihi $ $Date: 2007-08-17 11:52:20 $
+ * last change: $Author: vg $ $Date: 2007-10-15 13:00:59 $
*
* The Contents of this file are made available subject to
* the terms of GNU Lesser General Public License Version 2.1.
@@ -249,9 +249,7 @@ SAL_IMPLEMENT_MAIN()
return 0;
}
else {
- oslProcessError rc = osl_getCommandArg( 0, &subCommand.pData );
- if (rc != osl_Process_E_None )
- OSL_ASSERT(0);
+ osl_getCommandArg( 0, &subCommand.pData );
++nPos;
subCommand = subCommand.trim();
subcmd_add = subCommand.equalsAsciiL(
@@ -273,9 +271,7 @@ SAL_IMPLEMENT_MAIN()
!readArgument( &deploymentContext, info_context, &nPos ) &&
!isBootstrapVariable(&nPos))
{
- oslProcessError rc = osl_getCommandArg( nPos, &cmdArg.pData );
- if (rc != osl_Process_E_None )
- OSL_ASSERT(0);
+ osl_getCommandArg( nPos, &cmdArg.pData );
++nPos;
cmdArg = cmdArg.trim();
if (cmdArg.getLength() > 0)