User: kz Date: 2008-06-25 14:51:56+0000 Modified: dba/dbaccess/source/core/dataaccess/documentdefinition.hxx
Log: INTEGRATION: CWS rptwizard01 (1.24.46); FILE MERGED 2008/05/21 10:59:58 lla 1.24.46.5: RESYNC: (1.28-1.30); FILE MERGED 2008/04/14 10:41:11 lla 1.24.46.4: RESYNC: (1.26-1.28); FILE MERGED 2008/02/18 10:05:05 lla 1.24.46.3: #i86092# fillReportData() takes an argument of ClearableMutexGuard 2008/02/15 07:37:19 lla 1.24.46.2: RESYNC: (1.24-1.26); FILE MERGED 2008/02/14 13:20:24 lla 1.24.46.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]: documentdefinition.hxx Url: http://dba.openoffice.org/source/browse/dba/dbaccess/source/core/dataaccess/documentdefinition.hxx?r1=1.30&r2=1.31 Delta lines: +4 -2 ------------------- --- documentdefinition.hxx 2008-05-05 15:50:37+0000 1.30 +++ documentdefinition.hxx 2008-06-25 14:51:53+0000 1.31 @@ -145,7 +145,7 @@ sal_Bool saveAs(); void closeObject(); sal_Bool isModified(); - void fillReportData(); + void fillReportData(::osl::ClearableMutexGuard & _aGuard); inline sal_Bool isNewReport() const { return !m_bForm && !m_pImpl->m_aProps.bAsTemplate; } /** prepares closing the document component @@ -267,7 +267,9 @@ void onCommandInsert( const ::rtl::OUString& _sURL, const ::com::sun::star::uno::Reference< ::com::sun::star::ucb::XCommandEnvironment >& Environment ) throw( ::com::sun::star::uno::Exception ); void onCommandPreview( ::com::sun::star::uno::Any& _rImage ); void onCommandOpenSomething( const ::com::sun::star::uno::Any& _rArgument, const bool _bActivate, - const ::com::sun::star::uno::Reference< ::com::sun::star::ucb::XCommandEnvironment >& _rxEnvironment, ::com::sun::star::uno::Any& _out_rComponent ); + const ::com::sun::star::uno::Reference< ::com::sun::star::ucb::XCommandEnvironment >& _rxEnvironment, + ::com::sun::star::uno::Any& _out_rComponent, + ::osl::ClearableMutexGuard & _aClearableGuard); }; //........................................................................ --------------------------------------------------------------------- To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, e-mail: [EMAIL PROTECTED]
