User: hr Date: 06/04/19 06:19:22 Modified: /dba/dbaccess/source/ui/app/ AppController.cxx
Log: INTEGRATION: CWS oj17 (1.26.28); FILE MERGED 2006/04/10 07:32:40 oj 1.26.28.3: RESYNC: (1.26-1.28); FILE MERGED 2006/03/16 10:36:26 oj 1.26.28.2: #i63113# remove container from list when disposing 2006/03/10 11:28:18 oj 1.26.28.1: #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.28&r2=1.29 Delta lines: +6 -7 ------------------- --- AppController.cxx 29 Mar 2006 12:35:54 -0000 1.28 +++ AppController.cxx 19 Apr 2006 13:19:19 -0000 1.29 @@ -531,19 +531,14 @@ TDocuments::iterator aFind = ::std::find_if(m_aDocuments.begin(),m_aDocuments.end(), ::std::compose1(::std::bind2nd(::std::equal_to<Reference<XComponent> >(),xComp),::std::select1st<TDocuments::value_type>())); if ( aFind != m_aDocuments.end() ) - { m_aDocuments.erase(aFind); } - } - else if ( xContainer.is() ) + if ( xContainer.is() ) { TContainerVector::iterator aFind = ::std::find(m_aCurrentContainers.begin(),m_aCurrentContainers.end(),xContainer); if ( aFind != m_aCurrentContainers.end() ) - { m_aCurrentContainers.erase(aFind); } - } - else OApplicationController_CBASE::disposing( _rSource ); } } @@ -552,6 +547,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 ) --------------------------------------------------------------------- To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, e-mail: [EMAIL PROTECTED]
