User: kz Date: 2008-06-25 14:51:18+0000 Modified: dba/dbaccess/inc/genericcontroller.hxx
Log: INTEGRATION: CWS rptwizard01 (1.5.120); FILE MERGED 2008/05/21 10:59:46 lla 1.5.120.3: RESYNC: (1.9-1.10); FILE MERGED 2008/04/14 10:41:01 lla 1.5.120.2: RESYNC: (1.5-1.9); FILE MERGED 2008/02/20 09:38:56 lla 1.5.120.1: #i86092# fix a problem, which results in a deadlock in new report wizard File Changes: Directory: /dba/dbaccess/inc/ ============================= File [changed]: genericcontroller.hxx Url: http://dba.openoffice.org/source/browse/dba/dbaccess/inc/genericcontroller.hxx?r1=1.12&r2=1.13 Delta lines: +1 -1 ------------------- --- genericcontroller.hxx 2008-06-25 12:28:36+0000 1.12 +++ genericcontroller.hxx 2008-06-25 14:51:16+0000 1.13 @@ -483,7 +483,7 @@ virtual ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Reference< ::com::sun::star::frame::XDispatch > > SAL_CALL queryDispatches(const ::com::sun::star::uno::Sequence< ::com::sun::star::frame::DispatchDescriptor >& aDescripts) throw( ::com::sun::star::uno::RuntimeException ); // ::com::sun::star::lang::XComponent - virtual void SAL_CALL dispose() throw(::com::sun::star::uno::RuntimeException); + virtual void SAL_CALL dispose() throw(::com::sun::star::uno::RuntimeException); //LLA: need solar mutex {OGenericUnoController_COMPBASE::dispose(); } virtual void SAL_CALL disposing(); virtual void SAL_CALL addEventListener(const ::com::sun::star::uno::Reference< ::com::sun::star::lang::XEventListener > & aListener) throw(::com::sun::star::uno::RuntimeException); virtual void SAL_CALL removeEventListener(const ::com::sun::star::uno::Reference< ::com::sun::star::lang::XEventListener > & aListener) throw(::com::sun::star::uno::RuntimeException); --------------------------------------------------------------------- To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, e-mail: [EMAIL PROTECTED]
