From 4365c74780c338794f81bbafafa1355372ef3ef6 Mon Sep 17 00:00:00 2001 From: Vladimir Glazounov Date: Wed, 2 Jul 2008 09:15:43 +0000 Subject: 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 --- vcl/unx/source/plugadapt/salplug.cxx | 11 ++++++++++- 1 file changed, 10 insertions(+), 1 deletion(-) (limited to 'vcl') 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(); -- cgit