Tag: cws_src680_oj14 User: oj Date: 2006/07/04 00:45:50 Modified: dba/dbaccess/source/ui/app/AppControllerGen.cxx
Log: RESYNC: (1.15-1.18); FILE MERGED File Changes: Directory: /dba/dbaccess/source/ui/app/ ======================================= File [changed]: AppControllerGen.cxx Url: http://dba.openoffice.org/source/browse/dba/dbaccess/source/ui/app/AppControllerGen.cxx?r1=1.14.4.4&r2=1.14.4.5 Delta lines: +29 -30 --------------------- --- AppControllerGen.cxx 25 Apr 2006 13:00:32 -0000 1.14.4.4 +++ AppControllerGen.cxx 4 Jul 2006 07:45:48 -0000 1.14.4.5 @@ -78,9 +78,6 @@ #ifndef DBAUI_DLGSAVE_HXX #include "dlgsave.hxx" #endif -#ifndef _DBAUI_DLGRENAME_HXX -#include "dlgrename.hxx" -#endif #ifndef INCLUDED_SFX_MAILMODELAPI_HXX #include <sfx2/mailmodelapi.hxx> #endif @@ -451,11 +448,11 @@ { sal_Bool bSubSuspended = sal_True; Reference<XModel> xModel; - TDocuments::iterator aIter = m_aDocuments.begin(); - TDocuments::iterator aEnd = m_aDocuments.end(); sal_Int32 nSuspendPos = 1; try { + TDocuments::iterator aIter = m_aDocuments.begin(); + TDocuments::iterator aEnd = m_aDocuments.end(); for (; aIter != aEnd && bSubSuspended; ++aIter,++nSuspendPos) bSubSuspended = suspendDocument(aIter->first,bSuspend); } @@ -466,37 +463,37 @@ { try { - TDocuments::iterator aIter = m_aDocuments.begin(); - TDocuments::iterator aEnd = m_aDocuments.end(); - for (; aIter != aEnd ; ++aIter) + TDocuments::iterator document = m_aDocuments.begin(); + TDocuments::iterator documentEnd = m_aDocuments.end(); + for (; document != documentEnd ; ++document) { - Reference< XComponent > xDocument = aIter->first; + Reference< XComponent > xDocument = document->first; if ( xDocument.is() ) xDocument->removeEventListener(static_cast<XFrameActionListener*>(this)); } - aIter = m_aDocuments.begin(); + document = m_aDocuments.begin(); // first of all we have to set the second to NULL - for (; aIter != aEnd ; ) + for (; document != documentEnd ; ) { - TDocuments::iterator aPos = aIter++; + TDocuments::iterator aPos = document++; aPos->second = NULL; // this may also dispose the document } // work on copy TDocuments aDocuments = m_aDocuments; - aIter = aDocuments.begin(); - aEnd = aDocuments.end(); - for (; aIter != aEnd ; ++aIter ) + document = aDocuments.begin(); + documentEnd = aDocuments.end(); + for (; document != documentEnd ; ++document ) { Reference<XController> xController; - xModel.set(aIter->first,UNO_QUERY); + xModel.set(document->first,UNO_QUERY); if ( xModel.is() ) xController = xModel->getCurrentController(); else { - xController.set(aIter->first,UNO_QUERY); + xController.set(document->first,UNO_QUERY); if ( !xController.is() ) { - Reference<XFrame> xFrame(aIter->first,UNO_QUERY); + Reference<XFrame> xFrame(document->first,UNO_QUERY); if ( xFrame.is() ) xController = xFrame->getController(); } @@ -517,8 +514,8 @@ } else // resuspend the documents again { - aIter = m_aDocuments.begin(); - aEnd = m_aDocuments.end(); + TDocuments::iterator aIter = m_aDocuments.begin(); + TDocuments::iterator aEnd = m_aDocuments.end(); try { for (; aIter != aEnd && nSuspendPos ; ++aIter,--nSuspendPos) @@ -633,18 +630,20 @@ // special handling for mail, if more than one document is selected attach them all if ( _eOpenMode == OLinkedDocumentsAccess::OPEN_FORMAIL ) { - ::std::vector< ::std::pair< ::rtl::OUString ,Reference< XModel > > >::iterator aIter = aCompoments.begin(); - ::std::vector< ::std::pair< ::rtl::OUString ,Reference< XModel > > >::iterator aEnd = aCompoments.end(); - SfxMailModel aSendMail(m_xCurrentFrame); + ::std::vector< ::std::pair< ::rtl::OUString ,Reference< XModel > > >::iterator componentIter = aCompoments.begin(); + ::std::vector< ::std::pair< ::rtl::OUString ,Reference< XModel > > >::iterator componentEnd = aCompoments.end(); + ::rtl::OUString aDocTypeString; + SfxMailModel aSendMail; SfxMailModel::SendMailResult eResult = SfxMailModel::SEND_MAIL_OK; - for (; aIter != aEnd && SfxMailModel::SEND_MAIL_OK == eResult; ++aIter) + for (; componentIter != componentEnd && SfxMailModel::SEND_MAIL_OK == eResult; ++componentIter) { - Reference< XModel > xModel(aIter->second,UNO_QUERY); + Reference< XModel > xModel(componentIter->second,UNO_QUERY); - eResult = aSendMail.AttachDocument(SfxMailModel::TYPE_SELF,xModel,aIter->first); + // Send document as e-Mail using stored/default type + eResult = aSendMail.AttachDocument(aDocTypeString,xModel,componentIter->first); } if ( !aSendMail.IsEmpty() ) - aSendMail.Send(); + aSendMail.Send( m_xCurrentFrame ); } } // ----------------------------------------------------------------------------- --------------------------------------------------------------------- To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, e-mail: [EMAIL PROTECTED]
