INTEGRATION: CWS sb88 (1.8.10); FILE MERGED

2008/06/03 15:29:53 sb 1.8.10.1: #i89553 applied patch by cmc

2 files changed, 2 insertions, 31 deletions

diff --git a/configmgr/source/tree/treenodefactory.cxx b/configmgr/source/tree/treenodefactory.cxx
index d6dc453a59..1c34e2f899 100644
--- a/configmgr/source/tree/treenodefactory.cxx
+++ b/configmgr/source/tree/treenodefactory.cxx
@@ -7,7 +7,7 @@
  * OpenOffice.org - a multi-platform office productivity suite
  *
  * $RCSfile: treenodefactory.cxx,v $
- * $Revision: 1.8 $
+ * $Revision: 1.9 $
  *
  * This file is part of OpenOffice.org.
  *
@@ -85,26 +85,6 @@ std::auto_ptr<ValueNode>  OTreeNodeFactory::createNullValueNode(
 }
 
 
-//= ISubtree ============================================================
-
-std::auto_ptr<ISubtree> OTreeNodeFactory::createDummyTree(Name const& _aName, Name const& _aElementTypeName)
-{
-    std::auto_ptr<ISubtree> pResult;
-
-    if (_aElementTypeName.isEmpty())
-    {
-        pResult.reset( new Subtree(_aName.toString(),node::Attributes()) );
-    }
-    else
-    {
-        pResult.reset( new Subtree(_aName.toString(),
-                                   _aElementTypeName.toString(),
-                                   getDummySetElementModule().toString(),
-                                   node::Attributes()) );
-    }
-    return pResult;
-}
-
 //-----------------------------------------------
 
 std::auto_ptr<ISubtree> OTreeNodeFactory::createGroupNode(
diff --git a/configmgr/source/treecache/cacheaccess.hxx b/configmgr/source/treecache/cacheaccess.hxx
index f80fa512d3..4a8c6fdcef 100644
--- a/configmgr/source/treecache/cacheaccess.hxx
+++ b/configmgr/source/treecache/cacheaccess.hxx
@@ -7,7 +7,7 @@
  * OpenOffice.org - a multi-platform office productivity suite
  *
  * $RCSfile: cacheaccess.hxx,v $
- * $Revision: 1.8 $
+ * $Revision: 1.9 $
  *
  * This file is part of OpenOffice.org.
  *
@@ -71,9 +71,6 @@ namespace configmgr
         /// removes an existing broadcast helper 
         ConfigChangeBroadcastHelper * releaseBroadcaster();
 
-        /// return TRUE if there is no data (left) in this object's cache data 
-        bool isEmpty();
-
         // attach a module with a given name
         void attachModule(data::TreeAddress _aLocation, CacheLine::Name const & _aModule);
         /// check if the given module exists already (and is not empty)
@@ -134,12 +131,6 @@ namespace configmgr
         /// clientRelease() the tree at aComponentName, and return the resulting reference count
         oslInterlockedCount releaseModule( CacheLine::Name const & _aModule ); 
 
-        /// retrieve the given subtree without changing its ref count
-        data::NodeAddress	findNode(CacheLine::Path const& _aPath );
-
-        /// merge the given change list into this tree - reflects old data to _aUpdate
-        void applyUpdate(backend::UpdateInstance & _aUpdate) CFG_UNO_THROW_RTE( );	
-
         /// collect the modules that can be disposed now (i.e. released after _rLimitReleaseTime)
         TimeStamp collectDisposeList(CacheLoadingAccess::DisposeList & _rList, 
                                         TimeStamp const & _aLimitTime,