From 97bddf1ec9444ed2e6775a7da6cbf339019db43c Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?R=C3=BCdiger=20Timm?= <rt@openoffice.org>
Date: Mon, 16 Jun 2008 12:38:49 +0000
Subject: [PATCH] INTEGRATION: CWS sb88 (1.7.10); FILE MERGED 2008/06/03
 15:29:47 sb 1.7.10.1: #i89553 applied patch by cmc

---
 configmgr/source/backend/binarywritehandler.hxx |  5 +----
 configmgr/source/backend/layerupdatemerger.hxx  |  3 +--
 configmgr/source/inc/anynoderef.hxx             | 15 +++------------
 3 files changed, 5 insertions(+), 18 deletions(-)

diff --git a/configmgr/source/backend/binarywritehandler.hxx b/configmgr/source/backend/binarywritehandler.hxx
index 890912004011..8d90ac064e91 100644
--- a/configmgr/source/backend/binarywritehandler.hxx
+++ b/configmgr/source/backend/binarywritehandler.hxx
@@ -7,7 +7,7 @@
  * OpenOffice.org - a multi-platform office productivity suite
  *
  * $RCSfile: binarywritehandler.hxx,v $
- * $Revision: 1.7 $
+ * $Revision: 1.8 $
  *
  * This file is part of OpenOffice.org.
  *
@@ -109,9 +109,6 @@ namespace configmgr
             void writeStop()
                 SAL_THROW( (io::IOException, uno::RuntimeException) );
 
-            void writeType(uno::Type const& _aType)
-                SAL_THROW( (io::IOException, uno::RuntimeException) );
-
             void writeValue( uno::Any const& _aValue)
                 SAL_THROW( (io::IOException, uno::RuntimeException) );
 
diff --git a/configmgr/source/backend/layerupdatemerger.hxx b/configmgr/source/backend/layerupdatemerger.hxx
index e80b53232821..9b293db25091 100644
--- a/configmgr/source/backend/layerupdatemerger.hxx
+++ b/configmgr/source/backend/layerupdatemerger.hxx
@@ -7,7 +7,7 @@
  * OpenOffice.org - a multi-platform office productivity suite
  *
  * $RCSfile: layerupdatemerger.hxx,v $
- * $Revision: 1.7 $
+ * $Revision: 1.8 $
  *
  * This file is part of OpenOffice.org.
  *
@@ -120,7 +120,6 @@ namespace configmgr
             virtual void flushUpdate();
         private:
             void malformedUpdate(sal_Char const * pMsg);
-            void illegalUpdate(sal_Char const * pMsg);
         private:
             LayerUpdate                 m_aLayerUpdate;
             NodeUpdateRef               m_xCurrentNode;
diff --git a/configmgr/source/inc/anynoderef.hxx b/configmgr/source/inc/anynoderef.hxx
index c25b4a035f25..107e017eac99 100644
--- a/configmgr/source/inc/anynoderef.hxx
+++ b/configmgr/source/inc/anynoderef.hxx
@@ -7,7 +7,7 @@
  * OpenOffice.org - a multi-platform office productivity suite
  *
  * $RCSfile: anynoderef.hxx,v $
- * $Revision: 1.7 $
+ * $Revision: 1.8 $
  *
  * This file is part of OpenOffice.org.
  *
@@ -101,8 +101,9 @@ namespace configmgr
             friend class TreeImplHelper;
             AnyNodeRef(NodeOffset nParentPos, TreeDepth m_nDepth);
             AnyNodeRef(Name const& aName, NodeOffset nParentPos);
-
+#if OSL_DEBUG_LEVEL > 0
             bool checkValidState() const;
+#endif
         private:
             Name        m_sNodeName;
             NodeOffset  m_nUsedPos;
@@ -110,16 +111,6 @@ namespace configmgr
         };
     //-------------------------------------------------------------------------
 
-        /** checks whether there are any immediate children of <var>aNode</var> (which is in <var>aTree</var>)
-
-            @return
-                <TRUE/> if a child node exists
-                <FALSE/> otherwise
-        */
-        inline
-        bool hasChildOrElement(Tree const& aTree, AnyNodeRef const& aNode)
-        { return aNode.isNode() && hasChildOrElement(aTree,aNode.toNode()); }
-
         /** checks whether there is an immediate child of <var>aNode</var> (which is in <var>aTree</var>)
             specified by <var>aName</var>