openoffice-gnome-desktop-force.patch

   1 Index: vcl/unx/source/gdi/dtint.cxx
   2 ===================================================================
   3 RCS file: /cvs/gsl/vcl/unx/source/gdi/dtint.cxx,v
   4 retrieving revision 1.16
   5 retrieving revision 1.16.112.2
   6 diff -u -3 -p -r1.16 -r1.16.112.2
   7 --- vcl/unx/source/gdi/dtint.cxx        28 May 2003 12:33:47 -0000      1.16
   8 +++ vcl/unx/source/gdi/dtint.cxx        10 Nov 2003 10:43:05 -0000      1.16.112.2
   9 @@ -138,6 +138,27 @@ DtIntegrator* DtIntegrator::CreateDtInte
  10                 if( pIntegrator->mpDisplay == pDisplay )
  11                         return pIntegrator;
  12         }
  13 +    /*
  14 +     *  #i22061# override desktop detection
  15 +     *  if environment variable OOO_FORCE_DESKTOP is set
  16 +     *  to one of "cde" "kde" "gnome" then autodetection
  17 +     *  is overridden.
  18 +     */
  19 +    static const char* pOverride = getenv( "OOO_FORCE_DESKTOP" );
  20 +    if( pOverride && *pOverride )
  21 +    {
  22 +        OString aOver( pOverride );
  23 +#if USE_CDE
  24 +        if( aOver.equalsIgnoreAsciiCase( "cde" ) == 0 )
  25 +            return new CDEIntegrator( pFrame );
  26 +#endif
  27 +        if( aOver.equalsIgnoreAsciiCase( "kde" ) == 0 )
  28 +            return new KDEIntegrator( pFrame );
  29 +        if( aOver.equalsIgnoreAsciiCase( "gnome" ) == 0 )
  30 +            return new GNOMEIntegrator( pFrame );
  31 +        if( aOver.equalsIgnoreAsciiCase( "none" ) == 0 )
  32 +            return new DtIntegrator( pFrame );
  33 +    }
  34
  35         Atom nDtAtom = None;
  36