INTEGRATION: CWS adc18 (1.4.2); FILE MERGED

2007/10/18 15:23:13 np 1.4.2.1: #i81775#
This commit is contained in:
Jens-Heiner Rechtien
2007-11-02 15:33:23 +00:00
parent d4f4d2638a
commit 8ea43d9363
2 changed files with 9 additions and 11 deletions

View File

@@ -4,9 +4,9 @@
* *
* $RCSfile: pm_namsp.cxx,v $ * $RCSfile: pm_namsp.cxx,v $
* *
* $Revision: 1.4 $ * $Revision: 1.5 $
* *
* last change: $Author: vg $ $Date: 2007-09-18 13:55:09 $ * last change: $Author: hr $ $Date: 2007-11-02 16:33:05 $
* *
* The Contents of this file are made available subject to * The Contents of this file are made available subject to
* the terms of GNU Lesser General Public License Version 2.1. * the terms of GNU Lesser General Public License Version 2.1.
@@ -114,7 +114,7 @@ PageMaker_Namespace::Write_TopArea()
adcdisp::PageTitle_Std fTitle; adcdisp::PageTitle_Std fTitle;
xml::Element & rH3 = fTitle( CurOut() ); xml::Element & rH3 = fTitle( CurOut() );
if ( Env().CurNamespace()->Owner() != 0 ) if ( Env().CurNamespace()->Owner().IsValid() )
{ {
rH3 << C_sHFTypeTitle_Namespace rH3 << C_sHFTypeTitle_Namespace
<< " " << " "
@@ -133,7 +133,7 @@ PageMaker_Namespace::Write_DocuArea()
Docu_Display aDocuShow( Env() ); Docu_Display aDocuShow( Env() );
aDocuShow.Assign_Out(CurOut()); aDocuShow.Assign_Out(CurOut());
Me().Info().StoreAt( aDocuShow ); aDocuShow.Process(Me().Docu());
aDocuShow.Unassign_Out(); aDocuShow.Unassign_Out();
CurOut() << new HorizontalLine; CurOut() << new HorizontalLine;
@@ -179,6 +179,3 @@ PageMaker_Namespace::Write_ChildLists_forClasses( const char * i_sListTi
if ( bChildrenExist ) if ( bChildrenExist )
CurOut() << new HorizontalLine; CurOut() << new HorizontalLine;
} }

View File

@@ -4,9 +4,9 @@
* *
* $RCSfile: pm_start.cxx,v $ * $RCSfile: pm_start.cxx,v $
* *
* $Revision: 1.4 $ * $Revision: 1.5 $
* *
* last change: $Author: vg $ $Date: 2007-09-18 13:55:22 $ * last change: $Author: hr $ $Date: 2007-11-02 16:33:23 $
* *
* The Contents of this file are made available subject to * The Contents of this file are made available subject to
* the terms of GNU Lesser General Public License Version 2.1. * the terms of GNU Lesser General Public License Version 2.1.
@@ -90,7 +90,7 @@ void
PageMaker_Overview::Write_TopArea() PageMaker_Overview::Write_TopArea()
{ {
adcdisp::PageTitle_Std fTitle; adcdisp::PageTitle_Std fTitle;
fTitle( CurOut(), ary::Repository::The_().Name().c_str(), "" ); fTitle( CurOut(), Env().RepositoryTitle(), "" );
CurOut() CurOut()
>> *new Paragraph >> *new Paragraph
@@ -100,7 +100,8 @@ PageMaker_Overview::Write_TopArea()
<< new LineBreak << new LineBreak
<< "Points to start:"; << "Points to start:";
html::SimpleList & rList = *new html::SimpleList; html::SimpleList &
rList = *new html::SimpleList;
CurOut() >> rList; CurOut() >> rList;
html::ListItem & rNamedObjsItem = html::ListItem & rNamedObjsItem =