summaryrefslogtreecommitdiff
path: root/shell
diff options
context:
space:
mode:
authorRĂ¼diger Timm <rt@openoffice.org>2008-08-01 08:08:44 +0000
committerRĂ¼diger Timm <rt@openoffice.org>2008-08-01 08:08:44 +0000
commit282fbc066eaa75073ff27d38e9daf7cb64c3fe97 (patch)
tree11f9dc04f80ff4a864695abbb131770f3438def4 /shell
parent33e73f6d9a5ad5c60ce6981e8c8b1cc3b49cfe29 (diff)
INTEGRATION: CWS register30 (1.20.16); FILE MERGED
2008/07/31 10:42:54 obr 1.20.16.1: #158122# default to GNOME desktop environment on Solaris
Diffstat (limited to 'shell')
-rw-r--r--shell/source/unix/exec/shellexec.cxx7
1 files changed, 6 insertions, 1 deletions
diff --git a/shell/source/unix/exec/shellexec.cxx b/shell/source/unix/exec/shellexec.cxx
index e65e3f3425e9..7bbe7a3c97d1 100644
--- a/shell/source/unix/exec/shellexec.cxx
+++ b/shell/source/unix/exec/shellexec.cxx
@@ -7,7 +7,7 @@
* OpenOffice.org - a multi-platform office productivity suite
*
* $RCSfile: shellexec.cxx,v $
- * $Revision: 1.20 $
+ * $Revision: 1.21 $
*
* This file is part of OpenOffice.org.
*
@@ -209,6 +209,11 @@ void SAL_CALL ShellExec::execute( const OUString& aCommand, const OUString& aPar
OString aTmp = OUStringToOString(aProgram, osl_getThreadTextEncoding());
escapeForShell(aBuffer, aTmp);
+#ifdef SOLARIS
+ if ( m_aDesktopEnvironment.getLength() == 0 )
+ m_aDesktopEnvironment = OString("GNOME");
+#endif
+
// Respect the desktop environment - if there is an executable named
// <desktop-environement-is>-open-url, pass the url to this one instead
// of the default "open-url" script.