INTEGRATION: CWS sb88 (1.6.10); FILE MERGED

2008/06/03 15:29:54 sb 1.6.10.1: #i89553 applied patch by cmc

2 files changed, 4 insertions, 18 deletions

diff --git a/configmgr/source/treemgr/viewaccess.hxx b/configmgr/source/treemgr/viewaccess.hxx
index d84cf223c7..b95a8b279c 100644
--- a/configmgr/source/treemgr/viewaccess.hxx
+++ b/configmgr/source/treemgr/viewaccess.hxx
@@ -7,7 +7,7 @@
  * OpenOffice.org - a multi-platform office productivity suite
  *
  * $RCSfile: viewaccess.hxx,v $
- * $Revision: 1.6 $
+ * $Revision: 1.7 $
  *
  * This file is part of OpenOffice.org.
  *
@@ -60,7 +60,6 @@ namespace configmgr
             typedef configuration::NodeOffset NodeOffset;
             configuration::NodeData* nodeData(NodeArg    _aNodeArg) const;
             configuration::NodeData* nodeData(NodeOffset _aNodePos) const;
-            bool isValid(NodeArg _aNodeArg) const;
 
             Node makeNode(NodeArg    _aNodeArg) const { return Node(m_aTree,nodeData(_aNodeArg)); }
             Node makeNode(NodeOffset _aNodePos) const { return Node(m_aTree,nodeData(_aNodePos)); }
@@ -157,11 +156,11 @@ namespace configmgr
         /// retrieve the current value of this node
         UnoAny getValue(ValueNode const& _aNode) const
             { return m_xStrategy->getValue(_aNode); }
-
+#if OSL_DEBUG_LEVEL > 0
         /// get the type of this value
         UnoType getValueType(ValueNode const& _aNode)	const
             { return m_xStrategy->getValueType(_aNode); }
-
+#endif
 
         // group node specific operations
         public:
diff --git a/configmgr/source/treemgr/viewnode.cxx b/configmgr/source/treemgr/viewnode.cxx
index 21d0fe56f4..b137e2f80d 100644
--- a/configmgr/source/treemgr/viewnode.cxx
+++ b/configmgr/source/treemgr/viewnode.cxx
@@ -7,7 +7,7 @@
  * OpenOffice.org - a multi-platform office productivity suite
  *
  * $RCSfile: viewnode.cxx,v $
- * $Revision: 1.6 $
+ * $Revision: 1.7 $
  *
  * This file is part of OpenOffice.org.
  *
@@ -68,13 +68,6 @@ namespace configmgr
         }
             
 //-----------------------------------------------------------------------------
-        Node Node::getNextSibling() const
-        {
-            Tree::TreeData * pTreeData = this->tree().get_impl();
-            return makeNode_(tree(), pTreeData->nextSibling_(this->get_offset()));
-        }
-
-//-----------------------------------------------------------------------------
         Node GroupNode::findChild(configuration::Name const& _aName) const
         {
             Tree::TreeData * pTreeData = this->tree().get_impl();
@@ -103,12 +96,6 @@ namespace configmgr
         }
 
 //-----------------------------------------------------------------------------
-        data::ValueNodeAccess ValueNode::getAccess() const
-        { 
-            return get_impl()->getDataAccess();
-        }
-
-//-----------------------------------------------------------------------------
         data::GroupNodeAccess GroupNode::getAccess() const
         { 
             return get_impl()->getDataAccess();