INTEGRATION: CWS sb88 (1.11.10); FILE MERGED

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

1 files changed, 3 insertions, 40 deletions

diff --git a/configmgr/source/treemgr/nodechangeinfo.cxx b/configmgr/source/treemgr/nodechangeinfo.cxx
index d70d11d18ffa..b0120ad91afc 100644
--- a/configmgr/source/treemgr/nodechangeinfo.cxx
+++ b/configmgr/source/treemgr/nodechangeinfo.cxx
@@ -7,7 +7,7 @@
  * OpenOffice.org - a multi-platform office productivity suite
  *
  * $RCSfile: nodechangeinfo.cxx,v $
- * $Revision: 1.11 $
+ * $Revision: 1.12 $
  *
  * This file is part of OpenOffice.org.
  *
@@ -93,32 +93,6 @@ Tree NodeChangeData::getOldElementTree() const
 }
 //-----------------------------------------------------------------------------
 
-NodeRef NodeChangeData::getNewElementNodeRef() const
-{
-    ElementTreeHolder newElement = this->element.newValue;
-    if ( newElement.is() &&  newElement->nodeCount() > 0)
-    {
-        NodeOffset n = newElement->root_();
-        return TreeImplHelper::makeNode( *newElement, n);
-    }
-    else
-        return NodeRef();
-}
-//-----------------------------------------------------------------------------
-
-NodeRef NodeChangeData::getOldElementNodeRef() const
-{
-    ElementTreeHolder oldElement = this->element.oldValue;
-    if ( oldElement.is() &&  oldElement->nodeCount() > 0)
-    {
-        NodeOffset n = oldElement->root_();
-        return TreeImplHelper::makeNode( *oldElement, n);
-    }
-    else
-        return NodeRef();
-}
-//-----------------------------------------------------------------------------
-
 NodeID NodeChangeData::getNewElementNodeID() const
 {
     ElementTreeHolder newElement = this->element.newValue;
@@ -162,6 +136,7 @@ bool NodeChangeLocation::isValidLocation() const
                             SubNodeID(m_affected,m_path.getLocalName().getName()).isValidNode()
                     ) )  ) );
 }
+#if OSL_DEBUG_LEVEL > 0
 //-----------------------------------------------------------------------------
 bool NodeChangeLocation::isValidData() const
 {
@@ -172,6 +147,7 @@ bool NodeChangeLocation::isValidData() const
                       (! m_bSubNodeChanging || !m_path.isEmpty() )
             )       );
 }
+#endif
 //-----------------------------------------------------------------------------
 
 void NodeChangeLocation::setAccessor(RelativePath const& aAccessor)
@@ -224,19 +200,6 @@ TreeRef NodeChangeLocation::getAffectedTreeRef() const
 }
 //-----------------------------------------------------------------------------
 
-Tree NodeChangeLocation::getAffectedTree() const
-{
-    return Tree( getAffectedTreeRef() );
-}
-//-----------------------------------------------------------------------------
-
-NodeRef NodeChangeLocation::getAffectedNode() const
-{
-    NodeID aAffected = this->getAffectedNodeID();
-    return TreeImplHelper::makeNode(aAffected);
-}
-//-----------------------------------------------------------------------------
-
 NodeID NodeChangeLocation::getAffectedNodeID() const
 {
     OSL_ENSURE(m_affected.isEmpty() || m_affected.isValidNode(), "Invalid target location set in NodeChangeLocation");