summaryrefslogtreecommitdiff
path: root/configmgr
diff options
context:
space:
mode:
authorIvo Hinkelmann <ihi@openoffice.org>2007-11-23 13:42:43 +0000
committerIvo Hinkelmann <ihi@openoffice.org>2007-11-23 13:42:43 +0000
commit3ca43e103c89536607c57f29ee07f75372176301 (patch)
tree3545536c06a8a2ad48ee893a5802600f434acea5 /configmgr
parent50202da77af06e1e10d9e3ffc093e00e722f6281 (diff)
INTEGRATION: CWS configrefactor01 (1.11.24); FILE MERGED
2007/01/11 10:35:38 mmeeks 1.11.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/nodechange.cxx12
1 files changed, 6 insertions, 6 deletions
diff --git a/configmgr/source/treemgr/nodechange.cxx b/configmgr/source/treemgr/nodechange.cxx
index a6eee383d335..50b95e8dc684 100644
--- a/configmgr/source/treemgr/nodechange.cxx
+++ b/configmgr/source/treemgr/nodechange.cxx
@@ -4,9 +4,9 @@
*
* $RCSfile: nodechange.cxx,v $
*
- * $Revision: 1.11 $
+ * $Revision: 1.12 $
*
- * last change: $Author: obo $ $Date: 2006-09-16 15:29:14 $
+ * last change: $Author: ihi $ $Date: 2007-11-23 14:42:43 $
*
* The Contents of this file are made available subject to
* the terms of GNU Lesser General Public License Version 2.1.
@@ -126,7 +126,7 @@ sal_uInt32 NodeChange::getChangeInfos(NodeChangesInformation& _rInfos) const
for (NodeChangeImpl::ChangeCount ix = 0; ix < nChanges; ++ix)
{
- NodeChangeInformation aSingleInfo(m_pImpl->getDataAccessor());
+ NodeChangeInformation aSingleInfo;
aSingleInfo.change.type = NodeChangeData::eNoChange;
m_pImpl->fillChangeInfo(aSingleInfo,ix);
@@ -151,7 +151,7 @@ bool NodeChange::getChangeLocation(NodeChangeLocation& rLoc) const
Tree NodeChange::getBaseTree() const
{
- return Tree(m_pImpl->getDataAccessor(), m_pImpl->getTargetTree().get());
+ return Tree(m_pImpl->getTargetTree().get());
}
//-----------------------------------------------------------------------------
@@ -174,9 +174,9 @@ NodeRef NodeChange::getBaseNode() const
Tree NodeChange::getAffectedTree() const
{
if (this->maybeChange())
- return Tree(m_pImpl->getDataAccessor(), m_pImpl->getTargetTree().get());
+ return Tree(m_pImpl->getTargetTree().get());
else
- return Tree(m_pImpl->getDataAccessor(), 0);
+ return Tree(NULL);
}
//-----------------------------------------------------------------------------