diff options
| author | Vladimir Glazounov <vg@openoffice.org> | 2008-08-18 12:05:44 +0000 |
|---|---|---|
| committer | Vladimir Glazounov <vg@openoffice.org> | 2008-08-18 12:05:44 +0000 |
| commit | ad868684cadd278859f1beeb839045f4de5adaec (patch) | |
| tree | fc05269dcf5d893609a4fc4d54e5a46f8a2dadd8 /vcl | |
| parent | 9aa1361baf8d2d6e7ce33ad01a5477e0021e40e2 (diff) | |
INTEGRATION: CWS vcl30stop2 (1.28.36); FILE MERGED
2008/07/25 09:03:20 pl 1.28.36.1: #i92121# make XInitThreads optional (but on by default)
Diffstat (limited to 'vcl')
| -rw-r--r-- | vcl/unx/source/plugadapt/salplug.cxx | 8 |
1 files changed, 6 insertions, 2 deletions
diff --git a/vcl/unx/source/plugadapt/salplug.cxx b/vcl/unx/source/plugadapt/salplug.cxx index a5b83593ad25..8ae294c97d6d 100644 --- a/vcl/unx/source/plugadapt/salplug.cxx +++ b/vcl/unx/source/plugadapt/salplug.cxx @@ -7,7 +7,7 @@ * OpenOffice.org - a multi-platform office productivity suite * * $RCSfile: salplug.cxx,v $ - * $Revision: 1.29 $ + * $Revision: 1.30 $ * * This file is part of OpenOffice.org. * @@ -477,11 +477,15 @@ SalInstance *CreateSalInstance() if( ! pInst ) { + /* #i92121# workaround deadlocks in the X11 implementation + */ + static const char* pNoXInitThreads = getenv( "SAL_NO_XINITTHREADS" ); /* #i90094# from now on we know that an X connection will be established, so protect X against itself */ - XInitThreads(); + if( ! ( pNoXInitThreads && *pNoXInitThreads ) ) + XInitThreads(); } if( ! pInst && !(pUsePlugin && *pUsePlugin) ) |