INTEGRATION: CWS sb88 (1.26.10); FILE MERGED

2008/06/03 15:29:54 sb 1.26.10.1: #i89553 applied patch by cmc
This commit is contained in:
Rüdiger Timm
2008-06-16 13:08:32 +00:00
parent fb65417ddd
commit c98b39b0a4

View File

@@ -7,7 +7,7 @@
* OpenOffice.org - a multi-platform office productivity suite * OpenOffice.org - a multi-platform office productivity suite
* *
* $RCSfile: treeimpl.hxx,v $ * $RCSfile: treeimpl.hxx,v $
* $Revision: 1.26 $ * $Revision: 1.27 $
* *
* This file is part of OpenOffice.org. * This file is part of OpenOffice.org.
* *
@@ -286,15 +286,6 @@ namespace configmgr
*/ */
NodeOffset firstChild_ (NodeOffset nParent) const; NodeOffset firstChild_ (NodeOffset nParent) const;
/** gets the <type>NodeOffset</type> of the next node
after <var>nNode</var> in this tree (in list order)
that has the same parent node,
or 0 (zero) if there is no such node
<p>PRE: <code>isValidNode(nNode)</code>
</p>
*/
NodeOffset nextSibling_(NodeOffset nNode) const;
/** gets the <type>NodeOffset</type> of the first child node /** gets the <type>NodeOffset</type> of the first child node
of node <var>nParent</var> that is after of node <var>nParent</var> that is after
node <var>nNode</var> in this tree (in list order) node <var>nNode</var> in this tree (in list order)
@@ -331,9 +322,6 @@ namespace configmgr
NodeImpl const& nodeImpl(NodeOffset nNode) const { return nodeData(nNode)->nodeImpl(); } NodeImpl const& nodeImpl(NodeOffset nNode) const { return nodeData(nNode)->nodeImpl(); }
NodeOffset nodeOffset(NodeData const & rNodeData) const; NodeOffset nodeOffset(NodeData const & rNodeData) const;
// dynamic_cast replacement
RootTreeImpl * asRootTree();
RootTreeImpl const * asRootTree() const;
ElementTreeImpl * asElementTree(); ElementTreeImpl * asElementTree();
ElementTreeImpl const* asElementTree() const; ElementTreeImpl const* asElementTree() const;
@@ -444,8 +432,6 @@ namespace configmgr
/// take ownership of the given tree (which must already be the one in use) /// take ownership of the given tree (which must already be the one in use)
void takeTreeBack(data::TreeSegment const& _aElementData); void takeTreeBack(data::TreeSegment const& _aElementData);
/// release ownership
data::TreeSegment getOwnedTree() const;
/// release ownership /// release ownership
data::TreeSegment releaseOwnedTree(); data::TreeSegment releaseOwnedTree();
@@ -545,12 +531,6 @@ namespace configmgr
static static
ValueRef makeValue(Name const& aName, NodeOffset nParentOffset); ValueRef makeValue(Name const& aName, NodeOffset nParentOffset);
static
AnyNodeRef makeAnyNode(NodeOffset nOffset, TreeDepth nDepth);
static
AnyNodeRef makeAnyNode(Name const& aName, NodeOffset nParentOffset);
static static
TreeImpl* impl(Tree const& aTree); TreeImpl* impl(Tree const& aTree);
@@ -582,12 +562,13 @@ namespace configmgr
//----------------------------------------------------------------------------- //-----------------------------------------------------------------------------
class ElementTree; class ElementTree;
//----------------------------------------------------------------------------- //-----------------------------------------------------------------------------
#if OSL_DEBUG_LEVEL > 0
struct ElementHelper struct ElementHelper
{ {
static static
UnoType getUnoType(ElementTree const& aElement); UnoType getUnoType(ElementTree const& aElement);
}; };
#endif
//----------------------------------------------------------------------------- //-----------------------------------------------------------------------------
} }
//----------------------------------------------------------------------------- //-----------------------------------------------------------------------------