INTEGRATION: CWS adc9 (1.1.116); FILE MERGED
2004/11/09 17:39:30 np 1.1.116.1: #i31023#
This commit is contained in:
parent
95e2e8d24b
commit
ec58b6ae0a
2 changed files with 12 additions and 16 deletions
|
@ -2,9 +2,9 @@
|
|||
*
|
||||
* $RCSfile: htmlfactory.hxx,v $
|
||||
*
|
||||
* $Revision: 1.1 $
|
||||
* $Revision: 1.2 $
|
||||
*
|
||||
* last change: $Author: np $ $Date: 2002-11-01 17:15:18 $
|
||||
* last change: $Author: obo $ $Date: 2004-11-15 13:35:53 $
|
||||
*
|
||||
* The Contents of this file are made available subject to the terms of
|
||||
* either of the following licenses
|
||||
|
@ -95,6 +95,7 @@ class HtmlFactory
|
|||
ENV & io_rEnv,
|
||||
Xml::Element * o_pOut = 0 )
|
||||
: pEnv(&io_rEnv) { if (o_pOut != 0) aDestination.Enter(*o_pOut); }
|
||||
~HtmlFactory() {}
|
||||
private:
|
||||
// DATA
|
||||
ENV * pEnv;
|
||||
|
|
|
@ -2,9 +2,9 @@
|
|||
*
|
||||
* $RCSfile: out_node.cxx,v $
|
||||
*
|
||||
* $Revision: 1.1 $
|
||||
* $Revision: 1.2 $
|
||||
*
|
||||
* last change: $Author: np $ $Date: 2002-11-01 17:15:27 $
|
||||
* last change: $Author: obo $ $Date: 2004-11-15 13:36:22 $
|
||||
*
|
||||
* The Contents of this file are made available subject to the terms of
|
||||
* either of the following licenses
|
||||
|
@ -229,16 +229,13 @@ Node::find_Child( const String & i_name )
|
|||
Node &
|
||||
Node::add_Child( const String & i_name )
|
||||
{
|
||||
Dyn<Node> pNew( new Node(i_name,*this) );
|
||||
Node * pSearch = pNew.Ptr(); // Necessary, because Release() invalidates pNew.
|
||||
|
||||
List::iterator
|
||||
itNew = aChildren.insert( std::upper_bound( aChildren.begin(),
|
||||
aChildren.end(),
|
||||
pSearch,
|
||||
C_Less_NodePtr ),
|
||||
pSearch );
|
||||
return *pNew.Release(); // Release, because it is hold by aChildren now.
|
||||
DYN Node * pNew = new Node(i_name,*this);
|
||||
aChildren.insert( std::upper_bound( aChildren.begin(),
|
||||
aChildren.end(),
|
||||
pNew,
|
||||
C_Less_NodePtr ),
|
||||
pNew );
|
||||
return *pNew;
|
||||
}
|
||||
|
||||
Node &
|
||||
|
@ -260,6 +257,4 @@ Node::Null_()
|
|||
}
|
||||
|
||||
|
||||
|
||||
|
||||
} // namespace output
|
||||
|
|
Loading…
Reference in a new issue