From c98b39b0a4d96ed4a47e2f2b662a0b424c5b73cc Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?R=C3=BCdiger=20Timm?= Date: Mon, 16 Jun 2008 13:08:32 +0000 Subject: [PATCH] INTEGRATION: CWS sb88 (1.26.10); FILE MERGED 2008/06/03 15:29:54 sb 1.26.10.1: #i89553 applied patch by cmc --- configmgr/source/treemgr/treeimpl.hxx | 25 +++---------------------- 1 file changed, 3 insertions(+), 22 deletions(-) diff --git a/configmgr/source/treemgr/treeimpl.hxx b/configmgr/source/treemgr/treeimpl.hxx index 2de5ef70212c..4fcfbbf1c24e 100644 --- a/configmgr/source/treemgr/treeimpl.hxx +++ b/configmgr/source/treemgr/treeimpl.hxx @@ -7,7 +7,7 @@ * OpenOffice.org - a multi-platform office productivity suite * * $RCSfile: treeimpl.hxx,v $ - * $Revision: 1.26 $ + * $Revision: 1.27 $ * * This file is part of OpenOffice.org. * @@ -286,15 +286,6 @@ namespace configmgr */ NodeOffset firstChild_ (NodeOffset nParent) const; - /** gets the NodeOffset of the next node - after nNode in this tree (in list order) - that has the same parent node, - or 0 (zero) if there is no such node -

PRE: isValidNode(nNode) -

- */ - NodeOffset nextSibling_(NodeOffset nNode) const; - /** gets the NodeOffset of the first child node of node nParent that is after node nNode in this tree (in list order) @@ -331,9 +322,6 @@ namespace configmgr NodeImpl const& nodeImpl(NodeOffset nNode) const { return nodeData(nNode)->nodeImpl(); } NodeOffset nodeOffset(NodeData const & rNodeData) const; - // dynamic_cast replacement - RootTreeImpl * asRootTree(); - RootTreeImpl const * asRootTree() const; ElementTreeImpl * asElementTree(); ElementTreeImpl const* asElementTree() const; @@ -444,8 +432,6 @@ namespace configmgr /// take ownership of the given tree (which must already be the one in use) void takeTreeBack(data::TreeSegment const& _aElementData); - /// release ownership - data::TreeSegment getOwnedTree() const; /// release ownership data::TreeSegment releaseOwnedTree(); @@ -545,12 +531,6 @@ namespace configmgr static ValueRef makeValue(Name const& aName, NodeOffset nParentOffset); - static - AnyNodeRef makeAnyNode(NodeOffset nOffset, TreeDepth nDepth); - - static - AnyNodeRef makeAnyNode(Name const& aName, NodeOffset nParentOffset); - static TreeImpl* impl(Tree const& aTree); @@ -582,12 +562,13 @@ namespace configmgr //----------------------------------------------------------------------------- class ElementTree; //----------------------------------------------------------------------------- - +#if OSL_DEBUG_LEVEL > 0 struct ElementHelper { static UnoType getUnoType(ElementTree const& aElement); }; +#endif //----------------------------------------------------------------------------- } //-----------------------------------------------------------------------------