User: vg Date: 2008-08-19 09:54:29+0000 Modified: dba/dbaccess/source/ui/app/AppController.cxx
Log: INTEGRATION: CWS dba31a (1.60.20); FILE MERGED 2008/07/02 09:16:24 oj 1.60.20.3: RESYNC: (1.62-1.63); FILE MERGED 2008/06/24 12:13:07 oj 1.60.20.2: RESYNC: (1.60-1.62); FILE MERGED 2008/06/06 07:35:26 oj 1.60.20.1: #i57668# close frames which objects were deleted 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.64&r2=1.65 Delta lines: +48 -33 --------------------- --- AppController.cxx 2008-08-14 12:10:35+0000 1.64 +++ AppController.cxx 2008-08-19 09:54:27+0000 1.65 @@ -3081,12 +3081,27 @@ } break; } // if ( aFind->second.first.first == _nKind && aFind->second.first.second == _eOpenMode ) - } // while ( aFind != m_aSpecialSubFrames.end() ) + } return bFound; } - +// ----------------------------------------------------------------------------- +void OApplicationController::impl_deActivateSubFrame_throw(const ::rtl::OUString& _sName,const sal_Int32 _nKind) +{ + TFrames aCopy = m_aSpecialSubFrames; + TFrames::iterator aFind = aCopy.find(_sName); + for(;aFind != aCopy.end();++aFind) + { + if ( aFind->second.first.first == _nKind ) + { + Reference< XFrame> xFrame(aFind->second.second,UNO_QUERY); + if ( xFrame.is() ) + { + ::comphelper::disposeComponent(xFrame); + } + } // if ( aFind->second.first.first == _nKind && aFind->second.first.second == _eOpenMode ) + } +} //........................................................................ } // namespace dbaui //........................................................................ - --------------------------------------------------------------------- To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, e-mail: [EMAIL PROTECTED]
