diff options
| author | Ivo Hinkelmann <ihi@openoffice.org> | 2007-11-23 13:43:23 +0000 |
|---|---|---|
| committer | Ivo Hinkelmann <ihi@openoffice.org> | 2007-11-23 13:43:23 +0000 |
| commit | e50ee1fb4f1b9daf483b6d988bb1e79be9c6f2d6 (patch) | |
| tree | f449f0f006cd72d617957725bfbaa34d3ee6d227 /configmgr/source | |
| parent | 3fbe090dcd83f55dc999b98caa6f814da0509e87 (diff) | |
INTEGRATION: CWS configrefactor01 (1.12.42); FILE MERGED
2007/01/12 14:50:46 mmeeks 1.12.42.3: Another big prune of memory::Accessor ...
2007/01/11 20:16:05 mmeeks 1.12.42.2: Submitted by: mmeeks
More re-factoring, lots of locking rationalized, drastically reduced
the mutex count, also removed ~300k interlocked increments with a non-interlocking
SimpleReferencedObject base
2007/01/11 10:35:39 mmeeks 1.12.42.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/source')
| -rw-r--r-- | configmgr/source/treemgr/nodechangeimpl.hxx | 16 |
1 files changed, 7 insertions, 9 deletions
diff --git a/configmgr/source/treemgr/nodechangeimpl.hxx b/configmgr/source/treemgr/nodechangeimpl.hxx index 9b976030216f..6278fe7977cc 100644 --- a/configmgr/source/treemgr/nodechangeimpl.hxx +++ b/configmgr/source/treemgr/nodechangeimpl.hxx @@ -4,9 +4,9 @@ * * $RCSfile: nodechangeimpl.hxx,v $ * - * $Revision: 1.12 $ + * $Revision: 1.13 $ * - * last change: $Author: hr $ $Date: 2006-06-19 23:32:49 $ + * last change: $Author: ihi $ $Date: 2007-11-23 14:43:23 $ * * The Contents of this file are made available subject to * the terms of GNU Lesser General Public License Version 2.1. @@ -50,8 +50,8 @@ #ifndef _RTL_REF_HXX_ #include <rtl/ref.hxx> #endif -#ifndef _SALHELPER_SIMPLEREFERENCEOBJECT_HXX_ -#include <salhelper/simplereferenceobject.hxx> +#ifndef CONFIGMGR_UTILITY_HXX_ +#include "utility.hxx" #endif #ifndef INCLUDED_VECTOR @@ -115,7 +115,7 @@ namespace configmgr /// represents a node position in some tree class NodeChangeImpl - : public salhelper::SimpleReferenceObject + : public configmgr::SimpleReferenceObject { public: explicit @@ -129,10 +129,9 @@ namespace configmgr /// the node that is affected by the change NodeOffset getTargetNode() const; - data::Accessor const& getDataAccessor() const { return m_aDataAccessor; } protected: /// setup the 'target' node that is to be affected or changed - void setTarget(data::Accessor const& _aAccessor, TreeHolder const& _aAffectedTree, NodeOffset _nAffectedNode); + void setTarget(TreeHolder const& _aAffectedTree, NodeOffset _nAffectedNode); void setTarget(view::Node _aAffectedNode); view::ViewTreeAccess getTargetView(); @@ -186,7 +185,6 @@ namespace configmgr private: typedef sal_uInt16 State; - data::Accessor m_aDataAccessor; TreeHolder m_aAffectedTree; NodeOffset m_nAffectedNode; State m_nState; @@ -212,7 +210,7 @@ namespace configmgr public: /// setup the 'target' node that is to be affected or changed void setTarget(view::GroupNode const& _aParentNode, Name const& sNodeName); - void setTarget(data::Accessor const& _aAccessor, TreeHolder const& aAffectedTree, NodeOffset nParentNode, Name const& sNodeName); + void setTarget(TreeHolder const& aAffectedTree, NodeOffset nParentNode, Name const& sNodeName); public: /// get the name of the value |