diff options
| author | Jens-Heiner Rechtien <hr@openoffice.org> | 2004-02-02 17:26:20 +0000 |
|---|---|---|
| committer | Jens-Heiner Rechtien <hr@openoffice.org> | 2004-02-02 17:26:20 +0000 |
| commit | 697b378bc4ef5bb9d850bfda6498c09cea83ad16 (patch) | |
| tree | bb9894402f2eb90a91331431a1d10e2deda8a702 | |
| parent | cf6e7ca58e1cbd2a3eb557b8f4397880ec3b3747 (diff) | |
INTEGRATION: CWS geordi2q14 (1.17.56); FILE MERGED
2004/01/28 16:38:19 hr 1.17.56.1: #111934#: merge CWS vcl7pp1r3
| -rw-r--r-- | vcl/unx/source/gdi/dtint.cxx | 25 |
1 files changed, 23 insertions, 2 deletions
diff --git a/vcl/unx/source/gdi/dtint.cxx b/vcl/unx/source/gdi/dtint.cxx index abdba610bb82..53534add828e 100644 --- a/vcl/unx/source/gdi/dtint.cxx +++ b/vcl/unx/source/gdi/dtint.cxx @@ -2,9 +2,9 @@ * * $RCSfile: dtint.cxx,v $ * - * $Revision: 1.17 $ + * $Revision: 1.18 $ * - * last change: $Author: kz $ $Date: 2003-11-18 14:44:37 $ + * last change: $Author: hr $ $Date: 2004-02-02 18:26:20 $ * * The Contents of this file are made available subject to the terms of * either of the following licenses @@ -129,6 +129,27 @@ DtIntegrator* DtIntegrator::CreateDtIntegrator() if( pIntegrator->mpDisplay == pDisplay ) return pIntegrator; } + /* + * #i22061# override desktop detection + * if environment variable OOO_FORCE_DESKTOP is set + * to one of "cde" "kde" "gnome" then autodetection + * is overridden. + */ + static const char* pOverride = getenv( "OOO_FORCE_DESKTOP" ); + if( pOverride && *pOverride ) + { + OString aOver( pOverride ); +#if USE_CDE + if( aOver.equalsIgnoreAsciiCase( "cde" ) ) + return new CDEIntegrator( pFrame ); +#endif + if( aOver.equalsIgnoreAsciiCase( "kde" ) ) + return new KDEIntegrator( pFrame ); + if( aOver.equalsIgnoreAsciiCase( "gnome" ) ) + return new GNOMEIntegrator( pFrame ); + if( aOver.equalsIgnoreAsciiCase( "none" ) ) + return new DtIntegrator( pFrame ); + } Atom nDtAtom = None; |