summaryrefslogtreecommitdiff
path: root/shell/source/unix/exec
diff options
context:
space:
mode:
authorJens-Heiner Rechtien <hr@openoffice.org>2005-09-27 11:53:50 +0000
committerJens-Heiner Rechtien <hr@openoffice.org>2005-09-27 11:53:50 +0000
commit4f28dc8748d26404c0a8d6a595fc53f0d7fa7cc9 (patch)
tree69a474379fbc54baaf3c8904d82ff019485a2976 /shell/source/unix/exec
parentb18cefb3889eafa4f432ff0c6d33511d78feb333 (diff)
INTEGRATION: CWS shellfix03 (1.11.44); FILE MERGED
2005/08/17 07:16:18 obr 1.11.44.1: #i48802# urls containing \'&\' need to get escaped
Diffstat (limited to 'shell/source/unix/exec')
-rw-r--r--shell/source/unix/exec/shellexec.cxx10
1 files changed, 6 insertions, 4 deletions
diff --git a/shell/source/unix/exec/shellexec.cxx b/shell/source/unix/exec/shellexec.cxx
index b5df094b26f0..a3fc9baab913 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.12 $
+ * $Revision: 1.13 $
*
- * last change: $Author: rt $ $Date: 2005-09-07 19:54:03 $
+ * last change: $Author: hr $ $Date: 2005-09-27 12:53:50 $
*
* The Contents of this file are made available subject to
* the terms of GNU Lesser General Public License Version 2.1.
@@ -233,14 +233,16 @@ void SAL_CALL ShellExec::execute( const OUString& aCommand, const OUString& aPar
aBuffer.append("open-url");
#endif
- aBuffer.append(" ");
+ aBuffer.append(" \'");
aBuffer.append(OUStringToOString(aURL, osl_getThreadTextEncoding()));
+ aBuffer.append("\'");
if ( pDesktopLaunch && *pDesktopLaunch )
{
aLaunchBuffer.append( pDesktopLaunch );
- aLaunchBuffer.append( " " );
+ aLaunchBuffer.append( " \'" );
aLaunchBuffer.append(OUStringToOString(aURL, osl_getThreadTextEncoding()));
+ aLaunchBuffer.append( "\'" );
}
} else {
aBuffer.append(OUStringToOString(aCommand, osl_getThreadTextEncoding()));