Tag: cws_src680_oj17 User: oj Date: 06/03/10 03:28:22 Modified: /dba/dbaccess/source/ui/app/ AppController.cxx /dba/dbaccess/source/ui/browser/ unodatbr.cxx /dba/dbaccess/source/ui/querydesign/ JoinController.cxx /dba/dbaccess/source/ui/tabledesign/ TableController.cxx
Log: #131297# do not suspend when we are in dialog mode File Changes: Directory: /dba/dbaccess/source/ui/app/ ======================================= File [changed]: AppController.cxx Url: http://dba.openoffice.org/source/browse/dba/dbaccess/source/ui/app/AppController.cxx?r1=1.26&r2=1.26.28.1 Delta lines: +7 -3 ------------------- --- AppController.cxx 31 Jan 2006 18:40:35 -0000 1.26 +++ AppController.cxx 10 Mar 2006 11:28:18 -0000 1.26.28.1 @@ -4,9 +4,9 @@ * * $RCSfile: AppController.cxx,v $ * - * $Revision: 1.26 $ + * $Revision: 1.26.28.1 $ * - * last change: $Author: kz $ $Date: 2006/01/31 18:40:35 $ + * last change: $Author: oj $ $Date: 2006/03/10 11:28:18 $ * * The Contents of this file are made available subject to * the terms of GNU Lesser General Public License Version 2.1. @@ -555,6 +555,10 @@ { ::vos::OGuard aSolarGuard( Application::GetSolarMutex() ); ::osl::MutexGuard aGuard(m_aMutex); + + if ( getView() && getView()->IsInModalMode() ) + return sal_False; + sal_Bool bCanSuspend = sal_True; if ( m_bSuspended != bSuspend ) Directory: /dba/dbaccess/source/ui/browser/ =========================================== File [changed]: unodatbr.cxx Url: http://dba.openoffice.org/source/browse/dba/dbaccess/source/ui/browser/unodatbr.cxx?r1=1.173&r2=1.173.74.1 Delta lines: +7 -3 ------------------- --- unodatbr.cxx 24 Oct 2005 08:31:15 -0000 1.173 +++ unodatbr.cxx 10 Mar 2006 11:28:19 -0000 1.173.74.1 @@ -4,9 +4,9 @@ * * $RCSfile: unodatbr.cxx,v $ * - * $Revision: 1.173 $ + * $Revision: 1.173.74.1 $ * - * last change: $Author: rt $ $Date: 2005/10/24 08:31:15 $ + * last change: $Author: oj $ $Date: 2006/03/10 11:28:19 $ * * The Contents of this file are made available subject to * the terms of GNU Lesser General Public License Version 2.1. @@ -970,6 +970,10 @@ // ----------------------------------------------------------------------- sal_Bool SbaTableQueryBrowser::suspend(sal_Bool bSuspend) throw( RuntimeException ) { + vos::OGuard aSolarGuard( Application::GetSolarMutex() ); + ::osl::MutexGuard aGuard(m_aMutex); + if ( getView() && getView()->IsInModalMode() ) + return sal_False; sal_Bool bRet = sal_False; if ( !m_bInSuspend ) { 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.36.22.1 Delta lines: +11 -3 -------------------- --- JoinController.cxx 6 Feb 2006 16:55:35 -0000 1.36 +++ JoinController.cxx 10 Mar 2006 11:28:19 -0000 1.36.22.1 @@ -4,9 +4,9 @@ * * $RCSfile: JoinController.cxx,v $ * - * $Revision: 1.36 $ + * $Revision: 1.36.22.1 $ * - * last change: $Author: rt $ $Date: 2006/02/06 16:55:35 $ + * last change: $Author: oj $ $Date: 2006/03/10 11:28:19 $ * * The Contents of this file are made available subject to * the terms of GNU Lesser General Public License Version 2.1. @@ -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 ) { Directory: /dba/dbaccess/source/ui/tabledesign/ =============================================== File [changed]: TableController.cxx Url: http://dba.openoffice.org/source/browse/dba/dbaccess/source/ui/tabledesign/TableController.cxx?r1=1.100.40.1&r2=1.100.40.2 Delta lines: +4 -2 ------------------- --- TableController.cxx 9 Mar 2006 10:30:07 -0000 1.100.40.1 +++ TableController.cxx 10 Mar 2006 11:28:19 -0000 1.100.40.2 @@ -4,9 +4,9 @@ * * $RCSfile: TableController.cxx,v $ * - * $Revision: 1.100.40.1 $ + * $Revision: 1.100.40.2 $ * - * last change: $Author: oj $ $Date: 2006/03/09 10:30:07 $ + * last change: $Author: oj $ $Date: 2006/03/10 11:28:19 $ * * The Contents of this file are made available subject to * the terms of GNU Lesser General Public License Version 2.1. @@ -703,6 +703,8 @@ vos::OGuard aSolarGuard( Application::GetSolarMutex() ); ::osl::MutexGuard aGuard(m_aMutex); + if ( getView() && getView()->IsInModalMode() ) + return sal_False; sal_Bool bCheck = sal_True; if ( isModified() ) { --------------------------------------------------------------------- To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, e-mail: [EMAIL PROTECTED]
