User: rt Date: 2008-01-30 08:30:37+0000 Modified: dba/dbaccess/source/core/api/tablecontainer.cxx
Log: INTEGRATION: CWS dba24d (1.66.4); FILE MERGED 2007/12/04 09:24:09 oj 1.66.4.1: #i81644# add new common var to block elementInserted events File Changes: Directory: /dba/dbaccess/source/core/api/ ========================================= File [changed]: tablecontainer.cxx Url: http://dba.openoffice.org/source/browse/dba/dbaccess/source/core/api/tablecontainer.cxx?r1=1.66&r2=1.67 Delta lines: +5 -7 ------------------- --- tablecontainer.cxx 2007-11-21 15:35:07+0000 1.66 +++ tablecontainer.cxx 2008-01-30 08:30:33+0000 1.67 @@ -189,11 +189,11 @@ sal_Bool _bCase, const Reference< XNameContainer >& _xTableDefinitions, IRefreshListener* _pRefreshListener, - IWarningsContainer* _pWarningsContainer) - :OFilteredContainer(_rParent,_rMutex,_xCon,_bCase,_pRefreshListener,_pWarningsContainer) + IWarningsContainer* _pWarningsContainer + ,oslInterlockedCount& _nInAppend) + :OFilteredContainer(_rParent,_rMutex,_xCon,_bCase,_pRefreshListener,_pWarningsContainer,_nInAppend) ,m_xTableDefinitions(_xTableDefinitions) ,m_pTableMediator( NULL ) - ,m_bInAppend(sal_False) ,m_bInDrop(sal_False) { DBG_CTOR(OTableContainer, NULL); @@ -392,9 +392,9 @@ PContainerApprove pApprove( new ObjectNameApproval( xConnection, ObjectNameApproval::TypeTable ) ); pApprove->approveElement( aName, descriptor ); - m_bInAppend = sal_True; try { + EnsureReset aReset(m_nInAppend); Reference<XAppend> xAppend(m_xMasterContainer,UNO_QUERY); if(xAppend.is()) { @@ -417,10 +417,8 @@ } catch(Exception&) { - m_bInAppend = sal_False; throw; } - m_bInAppend = sal_False; Reference<XPropertySet> xTableDefinition; Reference<XNameAccess> xColumnDefinitions; @@ -539,7 +537,7 @@ ::osl::MutexGuard aGuard(m_rMutex); ::rtl::OUString sName; Event.Accessor >>= sName; - if ( !m_bInAppend && !hasByName(sName) ) + if ( !m_nInAppend && !hasByName(sName) ) { if(!m_xMasterContainer.is() || m_xMasterContainer->hasByName(sName)) { --------------------------------------------------------------------- To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, e-mail: [EMAIL PROTECTED]
