Tag: cws_src680_dba30 User: fs Date: 06/05/08 04:27:53 Modified: /dba/dbaccess/source/ui/querydesign/ JoinController.cxx
Log: RESYNC: (1.36-1.37); FILE MERGED File Changes: Directory: /dba/dbaccess/source/ui/querydesign/ =============================================== File [changed]: JoinController.cxx Url: http://dba.openoffice.org/source/browse/dba/dbaccess/source/ui/querydesign/JoinController.cxx?r1=1.35.16.2&r2=1.35.16.3 Delta lines: +8 -0 ------------------- --- JoinController.cxx 21 Mar 2006 18:41:17 -0000 1.35.16.2 +++ JoinController.cxx 8 May 2006 11:27:50 -0000 1.35.16.3 @@ -137,6 +137,9 @@ #ifndef _SV_WAITOBJ_HXX #include <vcl/waitobj.hxx> #endif +#ifndef _SV_SVAPP_HXX +#include <vcl/svapp.hxx> +#endif #ifndef DBAUI_TOOLS_HXX #include "UITools.hxx" #endif @@ -337,6 +340,11 @@ { if ( getBroadcastHelper().bInDispose || getBroadcastHelper().bDisposed ) return sal_True; + + vos::OGuard aSolarGuard( Application::GetSolarMutex() ); + ::osl::MutexGuard aGuard(m_aMutex); + if ( getView() && getView()->IsInModalMode() ) + return sal_False; sal_Bool bCheck = sal_True; if ( _bSuspend ) { --------------------------------------------------------------------- To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, e-mail: [EMAIL PROTECTED]
