INTEGRATION: CWS sb63 (1.4.70); FILE MERGED

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

3 files changed, 18 insertions, 17 deletions

diff --git a/configmgr/source/inc/node.hxx b/configmgr/source/inc/node.hxx
index 768460527fa5..e9d5b2c98151 100644
--- a/configmgr/source/inc/node.hxx
+++ b/configmgr/source/inc/node.hxx
@@ -4,9 +4,9 @@
  *
  *  $RCSfile: node.hxx,v $
  *
- *  $Revision: 1.4 $
+ *  $Revision: 1.5 $
  *
- *  last change: $Author: rt $ $Date: 2005-09-08 03:50:55 $
+ *  last change: $Author: kz $ $Date: 2006-11-06 14:48:08 $
  *
  *  The Contents of this file are made available subject to
  *  the terms of GNU Lesser General Public License Version 2.1.
@@ -71,7 +71,7 @@ namespace configmgr
             Flags::Field    flags;
             Type ::Field    type;   // contains discriminator for union
 
-            rtl::OUString       getName(memory::Accessor const & _aAccessor) const;
+            rtl::OUString       getName() const;
             node::Attributes    getNodeInfoAttributes() const;
             bool isDefault() const;
             bool isLocalized() const;
@@ -114,13 +114,14 @@ namespace configmgr
 
             // low-level helper for template data abstraction
             static
-            Address allocTemplateData(memory::Allocator const & _anAllocator, NameChar const * pName, NameChar const * pModule);
+            Address allocTemplateData(memory::Allocator const & _anAllocator,
+                                      const rtl::OUString &rName,
+                                      const rtl::OUString &rModule);
             static
-            void releaseTemplateData(memory::Allocator const & _anAllocator, Address _aTemplateData);
-            static
-            NameChar const * getTemplateDataName(memory::Accessor const & _anAccessor, Address _aTemplateData);
+            Address copyTemplateData(memory::Allocator const & _anAllocator,
+                                     Address _aTemplateData);
             static
-            NameChar const * getTemplateDataModule(memory::Accessor const & _anAccessor, Address _aTemplateData);
+            void releaseTemplateData(memory::Allocator const & _anAllocator, Address _aTemplateData);
         };
     //-----------------------------------------------------------------------------
         struct ValueNode
@@ -150,8 +151,8 @@ namespace configmgr
             ValueNode value;
 
             // info access
-            bool isNamed(rtl::OUString const & _aName, memory::Accessor const & _aAccessor) const;
-            rtl::OUString       getName(memory::Accessor const & _aAccessor) const;
+            bool isNamed(rtl::OUString const & _aName) const;
+            rtl::OUString       getName() const;
             node::Attributes    getAttributes() const;
             bool isDefault() const;
             bool isLocalized() const;
diff --git a/configmgr/source/inc/setnodeaccess.hxx b/configmgr/source/inc/setnodeaccess.hxx
index f7b50c1ef1bc..4478f7a7121d 100644
--- a/configmgr/source/inc/setnodeaccess.hxx
+++ b/configmgr/source/inc/setnodeaccess.hxx
@@ -4,9 +4,9 @@
  *
  *  $RCSfile: setnodeaccess.hxx,v $
  *
- *  $Revision: 1.4 $
+ *  $Revision: 1.5 $
  *
- *  last change: $Author: rt $ $Date: 2005-09-08 03:56:11 $
+ *  last change: $Author: kz $ $Date: 2006-11-06 14:48:34 $
  *
  *  The Contents of this file are made available subject to
  *  the terms of GNU Lesser General Public License Version 2.1.
@@ -132,7 +132,7 @@ namespace configmgr
     // -------------------------------------------------------------------------
         inline
         NodeAccess::Name SetNodeAccess::getName() const
-        { return NodeAccess::wrapName( data().info.getName(m_aAccessor) ); }
+        { return NodeAccess::wrapName( data().info.getName() ); }
 
         inline
         NodeAccess::Name SetNodeAccess::getElementTemplateName()   const
diff --git a/configmgr/source/inc/treefragment.hxx b/configmgr/source/inc/treefragment.hxx
index 075c05ff1092..a01db528cb5d 100644
--- a/configmgr/source/inc/treefragment.hxx
+++ b/configmgr/source/inc/treefragment.hxx
@@ -4,9 +4,9 @@
  *
  *  $RCSfile: treefragment.hxx,v $
  *
- *  $Revision: 1.4 $
+ *  $Revision: 1.5 $
  *
- *  last change: $Author: rt $ $Date: 2005-09-08 03:59:29 $
+ *  last change: $Author: kz $ $Date: 2006-11-06 14:49:00 $
  *
  *  The Contents of this file are made available subject to
  *  the terms of GNU Lesser General Public License Version 2.1.
@@ -134,9 +134,9 @@ namespace configmgr
             bool isDefault() const;
             bool isNew() const;
 
-            bool isNamed(rtl::OUString const & _aName, memory::Accessor const & _aAccessor) const;
+            bool isNamed(rtl::OUString const & _aName) const;
 
-            rtl::OUString               getName(memory::Accessor const & _aAccessor) const;
+            rtl::OUString               getName() const;
             configmgr::node::Attributes getAttributes()const;
         };
     //-----------------------------------------------------------------------------