User: kz Date: 06/01/31 10:40:25 Modified: /dba/dbaccess/source/core/dataaccess/ documentcontainer.cxx
Log: INTEGRATION: CWS dba202d (1.15.50); FILE MERGED 2006/01/24 10:00:38 fs 1.15.50.2: RESYNC: (1.15-1.16); FILE MERGED 2005/12/13 09:14:26 oj 1.15.50.1: #i59271# do not insert the impl struct when creating a new object 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&r2=1.17 Delta lines: +9 -6 ------------------- --- documentcontainer.cxx 21 Dec 2005 13:35:43 -0000 1.16 +++ documentcontainer.cxx 31 Jan 2006 18:40:22 -0000 1.17 @@ -290,14 +290,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]
