From 282fbc066eaa75073ff27d38e9daf7cb64c3fe97 Mon Sep 17 00:00:00 2001 From: Rüdiger Timm Date: Fri, 1 Aug 2008 08:08:44 +0000 Subject: 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 --- shell/source/unix/exec/shellexec.cxx | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) (limited to 'shell') 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 // -open-url, pass the url to this one instead // of the default "open-url" script. -- cgit v1.2.3