diff options
| author | Oliver Bolte <obo@openoffice.org> | 2004-11-15 12:34:11 +0000 |
|---|---|---|
| committer | Oliver Bolte <obo@openoffice.org> | 2004-11-15 12:34:11 +0000 |
| commit | ace4256cf8204077c4e5bc9239da7a3cecfaf74b (patch) | |
| tree | 4071065ae7efb9567993dd3fc70e7b5b8feb5c45 | |
| parent | 342625952c477f7313e3c85152744596b23e31ce (diff) | |
INTEGRATION: CWS adc9 (1.3.6); FILE MERGED
2004/11/09 17:29:34 np 1.3.6.1: #i33253#
| -rw-r--r-- | autodoc/source/display/idl/hfi_struct.cxx | 47 |
1 files changed, 37 insertions, 10 deletions
diff --git a/autodoc/source/display/idl/hfi_struct.cxx b/autodoc/source/display/idl/hfi_struct.cxx index 2c841f2263a3..6b974e5ff6d5 100644 --- a/autodoc/source/display/idl/hfi_struct.cxx +++ b/autodoc/source/display/idl/hfi_struct.cxx @@ -2,9 +2,9 @@ * * $RCSfile: hfi_struct.cxx,v $ * - * $Revision: 1.3 $ + * $Revision: 1.4 $ * - * last change: $Author: rt $ $Date: 2004-07-12 15:29:41 $ + * last change: $Author: obo $ $Date: 2004-11-15 13:34:11 $ * * The Contents of this file are made available subject to the terms of * either of the following licenses @@ -66,6 +66,7 @@ // NOT FULLY DEFINED SERVICES #include <ary/idl/i_ce.hxx> +#include <ary/idl/i_struct.hxx> #include <ary/idl/ik_exception.hxx> #include <ary/idl/ik_struct.hxx> #include <toolkit/hf_docentry.hxx> @@ -127,6 +128,16 @@ HF_IdlStruct::~HF_IdlStruct() void HF_IdlStruct::Produce_byData( const client & i_ce ) const { + const ary::idl::Struct * + pStruct = + bIsException + ? 0 + : static_cast< const ary::idl::Struct* >(&i_ce); + bool bIsTemplate = + pStruct != 0 + ? pStruct->TemplateParameterType().IsValid() + : false; + Dyn<HF_NaviSubRow> pNaviSubRow( &make_Navibar(i_ce) ); @@ -136,22 +147,39 @@ HF_IdlStruct::Produce_byData( const client & i_ce ) const aNameChain(aTitle.Add_Row()); aNameChain.Produce_CompleteChain(Env().CurPosition(), nameChainLinker); - aTitle.Produce_Title( StreamLock(200)() - << (bIsException - ? C_sCePrefix_Exception - : C_sCePrefix_Struct) - << " " - << i_ce.LocalName() - << c_str ); + + // Title: + StreamLock rTitle(200); + if (bIsTemplate) + rTitle() << "template "; + rTitle() + << (bIsException + ? C_sCePrefix_Exception + : C_sCePrefix_Struct) + << " " + << i_ce.LocalName(); + if (bIsTemplate) + { + csv_assert(pStruct != 0); + rTitle() + << "<" + << pStruct->TemplateParameter() + << ">"; + } + aTitle.Produce_Title( rTitle().c_str() ); + + // Bases: produce_Bases( aTitle.Add_Row(), i_ce, bIsException ? C_sBaseException : C_sBaseStruct ); + // Docu: write_Docu(aTitle.Add_Row(), i_ce); CurOut() << new Html::HorizontalLine(); + // Elements: dyn_ce_list dpElements; if (bIsException) @@ -204,4 +232,3 @@ HF_IdlStruct::produce_MemberDetails( HF_SubTitleTable & o_table, aElement( Env(), o_table ); aElement.Produce_byData(i_ce); } - |