summaryrefslogtreecommitdiff
path: root/desktop
diff options
context:
space:
mode:
authorStephan Bergmann <sbergman@redhat.com>2014-12-12 09:28:47 +0100
committerStephan Bergmann <sbergman@redhat.com>2014-12-12 09:29:05 +0100
commitdf46ec0580b625efe8bd747bed54bc4d4d71f073 (patch)
treea493b2271919b09a4aa196cbe1d23d3c5a824869 /desktop
parent2d724f086f0ac9ee9a340610e0fa2c4fff110565 (diff)
osl_getCommandArg always returns osl_Process_E_None
Change-Id: I0ff1e44f17976fd3a3060d8ee7fe15d77c918b79
Diffstat (limited to 'desktop')
-rw-r--r--desktop/source/app/app.cxx2
-rw-r--r--desktop/source/splash/unxsplash.cxx3
2 files changed, 2 insertions, 3 deletions
diff --git a/desktop/source/app/app.cxx b/desktop/source/app/app.cxx
index e22f0a4eda46..e5f0a84240f4 100644
--- a/desktop/source/app/app.cxx
+++ b/desktop/source/app/app.cxx
@@ -1152,7 +1152,7 @@ void restartOnMac(bool passArguments) {
sal_uInt32 n = osl_getCommandArgCount();
for (sal_uInt32 i = 0; i < n; ++i) {
OUString arg;
- OSL_VERIFY(osl_getCommandArg(i, &arg.pData) == osl_Process_E_None);
+ osl_getCommandArg(i, &arg.pData);
if (arg.match("--accept=")) {
wait = true;
}
diff --git a/desktop/source/splash/unxsplash.cxx b/desktop/source/splash/unxsplash.cxx
index 0673286047cb..9f34c4170324 100644
--- a/desktop/source/splash/unxsplash.cxx
+++ b/desktop/source/splash/unxsplash.cxx
@@ -103,8 +103,7 @@ UnxSplashScreen::initialize( const ::com::sun::star::uno::Sequence< ::com::sun::
for ( sal_uInt32 i = 0; i < osl_getCommandArgCount(); i++ )
{
OUString aArg;
- if ( osl_getCommandArg( i, &aArg.pData ) )
- break;
+ osl_getCommandArg( i, &aArg.pData );
if ( aArg.matchIgnoreAsciiCaseAsciiL( PIPE_ARG, sizeof( PIPE_ARG ) - 1, 0 ) )
{
OUString aNum = aArg.copy( sizeof( PIPE_ARG ) - 1 );