diff options
| author | Kurt Zenker <kz@openoffice.org> | 2008-06-25 13:51:16 +0000 |
|---|---|---|
| committer | Kurt Zenker <kz@openoffice.org> | 2008-06-25 13:51:16 +0000 |
| commit | 2a89907c908d23faae458d8db55257da42078d31 (patch) | |
| tree | 48ac2df79ca2d766f87448e6786a1b4c9dcef437 /dbaccess/inc/genericcontroller.hxx | |
| parent | 0a721dfaf439fa7308138f64175362ed44c5d554 (diff) | |
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
Diffstat (limited to 'dbaccess/inc/genericcontroller.hxx')
| -rw-r--r-- | dbaccess/inc/genericcontroller.hxx | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/dbaccess/inc/genericcontroller.hxx b/dbaccess/inc/genericcontroller.hxx index 4a75355c7657..2f13990c07e2 100644 --- a/dbaccess/inc/genericcontroller.hxx +++ b/dbaccess/inc/genericcontroller.hxx @@ -7,7 +7,7 @@ * OpenOffice.org - a multi-platform office productivity suite * * $RCSfile: genericcontroller.hxx,v $ - * $Revision: 1.12 $ + * $Revision: 1.13 $ * * This file is part of OpenOffice.org. * @@ -483,7 +483,7 @@ namespace dbaui 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); |