User: vg Date: 2008-08-19 09:55:02+0000 Modified: dba/dbaccess/source/ui/app/AppControllerDnD.cxx
Log: INTEGRATION: CWS dba31a (1.28.22); FILE MERGED 2008/06/06 07:35:26 oj 1.28.22.1: #i57668# close frames which objects were deleted File Changes: Directory: /dba/dbaccess/source/ui/app/ ======================================= File [changed]: AppControllerDnD.cxx Url: http://dba.openoffice.org/source/browse/dba/dbaccess/source/ui/app/AppControllerDnD.cxx?r1=1.28&r2=1.29 Delta lines: +9 -11 -------------------- --- AppControllerDnD.cxx 2008-05-05 15:51:41+0000 1.28 +++ AppControllerDnD.cxx 2008-08-19 09:55:00+0000 1.29 @@ -286,6 +286,7 @@ } } } + impl_deActivateSubFrame_throw(sTableName,E_TABLE); } catch(SQLContext& e) { aErrorInfo = e; } catch(SQLWarning& e) { aErrorInfo = e; } @@ -324,14 +325,9 @@ // ----------------------------------------------------------------------------- void OApplicationController::deleteObjects( ElementType _eType, const ::std::vector< ::rtl::OUString>& _rList, bool _bConfirm ) { - deleteObjects( Reference< XNameContainer >( getElements( _eType ), UNO_QUERY ), _rList, _bConfirm ); -} - -// ----------------------------------------------------------------------------- -void OApplicationController::deleteObjects( const Reference< XNameContainer>& _rxNames, const ::std::vector< ::rtl::OUString>& _rList, bool _bConfirm ) -{ - Reference< XHierarchicalNameContainer > xHierarchyName( _rxNames, UNO_QUERY ); - if ( _rxNames.is() ) + Reference< XNameContainer > xNames( getElements( _eType ), UNO_QUERY ); + Reference< XHierarchicalNameContainer > xHierarchyName( xNames, UNO_QUERY ); + if ( xNames.is() ) { ByteString sDialogPosition; svtools::QueryDeleteResult_Impl eResult = _bConfirm ? svtools::QUERYDELETE_YES : svtools::QUERYDELETE_ALL; @@ -382,7 +378,10 @@ if ( xHierarchyName.is() ) xHierarchyName->removeByHierarchicalName( *aThisRound ); else - _rxNames->removeByName( *aThisRound ); + xNames->removeByName( *aThisRound ); + + if ( _eType == E_QUERY ) + impl_deActivateSubFrame_throw(*aThisRound,_eType); bSuccess = true; @@ -902,8 +901,7 @@ if ( nIndex != -1 ) { aList.push_back(sName.copy(sErase.getLength() + 1)); - Reference<XNameContainer> xNames(getElements(m_aAsyncDrop.nType), UNO_QUERY); - deleteObjects( xNames, aList, false ); + deleteObjects( m_aAsyncDrop.nType, aList, false ); } } } --------------------------------------------------------------------- To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, e-mail: [EMAIL PROTECTED]
