User: hr Date: 06/04/19 06:24:02 Modified: /dba/dbaccess/source/ui/querydesign/ JoinController.cxx
Log: INTEGRATION: CWS oj17 (1.36.22); FILE MERGED 2006/03/10 11:28:19 oj 1.36.22.1: #131297# do not suspend when we are in dialog mode 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.36&r2=1.37 Delta lines: +8 -0 ------------------- --- JoinController.cxx 6 Feb 2006 16:55:35 -0000 1.36 +++ JoinController.cxx 19 Apr 2006 13:24:00 -0000 1.37 @@ -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]
