Tag: cws_src680_warnings01 User: sb Date: 06/05/23 16:47:23 Modified: /dba/dbaccess/source/ui/app/ AppController.cxx
Log: RESYNC: (1.28-1.29); FILE MERGED 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.25.24.2&r2=1.25.24.3 Delta lines: +6 -7 ------------------- --- AppController.cxx 7 Apr 2006 20:49:25 -0000 1.25.24.2 +++ AppController.cxx 23 May 2006 23:47:21 -0000 1.25.24.3 @@ -527,19 +527,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 ); } } @@ -548,6 +543,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]
