INTEGRATION: CWS sb88 (1.13.10); FILE MERGED
2008/06/03 15:29:52 sb 1.13.10.1: #i89553 applied patch by cmc
This commit is contained in:
@@ -7,7 +7,7 @@
|
|||||||
* OpenOffice.org - a multi-platform office productivity suite
|
* OpenOffice.org - a multi-platform office productivity suite
|
||||||
*
|
*
|
||||||
* $RCSfile: builddata.cxx,v $
|
* $RCSfile: builddata.cxx,v $
|
||||||
* $Revision: 1.13 $
|
* $Revision: 1.14 $
|
||||||
*
|
*
|
||||||
* This file is part of OpenOffice.org.
|
* This file is part of OpenOffice.org.
|
||||||
*
|
*
|
||||||
@@ -98,7 +98,6 @@ namespace configmgr
|
|||||||
Node & lastNode() { checkOffset(0); return m_nodes.back(); }
|
Node & lastNode() { checkOffset(0); return m_nodes.back(); }
|
||||||
NodeInfo & lastNodeInfo() { checkOffset(0); return m_nodes.back().node.info; }
|
NodeInfo & lastNodeInfo() { checkOffset(0); return m_nodes.back().node.info; }
|
||||||
|
|
||||||
void resetTreeFragment();
|
|
||||||
void resetTreeFragment(sharable::String _treeName, State::Field _state);
|
void resetTreeFragment(sharable::String _treeName, State::Field _state);
|
||||||
|
|
||||||
TreeAddress createTreeFragment();
|
TreeAddress createTreeFragment();
|
||||||
@@ -529,13 +528,6 @@ Offset TreeNodeBuilder::addNode(Name _aName, Flags::Field _aFlags, Type::Field _
|
|||||||
}
|
}
|
||||||
//-----------------------------------------------------------------------------
|
//-----------------------------------------------------------------------------
|
||||||
|
|
||||||
void TreeNodeBuilder::resetTreeFragment()
|
|
||||||
{
|
|
||||||
State::Field nNullState = State::merged | State::flag_mandatory | State::flag_readonly;
|
|
||||||
this->resetTreeFragment(0,nNullState);
|
|
||||||
}
|
|
||||||
//-----------------------------------------------------------------------------
|
|
||||||
|
|
||||||
void TreeNodeBuilder::resetTreeFragment(sharable::String _name, State::Field _state)
|
void TreeNodeBuilder::resetTreeFragment(sharable::String _name, State::Field _state)
|
||||||
{
|
{
|
||||||
m_header.next = 0;
|
m_header.next = 0;
|
||||||
|
Reference in New Issue
Block a user