Tag: cws_src680_rptwizard01 User: lla Date: 2008-04-02 13:40:23+0000 Modified: dba/reportdesign/source/core/api/ReportDefinition.cxx
Log: #i87743# deadlock fixed with lock solar mutex File Changes: Directory: /dba/reportdesign/source/core/api/ ============================================= File [changed]: ReportDefinition.cxx Url: http://dba.openoffice.org/source/browse/dba/reportdesign/source/core/api/ReportDefinition.cxx?r1=1.5.24.1&r2=1.5.24.2 Delta lines: +5 -2 ------------------- --- ReportDefinition.cxx 2008-02-14 13:36:58+0000 1.5.24.1 +++ ReportDefinition.cxx 2008-04-02 13:40:20+0000 1.5.24.2 @@ -4,9 +4,9 @@ * * $RCSfile: ReportDefinition.cxx,v $ * - * $Revision: 1.5.24.1 $ + * $Revision: 1.5.24.2 $ * - * last change: $Author: lla $ $Date: 2008/02/14 13:36:58 $ + * last change: $Author: lla $ $Date: 2008/04/02 13:40:20 $ * * The Contents of this file are made available subject to * the terms of GNU Lesser General Public License Version 2.1. @@ -1384,6 +1384,9 @@ // XModel ::sal_Bool SAL_CALL OReportDefinition::attachResource( const ::rtl::OUString& /*_rURL*/, const uno::Sequence< beans::PropertyValue >& _aArguments ) throw (uno::RuntimeException) { + // LLA: we had a deadlock problem in our context, so we get the SolarMutex earlier. + ::vos::OClearableGuard aSolarGuard( Application::GetSolarMutex() ); + ::osl::MutexGuard aGuard(m_aMutex); ::connectivity::checkDisposed(ReportDefinitionBase::rBHelper.bDisposed); ::comphelper::MediaDescriptor aDescriptor( _aArguments ); --------------------------------------------------------------------- To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, e-mail: [EMAIL PROTECTED]
