diff options
| author | Rüdiger Timm <rt@openoffice.org> | 2008-08-01 08:08:44 +0000 |
|---|---|---|
| committer | Rüdiger Timm <rt@openoffice.org> | 2008-08-01 08:08:44 +0000 |
| commit | 5b61276c4d9fb08e3862aaecca9c5866d471992a (patch) | |
| tree | e1dec1c0cbaae6f8087782a883709ffabd0dab18 /shell | |
| parent | 7b3379bf9943a03e5504ac1daf3857a4ce0a14b4 (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.cxx | 7 |
1 files changed, 6 insertions, 1 deletions
diff --git a/shell/source/unix/exec/shellexec.cxx b/shell/source/unix/exec/shellexec.cxx index 17e3ec7485..8623020b3e 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. * @@ -208,6 +208,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 |