User: kz Date: 2008-06-25 14:52:22+0000 Modified: dba/dbaccess/source/ui/browser/genericcontroller.cxx
Log: INTEGRATION: CWS rptwizard01 (1.81.94); FILE MERGED 2008/05/21 11:00:04 lla 1.81.94.4: RESYNC: (1.86-1.88); FILE MERGED 2008/04/15 11:27:32 lla 1.81.94.3: #i86092# dispose only once 2008/04/14 10:41:20 lla 1.81.94.2: RESYNC: (1.81-1.86); FILE MERGED 2008/02/20 09:38:56 lla 1.81.94.1: #i86092# fix a problem, which results in a deadlock in new report wizard File Changes: 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.92&r2=1.93 Delta lines: +6 -6 ------------------- --- genericcontroller.cxx 2008-06-25 14:06:48+0000 1.92 +++ genericcontroller.cxx 2008-06-25 14:52:19+0000 1.93 @@ -833,12 +833,6 @@ ,m_aFeaturesToInvalidate.end()); } -// ----------------------------------------------------------------------------- -void SAL_CALL OGenericUnoController::dispose( ) throw (RuntimeException) -{ - // disambiguate - OGenericUnoController_Base::WeakComponentImplHelperBase::dispose(); -} // ----------------------------------------------------------------------- void OGenericUnoController::disposing() @@ -1621,3 +1615,9 @@ } } // namespace dbaui + +void SAL_CALL OGenericUnoController::dispose() throw(::com::sun::star::uno::RuntimeException) +{ + ::vos::OGuard aSolarGuard(Application::GetSolarMutex()); + OGenericUnoController_Base::dispose(); +} --------------------------------------------------------------------- To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, e-mail: [EMAIL PROTECTED]
