strepsirrhini/office-gobmx
9
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

INTEGRATION: CWS register30 (1.20.16); FILE MERGED

Browse source 
2008/07/31 10:42:54 obr 1.20.16.1: #158122# default to GNOME desktop environment on Solaris
This commit is contained in:
Rüdiger Timm 2008-08-01 08:08:44 +00:00
parent 33e73f6d9a
commit 282fbc066e
1 changed files with 6 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

7
shell/source/unix/exec/shellexec.cxx
View file

@ -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.