Tag: cws_src680_oj14 User: oj Date: 06/03/20 05:49:57 Modified: /dba/dbaccess/source/core/dataaccess/ documentcontainer.cxx
Log: RESYNC: (1.16-1.17); FILE MERGED File Changes: Directory: /dba/dbaccess/source/core/dataaccess/ ================================================ File [changed]: documentcontainer.cxx Url: http://dba.openoffice.org/source/browse/dba/dbaccess/source/core/dataaccess/documentcontainer.cxx?r1=1.16.4.1&r2=1.16.4.2 Delta lines: +12 -9 -------------------- --- documentcontainer.cxx 20 Mar 2006 07:50:57 -0000 1.16.4.1 +++ documentcontainer.cxx 20 Mar 2006 13:49:36 -0000 1.16.4.2 @@ -295,14 +295,17 @@ OSL_ENSURE(sName.getLength(),"Invalid name for a document container!"); ODefinitionContainer_Impl* pItem = static_cast<ODefinitionContainer_Impl*>(m_pImpl.get()); ODefinitionContainer_Impl::Documents::iterator aFind = pItem->m_aDocumentMap.find(sName); + TContentPtr pElementImpl; if ( aFind == pItem->m_aDocumentMap.end() ) { - aFind = pItem->m_aDocumentMap.insert(ODefinitionContainer_Impl::Documents::value_type(sName,ODefinitionContainer_Impl::Documents::mapped_type(new ODefinitionContainer_Impl))).first; - aFind->second->m_aProps.aTitle = sName; - aFind->second->m_pDataSource = m_pImpl->m_pDataSource; - } - OSL_ENSURE( aFind != pItem->m_aDocumentMap.end() ," Invalid entry in map!"); - xContent = new ODocumentContainer(m_xORB,*this,aFind->second,ServiceSpecifier == SERVICE_NAME_FORM_COLLECTION); + pElementImpl.reset(new ODefinitionContainer_Impl); + pElementImpl->m_aProps.aTitle = sName; + pElementImpl->m_pDataSource = m_pImpl->m_pDataSource; + } // if ( aFind == pItem->m_aDocumentMap.end() ) + else + pElementImpl = aFind->second; + OSL_ENSURE( pElementImpl ," Invalid entry in map!"); + xContent = new ODocumentContainer(m_xORB,*this,pElementImpl,ServiceSpecifier == SERVICE_NAME_FORM_COLLECTION); // copy children if ( xCopyFrom.is() ) --------------------------------------------------------------------- To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, e-mail: [EMAIL PROTECTED]
