diff options
| author | Rüdiger Timm <rt@openoffice.org> | 2008-07-07 15:27:25 +0000 |
|---|---|---|
| committer | Rüdiger Timm <rt@openoffice.org> | 2008-07-07 15:27:25 +0000 |
| commit | dbd704b56b2fb62a007fc35dd6431b9285423f79 (patch) | |
| tree | abd11ad8a5927c86a73179ec291899dab948a88f /desktop/source/app | |
| parent | 57beb5a71e8a189628536487fe80d60192903e4e (diff) | |
INTEGRATION: CWS native161 (1.61.16); FILE MERGED
2008/06/18 12:15:41 sb 1.61.16.1: #i90831# do not send UNO bootstrap command line arguments over the pipe
Diffstat (limited to 'desktop/source/app')
| -rw-r--r-- | desktop/source/app/officeipcthread.cxx | 9 |
1 files changed, 5 insertions, 4 deletions
diff --git a/desktop/source/app/officeipcthread.cxx b/desktop/source/app/officeipcthread.cxx index b3ecc23e82..8742370f9b 100644 --- a/desktop/source/app/officeipcthread.cxx +++ b/desktop/source/app/officeipcthread.cxx @@ -7,7 +7,7 @@ * OpenOffice.org - a multi-platform office productivity suite * * $RCSfile: officeipcthread.cxx,v $ - * $Revision: 1.61 $ + * $Revision: 1.62 $ * * This file is part of OpenOffice.org. * @@ -52,6 +52,7 @@ #include <rtl/strbuf.hxx> #include <comphelper/processfactory.hxx> #include "osl/file.hxx" +#include "rtl/process.h" #include "tools/getprocessworkingdir.hxx" using namespace vos; @@ -525,10 +526,10 @@ OfficeIPCThread::Status OfficeIPCThread::EnableOfficeIPCThread() { aArguments += '0'; } - ULONG nCount = aInfo.getCommandArgCount(); - for( ULONG i=0; i < nCount; i++ ) + sal_uInt32 nCount = rtl_getAppCommandArgCount(); + for( sal_uInt32 i=0; i < nCount; i++ ) { - aInfo.getCommandArg( i, aDummy ); + rtl_getAppCommandArg( i, &aDummy.pData ); if( aDummy.indexOf('-',0) != 0 ) { bWaitBeforeClose = sal_True; |