diff options
| author | Vladimir Glazounov <vg@openoffice.org> | 2008-07-02 09:15:43 +0000 |
|---|---|---|
| committer | Vladimir Glazounov <vg@openoffice.org> | 2008-07-02 09:15:43 +0000 |
| commit | 4365c74780c338794f81bbafafa1355372ef3ef6 (patch) | |
| tree | 3c16cdad9b030f1a76fa1b99b895626afd86f172 /vcl | |
| parent | 272601a9b86774638ad22669081ea668298d953a (diff) | |
INTEGRATION: CWS vcl90 (1.26.54); FILE MERGED
2008/06/18 18:36:12 pl 1.26.54.2: RESYNC: (1.26-1.27); FILE MERGED
2008/05/30 15:14:04 pl 1.26.54.1: #i90094# call XInitThreads
Diffstat (limited to 'vcl')
| -rw-r--r-- | vcl/unx/source/plugadapt/salplug.cxx | 11 |
1 files changed, 10 insertions, 1 deletions
diff --git a/vcl/unx/source/plugadapt/salplug.cxx b/vcl/unx/source/plugadapt/salplug.cxx index 06f3e2cf79d5..97b394175ded 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.27 $ + * $Revision: 1.28 $ * * This file is part of OpenOffice.org. * @@ -454,6 +454,15 @@ SalInstance *CreateSalInstance() if( !(pUsePlugin && *pUsePlugin) ) pInst = check_headless_plugin(); + if( ! pInst ) + { + /* #i90094# + from now on we know that an X connection will be + established, so protect X against itself + */ + XInitThreads(); + } + if( ! pInst && !(pUsePlugin && *pUsePlugin) ) pUsePlugin = autodetect_plugin(); |