INTEGRATION: CWS sb63 (1.5.70); FILE MERGED

2006/10/20 10:13:25 sb 1.5.70.1: #i69914#, #i69982# Patch by mmeeks: cleanup and memory shrink.

3 files changed, 10 insertions, 10 deletions

diff --git a/configmgr/source/inc/groupnodeaccess.hxx b/configmgr/source/inc/groupnodeaccess.hxx
index 55a52f6265f0..c3e4cb721e78 100644
--- a/configmgr/source/inc/groupnodeaccess.hxx
+++ b/configmgr/source/inc/groupnodeaccess.hxx
@@ -4,9 +4,9 @@
  *
  *  $RCSfile: groupnodeaccess.hxx,v $
  *
- *  $Revision: 1.5 $
+ *  $Revision: 1.6 $
  *
- *  last change: $Author: rt $ $Date: 2005-09-08 03:48:05 $
+ *  last change: $Author: kz $ $Date: 2006-11-06 14:47:55 $
  *
  *  The Contents of this file are made available subject to
  *  the terms of GNU Lesser General Public License Version 2.1.
@@ -124,7 +124,7 @@ namespace configmgr
     // -------------------------------------------------------------------------
         inline
         NodeAccess::Name GroupNodeAccess::getName() const
-        { return NodeAccess::wrapName( data().info.getName(m_aAccessor) ); }
+        { return NodeAccess::wrapName( data().info.getName() ); }
 
         inline
         NodeAccess::Attributes GroupNodeAccess::getAttributes() const
diff --git a/configmgr/source/inc/nodeaccess.hxx b/configmgr/source/inc/nodeaccess.hxx
index 854be1a8b077..339f52e968fd 100644
--- a/configmgr/source/inc/nodeaccess.hxx
+++ b/configmgr/source/inc/nodeaccess.hxx
@@ -4,9 +4,9 @@
  *
  *  $RCSfile: nodeaccess.hxx,v $
  *
- *  $Revision: 1.5 $
+ *  $Revision: 1.6 $
  *
- *  last change: $Author: rt $ $Date: 2005-09-08 03:51:08 $
+ *  last change: $Author: kz $ $Date: 2006-11-06 14:48:21 $
  *
  *  The Contents of this file are made available subject to
  *  the terms of GNU Lesser General Public License Version 2.1.
@@ -85,7 +85,7 @@ namespace configmgr
             bool isValid() const { return m_pData.is(); }
             bool isLocalRoot() const { return data().isFragmentRoot(); }
 
-            Name getName() const { return wrapName( data().getName(m_aAccessor) ); }
+            Name getName() const { return wrapName( data().getName() ); }
             Attributes getAttributes() const { return data().getAttributes(); }
 
             bool isDefault()   const { return data().isDefault(); }
@@ -143,7 +143,7 @@ namespace configmgr
             bool isValid() const { return m_pData.is(); }
             bool isLocalRoot() const { return data().isFragmentRoot(); }
 
-            Name getName() const { return NodeAccess::wrapName( data().getName(*m_pAccessor) ); }
+            Name getName() const { return NodeAccess::wrapName( data().getName() ); }
             Attributes getAttributes() const { return data().getAttributes(); }
 
             bool isDefault()   const { return data().isDefault(); }
diff --git a/configmgr/source/inc/treeaccessor.hxx b/configmgr/source/inc/treeaccessor.hxx
index 41cbf252e373..d80379c02e53 100644
--- a/configmgr/source/inc/treeaccessor.hxx
+++ b/configmgr/source/inc/treeaccessor.hxx
@@ -4,9 +4,9 @@
  *
  *  $RCSfile: treeaccessor.hxx,v $
  *
- *  $Revision: 1.5 $
+ *  $Revision: 1.6 $
  *
- *  last change: $Author: rt $ $Date: 2005-09-08 03:58:18 $
+ *  last change: $Author: kz $ $Date: 2006-11-06 14:48:46 $
  *
  *  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 @@ namespace configmgr
         inline
         TreeAccessor::Name TreeAccessor::getName() const
         {
-            return wrapName( data().getName(m_aAccessor) );
+            return wrapName( data().getName() );
         }
     // -------------------------------------------------------------------------
         inline