From 8cc874643e70c80d7aaa8c205f5f70b9e340c27a Mon Sep 17 00:00:00 2001 From: Kurt Zenker Date: Wed, 5 Mar 2008 16:39:45 +0000 Subject: [PATCH] INTEGRATION: CWS aquavcl05_DEV300 (1.77.64); FILE MERGED 2008/01/25 16:12:24 pl 1.77.64.1: #i83126# avoid deadlocks --- sfx2/source/appl/sfxhelp.cxx | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/sfx2/source/appl/sfxhelp.cxx b/sfx2/source/appl/sfxhelp.cxx index ac3f7a05648b..b4b88ed9ca09 100644 --- a/sfx2/source/appl/sfxhelp.cxx +++ b/sfx2/source/appl/sfxhelp.cxx @@ -4,9 +4,9 @@ * * $RCSfile: sfxhelp.cxx,v $ * - * $Revision: 1.77 $ + * $Revision: 1.78 $ * - * last change: $Author: ihi $ $Date: 2007-11-19 13:04:57 $ + * last change: $Author: kz $ $Date: 2008-03-05 17:39:45 $ * * The Contents of this file are made available subject to * the terms of GNU Lesser General Public License Version 2.1. @@ -243,6 +243,7 @@ sal_Bool GetHelpAnchor_Impl( const String& _rURL, String& _rAnchor ) sal_Bool bRet = sal_False; ::rtl::OUString sAnchor; + ULONG nSolarCount = Application::ReleaseSolarMutex(); try { ::ucbhelper::Content aCnt( INetURLObject( _rURL ).GetMainURL( INetURLObject::NO_DECODE ), @@ -264,6 +265,7 @@ sal_Bool GetHelpAnchor_Impl( const String& _rURL, String& _rAnchor ) catch( ::com::sun::star::uno::Exception& ) { } + Application::AcquireSolarMutex( nSolarCount ); return bRet; }