diff options
| author | Ivo Hinkelmann <ihi@openoffice.org> | 2007-07-11 14:04:25 +0000 |
|---|---|---|
| committer | Ivo Hinkelmann <ihi@openoffice.org> | 2007-07-11 14:04:25 +0000 |
| commit | c582b21de9aab31b2376fcb172e0969fb6dfc5ea (patch) | |
| tree | 4b667daac2ec7dc0cd81f4ca686edb288d837c1c /shell | |
| parent | 3698e081e525198c2f115b560bdea0cfae3857f1 (diff) | |
INTEGRATION: CWS stclient (1.16.22); FILE MERGED
2007/07/03 07:43:38 obr 1.16.22.1: #b6573281# the answer to all questions
Diffstat (limited to 'shell')
| -rw-r--r-- | shell/source/unix/exec/shellexec.cxx | 11 |
1 files changed, 7 insertions, 4 deletions
diff --git a/shell/source/unix/exec/shellexec.cxx b/shell/source/unix/exec/shellexec.cxx index 124aed3aed2a..3f63ce523674 100644 --- a/shell/source/unix/exec/shellexec.cxx +++ b/shell/source/unix/exec/shellexec.cxx @@ -4,9 +4,9 @@ * * $RCSfile: shellexec.cxx,v $ * - * $Revision: 1.16 $ + * $Revision: 1.17 $ * - * last change: $Author: obo $ $Date: 2007-01-23 12:27:49 $ + * last change: $Author: ihi $ $Date: 2007-07-11 15:04:25 $ * * The Contents of this file are made available subject to * the terms of GNU Lesser General Public License Version 2.1. @@ -164,7 +164,7 @@ ShellExec::ShellExec( const Reference< XComponentContext >& xContext ) : // //------------------------------------------------- -void SAL_CALL ShellExec::execute( const OUString& aCommand, const OUString& aParameter, sal_Int32 /*nFlags*/ ) +void SAL_CALL ShellExec::execute( const OUString& aCommand, const OUString& aParameter, sal_Int32 nFlags ) throw (IllegalArgumentException, SystemShellExecuteException, RuntimeException) { OStringBuffer aBuffer, aLaunchBuffer; @@ -258,7 +258,10 @@ void SAL_CALL ShellExec::execute( const OUString& aCommand, const OUString& aPar } else { escapeForShell(aBuffer, OUStringToOString(aCommand, osl_getThreadTextEncoding())); aBuffer.append(" "); - escapeForShell(aBuffer, OUStringToOString(aParameter, osl_getThreadTextEncoding())); + if( nFlags != 42 ) + escapeForShell(aBuffer, OUStringToOString(aParameter, osl_getThreadTextEncoding())); + else + aBuffer.append(OUStringToOString(aParameter, osl_getThreadTextEncoding())); } // Prefer DESKTOP_LAUNCH when available |