Tag: cws_src680_rptwizard01 User: lla Date: 2008-02-20 09:38:59+0000 Modified: dba/dbaccess/inc/genericcontroller.hxx dba/dbaccess/source/ui/browser/genericcontroller.cxx
Log: #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.5&r2=1.5.120.1 Delta lines: +4 -4 ------------------- --- genericcontroller.hxx 2007-08-02 14:25:13+0000 1.5 +++ genericcontroller.hxx 2008-02-20 09:38:56+0000 1.5.120.1 @@ -4,9 +4,9 @@ * * $RCSfile: genericcontroller.hxx,v $ * - * $Revision: 1.5 $ + * $Revision: 1.5.120.1 $ * - * last change: $Author: hr $ $Date: 2007/08/02 14:25:13 $ + * last change: $Author: lla $ $Date: 2008/02/20 09:38:56 $ * * The Contents of this file are made available subject to * the terms of GNU Lesser General Public License Version 2.1. @@ -520,7 +520,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) {OGenericUnoController_COMPBASE::dispose(); } + 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); Directory: /dba/dbaccess/source/ui/browser/ =========================================== File [changed]: genericcontroller.cxx Url: http://dba.openoffice.org/source/browse/dba/dbaccess/source/ui/browser/genericcontroller.cxx?r1=1.81&r2=1.81.94.1 Delta lines: +9 -3 ------------------- --- genericcontroller.cxx 2007-09-26 14:48:32+0000 1.81 +++ genericcontroller.cxx 2008-02-20 09:38:56+0000 1.81.94.1 @@ -4,9 +4,9 @@ * * $RCSfile: genericcontroller.cxx,v $ * - * $Revision: 1.81 $ + * $Revision: 1.81.94.1 $ * - * last change: $Author: hr $ $Date: 2007/09/26 14:48:32 $ + * last change: $Author: lla $ $Date: 2008/02/20 09:38:56 $ * * The Contents of this file are made available subject to * the terms of GNU Lesser General Public License Version 2.1. @@ -1447,3 +1447,9 @@ } // ----------------------------------------------------------------------------- + +void SAL_CALL OGenericUnoController::dispose() throw(::com::sun::star::uno::RuntimeException) +{ + ::vos::OGuard aSolarGuard(Application::GetSolarMutex()); + OGenericUnoController_COMPBASE::dispose(); +} \ No newline at end of file --------------------------------------------------------------------- To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, e-mail: [EMAIL PROTECTED]
