diff options
| author | Ivo Hinkelmann <ihi@openoffice.org> | 2007-11-23 13:39:16 +0000 |
|---|---|---|
| committer | Ivo Hinkelmann <ihi@openoffice.org> | 2007-11-23 13:39:16 +0000 |
| commit | 6668472f5b62e0009d12b82c60dc9cb835f0464e (patch) | |
| tree | 9b66a9fd4edb8dde4df6ad43bd8b761e0a05357d /configmgr | |
| parent | bcfebcae68a55408a2845cb29b1de763627062ec (diff) | |
INTEGRATION: CWS configrefactor01 (1.9.24); FILE MERGED
2007/01/12 14:50:45 mmeeks 1.9.24.2: Another big prune of memory::Accessor ...
2007/01/11 10:35:37 mmeeks 1.9.24.1: Submitted by: mmeeks
Large scale re-factoring, remove fine-grained locking in favor of a simple,
single global lock (still in progress).
Identify and fix various hot-spots.
Remove otherwise empty / non-compiled files.
Kill UpdateAccessor
Diffstat (limited to 'configmgr')
| -rw-r--r-- | configmgr/source/treemgr/collectchanges.cxx | 13 |
1 files changed, 5 insertions, 8 deletions
diff --git a/configmgr/source/treemgr/collectchanges.cxx b/configmgr/source/treemgr/collectchanges.cxx index 9c2c5cd827e9..dbc4223c37ec 100644 --- a/configmgr/source/treemgr/collectchanges.cxx +++ b/configmgr/source/treemgr/collectchanges.cxx @@ -4,9 +4,9 @@ * * $RCSfile: collectchanges.cxx,v $ * - * $Revision: 1.9 $ + * $Revision: 1.10 $ * - * last change: $Author: obo $ $Date: 2006-09-16 15:27:12 $ + * last change: $Author: ihi $ $Date: 2007-11-23 14:39:16 $ * * The Contents of this file are made available subject to * the terms of GNU Lesser General Public License Version 2.1. @@ -102,14 +102,12 @@ bool convertNodeChange(NodeChangeData& aData_, RemoveNode const& /*aChange_*/) //----------------------------------------------------------------------------- CollectChanges::CollectChanges( NodeChangesInformation& rTargetList_, - data::Accessor const& _aDataAccessor, TreeImpl& rStartTree_, NodeOffset nStartNode_, TemplateHolder aElementTemplate_, TreeDepth nMaxDepth) : m_rTargetList(rTargetList_) , m_aAccessor() , m_aContextTypeName() -, m_aDataAccessor(_aDataAccessor) , m_pBaseTree(&rStartTree_) , m_nBaseNode(nStartNode_) , m_nDepthLeft( nMaxDepth ) @@ -123,7 +121,6 @@ CollectChanges::CollectChanges( CollectChanges const& rBase, Path::Component con : m_rTargetList(rBase.m_rTargetList) , m_aAccessor(rBase.m_aAccessor.compose(rChildName)) , m_aContextTypeName(aSubTypeName_) -, m_aDataAccessor(rBase.m_aDataAccessor) , m_pBaseTree(rBase.m_pBaseTree) , m_nBaseNode(rBase.m_nBaseNode) , m_nDepthLeft(childDepth(rBase.m_nDepthLeft)) @@ -149,7 +146,7 @@ Path::Component CollectChanges::implGetNodeName(Change const& aChange_) const //----------------------------------------------------------------------------- void CollectChanges::collectFrom(ValueChange const& aChange_) { - NodeChangeInformation aInfo(m_aDataAccessor); + NodeChangeInformation aInfo; if ( convertNodeChange( aInfo.change, aChange_ ) && implSetLocation( aInfo.location, aChange_, false ) ) @@ -161,7 +158,7 @@ void CollectChanges::collectFrom(ValueChange const& aChange_) //----------------------------------------------------------------------------- void CollectChanges::collectFrom(AddNode const& aChange_) { - NodeChangeInformation aInfo(m_aDataAccessor); + NodeChangeInformation aInfo; if ( convertNodeChange( aInfo.change, aChange_ ) && implSetLocation( aInfo.location, aChange_, true ) ) @@ -173,7 +170,7 @@ void CollectChanges::collectFrom(AddNode const& aChange_) //----------------------------------------------------------------------------- void CollectChanges::collectFrom(RemoveNode const& aChange_) { - NodeChangeInformation aInfo(m_aDataAccessor); + NodeChangeInformation aInfo; if ( convertNodeChange( aInfo.change, aChange_ ) && implSetLocation( aInfo.location, aChange_, true ) ) |