User: kz Date: 2008-06-26 09:01:25+0000 Modified: dba/dbaccess/source/core/dataaccess/intercept.cxx
Log: INTEGRATION: CWS rptwizard01 (1.8.228); FILE MERGED 2008/05/21 11:00:01 lla 1.8.228.3: RESYNC: (1.9-1.10); FILE MERGED 2008/02/15 07:37:22 lla 1.8.228.2: RESYNC: (1.8-1.9); FILE MERGED 2008/02/14 13:20:24 lla 1.8.228.1: #i86092# change a mutex to a clearable mutex or it could be possible to hang in report wizard File Changes: Directory: /dba/dbaccess/source/core/dataaccess/ ================================================ File [changed]: intercept.cxx Url: http://dba.openoffice.org/source/browse/dba/dbaccess/source/core/dataaccess/intercept.cxx?r1=1.12&r2=1.13 Delta lines: +4 -2 ------------------- --- intercept.cxx 2008-06-25 12:33:13+0000 1.12 +++ intercept.cxx 2008-06-26 09:01:23+0000 1.13 @@ -140,7 +140,7 @@ //XDispatch void SAL_CALL OInterceptor::dispatch( const URL& _URL,const Sequence<PropertyValue >& Arguments ) throw (RuntimeException) { - osl::MutexGuard aGuard(m_aMutex); + osl::ClearableMutexGuard aClearableGuard(m_aMutex); if( m_pContentHolder ) { if( _URL.Complete == m_aInterceptedURL[DISPATCH_SAVE] ) @@ -149,7 +149,8 @@ } else if( _URL.Complete == m_aInterceptedURL[DISPATCH_RELOAD] ) { - m_pContentHolder->fillReportData(); + m_pContentHolder->fillReportData(aClearableGuard); + // IMPORTANT: m_aMutex is cleared! } else if( _URL.Complete == m_aInterceptedURL[DISPATCH_SAVEAS] ) { @@ -222,6 +223,7 @@ } return 0L; } + void SAL_CALL OInterceptor::addStatusListener( const Reference< XStatusListener >& Control, --------------------------------------------------------------------- To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, e-mail: [EMAIL PROTECTED]
