summaryrefslogtreecommitdiff
path: root/autodoc/source/display
diff options
context:
space:
mode:
Diffstat (limited to 'autodoc/source/display')
-rw-r--r--autodoc/source/display/idl/hfi_hierarchy.cxx2
-rw-r--r--autodoc/source/display/idl/hfi_interface.cxx2
-rw-r--r--autodoc/source/display/idl/hfi_method.cxx6
-rw-r--r--autodoc/source/display/idl/hfi_module.cxx2
-rw-r--r--autodoc/source/display/idl/hfi_navibar.hxx13
-rw-r--r--autodoc/source/display/idl/hfi_property.cxx14
-rw-r--r--autodoc/source/display/idl/hfi_service.cxx4
-rw-r--r--autodoc/source/display/idl/hfi_singleton.cxx4
-rw-r--r--autodoc/source/display/idl/hfi_siservice.cxx2
-rw-r--r--autodoc/source/display/idl/hfi_tag.cxx8
-rw-r--r--autodoc/source/display/idl/hfi_typedef.cxx2
-rw-r--r--autodoc/source/display/idl/hfi_typetext.cxx9
-rw-r--r--autodoc/source/display/idl/hfi_typetext.hxx2
-rw-r--r--autodoc/source/display/idl/hfi_xrefpage.cxx4
-rw-r--r--autodoc/source/display/idl/hi_factory.cxx4
15 files changed, 30 insertions, 48 deletions
diff --git a/autodoc/source/display/idl/hfi_hierarchy.cxx b/autodoc/source/display/idl/hfi_hierarchy.cxx
index a243c345fad7..19b18144abed 100644
--- a/autodoc/source/display/idl/hfi_hierarchy.cxx
+++ b/autodoc/source/display/idl/hfi_hierarchy.cxx
@@ -174,7 +174,7 @@ Write_Bases( csi::xml::Element & o_out,
o_out << " ";
HF_IdlTypeText
- aDisplay( i_env, o_out, true, i_env.CurPageCe());
+ aDisplay( i_env, o_out, i_env.CurPageCe());
aDisplay.Produce_byData(nType);
o_out << "\n";
diff --git a/autodoc/source/display/idl/hfi_interface.cxx b/autodoc/source/display/idl/hfi_interface.cxx
index fa6a1541a12e..1d6f59ece10b 100644
--- a/autodoc/source/display/idl/hfi_interface.cxx
+++ b/autodoc/source/display/idl/hfi_interface.cxx
@@ -307,7 +307,7 @@ HF_IdlInterface::produce_BaseHierarchy( Xml::Element & o_screen,
>> *new Html::TableCell
<< new Html::ClassAttr(C_sCellStyle_SummaryLeft);
HF_IdlTypeText
- aTypeDisplay( Env(), rTerm, false, 0);
+ aTypeDisplay( Env(), rTerm, 0);
aTypeDisplay.Produce_byData((*it).Type());
Xml::Element &
diff --git a/autodoc/source/display/idl/hfi_method.cxx b/autodoc/source/display/idl/hfi_method.cxx
index 2c5c4cdeec01..b351161f6e45 100644
--- a/autodoc/source/display/idl/hfi_method.cxx
+++ b/autodoc/source/display/idl/hfi_method.cxx
@@ -90,7 +90,7 @@ HF_IdlMethod::write_Declaration( const String & i_sName,
if (i_nReturnType.IsValid())
{ // Normal function, but not constructors:
HF_IdlTypeText
- aReturn(Env(), rReturnLine, true);
+ aReturn(Env(), rReturnLine);
aReturn.Produce_byData(i_nReturnType);
}
@@ -139,7 +139,7 @@ HF_IdlMethod::write_Declaration( const String & i_sName,
Xml::Element &
rExcOut = aDecl.ExceptionCell();
HF_IdlTypeText
- aExc(Env(), rExcOut, true);
+ aExc(Env(), rExcOut);
aExc.Produce_byData(*i_rExceptions);
for (++i_rExceptions; i_rExceptions; ++i_rExceptions)
@@ -185,7 +185,7 @@ HF_IdlMethod::write_Param( HF_FunctionDeclaration & o_decl,
} // end switch
HF_IdlTypeText
- aTypeWriter(Env(), rTypeCell, true);
+ aTypeWriter(Env(), rTypeCell);
aTypeWriter.Produce_byData( i_param.Type() );
rNameCell
diff --git a/autodoc/source/display/idl/hfi_module.cxx b/autodoc/source/display/idl/hfi_module.cxx
index d9d26ff44154..fc44003e826a 100644
--- a/autodoc/source/display/idl/hfi_module.cxx
+++ b/autodoc/source/display/idl/hfi_module.cxx
@@ -242,7 +242,7 @@ HF_IdlModule::produce_Link( Xml::Element & o_row,
if ( NOT ary::is_type<ary::idl::Module>(*i_ce) )
{
HF_IdlTypeText
- aText(Env(), rCell, true);
+ aText(Env(), rCell);
aText.Produce_byData(i_ce->CeId());
}
else
diff --git a/autodoc/source/display/idl/hfi_navibar.hxx b/autodoc/source/display/idl/hfi_navibar.hxx
index 9fd6938958ac..0ca5f4c5bd83 100644
--- a/autodoc/source/display/idl/hfi_navibar.hxx
+++ b/autodoc/source/display/idl/hfi_navibar.hxx
@@ -27,15 +27,6 @@
#include "hi_factory.hxx"
// PARAMETERS
-namespace ary
-{
-namespace idl
-{
-class CodeEntity;
-}
-}
-
-
class HF_NaviSubRow;
/** @resp
@@ -62,10 +53,6 @@ class HF_IdlNavigationBar : public HtmlFactory_Idl
/** Adds the subrow to the o_rOut argument of the constructor.
*/
DYN HF_NaviSubRow & Add_SubRow();
-
- private:
- const ary::idl::CodeEntity *
- pCe;
};
extern const String
diff --git a/autodoc/source/display/idl/hfi_property.cxx b/autodoc/source/display/idl/hfi_property.cxx
index de12d3d91e25..8c7cbb5f2907 100644
--- a/autodoc/source/display/idl/hfi_property.cxx
+++ b/autodoc/source/display/idl/hfi_property.cxx
@@ -139,7 +139,7 @@ HF_IdlProperty::write_Declaration( const client & i_ce ) const
} // end if
HF_IdlTypeText
- aType( Env(), CurOut(), true );
+ aType( Env(), CurOut() );
aType.Produce_byData( PropertyAttr::Type(i_ce) );
CurOut() << " " >> *new Html::Bold << i_ce.LocalName();
@@ -169,7 +169,7 @@ HF_IdlAttribute::write_Declaration( const client & i_ce ) const
}
HF_IdlTypeText
- aType( Env(), CurOut(), true );
+ aType( Env(), CurOut() );
aType.Produce_byData( AttributeAttr::Type(i_ce) );
CurOut()
@@ -194,7 +194,7 @@ HF_IdlAttribute::write_Declaration( const client & i_ce ) const
Xml::Element &
rGet = aSub.Produce_Definition();
HF_IdlTypeText
- aExc(Env(), rGet, true);
+ aExc(Env(), rGet);
type_list & itExc = *pGetExceptions;
rGet << "get raises (";
@@ -215,7 +215,7 @@ HF_IdlAttribute::write_Declaration( const client & i_ce ) const
Xml::Element &
rSet = aSub.Produce_Definition();
HF_IdlTypeText
- aExc(Env(), rSet, true);
+ aExc(Env(), rSet);
type_list & itExc = *pSetExceptions;
rSet << "set raises (";
@@ -274,7 +274,7 @@ HF_IdlConstant::write_Declaration( const client & i_ce ) const
{
CurOut() << "const ";
HF_IdlTypeText
- aType( Env(), CurOut(), true );
+ aType( Env(), CurOut() );
aType.Produce_byData(ConstantAttr::Type(i_ce));
CurOut()
<< " "
@@ -298,7 +298,7 @@ void
HF_IdlStructElement::write_Declaration( const client & i_ce ) const
{
HF_IdlTypeText
- aType( Env(), CurOut(), true );
+ aType( Env(), CurOut() );
aType.Produce_byData(StructElementAttr::Type(i_ce));
CurOut()
<< " "
@@ -425,7 +425,7 @@ HF_IdlCommentedRelationElement::write_Title( const client & /*i_ce*/ ) const
<< new Html::ClassAttr(C_sMemberTitle);
HF_IdlTypeText
- aText(Env(), rAnchor, true);
+ aText(Env(), rAnchor);
aText.Produce_byData(m_relation.Type());
}
diff --git a/autodoc/source/display/idl/hfi_service.cxx b/autodoc/source/display/idl/hfi_service.cxx
index a83966ec5777..97073b691279 100644
--- a/autodoc/source/display/idl/hfi_service.cxx
+++ b/autodoc/source/display/idl/hfi_service.cxx
@@ -285,7 +285,7 @@ HF_IdlService::produce_SummaryDeclaration( Xml::Element & o_row,
} // end if
HF_IdlTypeText
- aType( Env(), rCell, true );
+ aType( Env(), rCell );
aType.Produce_byData( PropertyAttr::Type(i_property) );
StreamLock aLocalLink(100);
@@ -325,7 +325,7 @@ HF_IdlService::produce_Link( Xml::Element & o_row,
>> *new Html::TableCell
<< new Html::ClassAttr(C_sCellStyle_SummaryLeft);
HF_IdlTypeText
- aText(Env(), rCell, true);
+ aText(Env(), rCell);
aText.Produce_byData(i_type);
}
diff --git a/autodoc/source/display/idl/hfi_singleton.cxx b/autodoc/source/display/idl/hfi_singleton.cxx
index 0641d40a92a9..23d17f904348 100644
--- a/autodoc/source/display/idl/hfi_singleton.cxx
+++ b/autodoc/source/display/idl/hfi_singleton.cxx
@@ -77,7 +77,7 @@ HF_IdlSingleton::Produce_byData_ServiceBased( const client & i_ce ) const
aTopList.Produce_Term(C_sAssociatedService);
HF_IdlTypeText
- aAssociatedService( Env(), aTopList.Produce_Definition(), true );
+ aAssociatedService( Env(), aTopList.Produce_Definition() );
aAssociatedService.Produce_byData( SingletonAttr::AssociatedService(i_ce) );
CurOut() << new Html::HorizontalLine;
@@ -105,7 +105,7 @@ HF_IdlSingleton::Produce_byData_InterfaceBased( const client & i_ce ) const
aTopList.Produce_Term(C_sImplementedInterface);
HF_IdlTypeText
- aImplementedInterface( Env(), aTopList.Produce_Definition(), true );
+ aImplementedInterface( Env(), aTopList.Produce_Definition() );
aImplementedInterface.Produce_byData( SglIfcSingletonAttr::BaseInterface(i_ce) );
CurOut() << new Html::HorizontalLine;
diff --git a/autodoc/source/display/idl/hfi_siservice.cxx b/autodoc/source/display/idl/hfi_siservice.cxx
index 617a0eff445b..5c221582c7c3 100644
--- a/autodoc/source/display/idl/hfi_siservice.cxx
+++ b/autodoc/source/display/idl/hfi_siservice.cxx
@@ -95,7 +95,7 @@ HF_IdlSglIfcService::Produce_byData( const client & i_ce ) const
aTopList.Produce_Term(C_sImplementedInterface);
HF_IdlTypeText
- aImplementedInterface( Env(), aTopList.Produce_Definition(), true, &i_ce);
+ aImplementedInterface( Env(), aTopList.Produce_Definition(), &i_ce);
aImplementedInterface.Produce_byData( SglIfcServiceAttr::BaseInterface(i_ce) );
CurOut() << new Html::HorizontalLine;
diff --git a/autodoc/source/display/idl/hfi_tag.cxx b/autodoc/source/display/idl/hfi_tag.cxx
index b69e4f697efa..3b5500b4b44b 100644
--- a/autodoc/source/display/idl/hfi_tag.cxx
+++ b/autodoc/source/display/idl/hfi_tag.cxx
@@ -98,7 +98,7 @@ HF_IdlTag::Produce_byData( Xml::Element & o_rTitle,
o_rText << ", ";
}
HF_IdlTypeText
- aLinkText(Env(), o_rText, true, &aTextOut.ScopeGivingCe());
+ aLinkText(Env(), o_rText, &aTextOut.ScopeGivingCe());
aLinkText.Produce_byData( (*it)->LinkText() );
}
}
@@ -123,7 +123,7 @@ HF_IdlTag::Display_SeeAlsoAtTag( const csi::dsapi::DT_SeeAlsoAtTag & i_rTag )
csv_assert( pTitleOut != 0 );
*pTitleOut << "See also";
- HF_IdlTypeText aLinkText(Env(),aTextOut.CurOut(),true, &aTextOut.ScopeGivingCe());
+ HF_IdlTypeText aLinkText(Env(),aTextOut.CurOut(), &aTextOut.ScopeGivingCe());
aLinkText.Produce_byData( i_rTag.LinkText() );
aTextOut.CurOut() << new Html::LineBreak;
@@ -316,7 +316,7 @@ HF_IdlDocuTextDisplay::CreateTypeLink()
CurOut() << sLinkToken;
return;
}
- HF_IdlTypeText aLink(Env(), CurOut(), true, &ScopeGivingCe());
+ HF_IdlTypeText aLink(Env(), CurOut(), &ScopeGivingCe());
aLink.Produce_LinkInDocu(sScope, sLinkToken, String::Null_());
}
@@ -324,7 +324,7 @@ void
HF_IdlDocuTextDisplay::CreateMemberLink()
{
- HF_IdlTypeText aLink(Env(), CurOut(), true, &ScopeGivingCe());
+ HF_IdlTypeText aLink(Env(), CurOut(), &ScopeGivingCe());
const char *
sSplit = strchr(sLinkToken,':');
diff --git a/autodoc/source/display/idl/hfi_typedef.cxx b/autodoc/source/display/idl/hfi_typedef.cxx
index 346ef37142ea..a477fcd05027 100644
--- a/autodoc/source/display/idl/hfi_typedef.cxx
+++ b/autodoc/source/display/idl/hfi_typedef.cxx
@@ -64,7 +64,7 @@ HF_IdlTypedef::Produce_byData( const client & i_ce ) const
aTopList.Produce_Term("Defining Type");
HF_IdlTypeText
- aDefinition( Env(), aTopList.Produce_Definition(), true );
+ aDefinition( Env(), aTopList.Produce_Definition() );
aDefinition.Produce_byData( TypedefAttr::DefiningType(i_ce) );
CurOut() << new Html::HorizontalLine;
diff --git a/autodoc/source/display/idl/hfi_typetext.cxx b/autodoc/source/display/idl/hfi_typetext.cxx
index 31e28d5c6992..a100066f3195 100644
--- a/autodoc/source/display/idl/hfi_typetext.cxx
+++ b/autodoc/source/display/idl/hfi_typetext.cxx
@@ -55,19 +55,16 @@ HF_IdlTypeText::referingCe() const
HF_IdlTypeText::HF_IdlTypeText( Environment & io_rEnv,
Xml::Element & o_rOut,
- bool i_bWithLink,
const client * i_pScopeGivingCe )
: HtmlFactory_Idl(io_rEnv, &o_rOut),
- pReferingCe( i_pScopeGivingCe ),
- bWithLink(i_bWithLink)
+ pReferingCe( i_pScopeGivingCe )
{
}
HF_IdlTypeText::HF_IdlTypeText( Environment & io_rEnv,
E_Index )
: HtmlFactory_Idl(io_rEnv, 0),
- pReferingCe( 0 ),
- bWithLink(true)
+ pReferingCe( 0 )
{
}
@@ -726,7 +723,7 @@ HF_IdlTypeText::write_TemplateParameterList(
return;
HF_IdlTypeText
- aTemplateParamWriter(Env(), CurOut(), true, pReferingCe);
+ aTemplateParamWriter(Env(), CurOut(), pReferingCe);
CurOut() << "< ";
std::vector<ary::idl::Type_id>::const_iterator
it = i_templateParameters.begin();
diff --git a/autodoc/source/display/idl/hfi_typetext.hxx b/autodoc/source/display/idl/hfi_typetext.hxx
index 4199a7984089..ea9ca0761263 100644
--- a/autodoc/source/display/idl/hfi_typetext.hxx
+++ b/autodoc/source/display/idl/hfi_typetext.hxx
@@ -44,7 +44,6 @@ class HF_IdlTypeText : public HtmlFactory_Idl
HF_IdlTypeText(
Environment & io_rEnv,
Xml::Element & o_rOut,
- bool i_bWithLink,
const client * i_pScopeGivingCe = 0 );
HF_IdlTypeText(
Environment & io_rEnv,
@@ -143,7 +142,6 @@ class HF_IdlTypeText : public HtmlFactory_Idl
// DATA
mutable const client *
pReferingCe;
- bool bWithLink;
};
diff --git a/autodoc/source/display/idl/hfi_xrefpage.cxx b/autodoc/source/display/idl/hfi_xrefpage.cxx
index 015b78dff53d..5abfe32a7fdf 100644
--- a/autodoc/source/display/idl/hfi_xrefpage.cxx
+++ b/autodoc/source/display/idl/hfi_xrefpage.cxx
@@ -136,7 +136,7 @@ HF_IdlXrefs::Produce_List( const char * i_title,
Xml::Element &
rOutCell = aList.Add_Row() >>* new Html::TableCell;
HF_IdlTypeText
- aTypeWriter(Env(), rOutCell, true, pClient);
+ aTypeWriter(Env(), rOutCell, pClient);
for ( ce_list & it = i_iterator; it; ++it )
{
aTypeWriter.Produce_byData(*it);
@@ -239,7 +239,7 @@ HF_IdlXrefs::recursive_make_ListInTree( Xml::Element & o_rDisplay,
const char * sLevelIndentation = " ";
HF_IdlTypeText
- aTypeWriter(Env(), o_rDisplay, true, &i_ce);
+ aTypeWriter(Env(), o_rDisplay, &i_ce);
for ( ; i_iterator.operator bool(); ++i_iterator )
{
for (uintt i = 0; i < i_level; ++i)
diff --git a/autodoc/source/display/idl/hi_factory.cxx b/autodoc/source/display/idl/hi_factory.cxx
index 0254686b0dad..b9d11ea4ba1e 100644
--- a/autodoc/source/display/idl/hi_factory.cxx
+++ b/autodoc/source/display/idl/hi_factory.cxx
@@ -280,7 +280,7 @@ HtmlFactory_Idl::recursive_ShowBases( Xml::Element & o_screen,
if (pCe == 0)
{
HF_IdlTypeText
- aText( Env(), o_screen, false );
+ aText( Env(), o_screen );
aText.Produce_byData( i_baseType );
o_screen
<< "\n";
@@ -289,7 +289,7 @@ HtmlFactory_Idl::recursive_ShowBases( Xml::Element & o_screen,
}
HF_IdlTypeText
- aBaseLink( Env(), o_screen, true );
+ aBaseLink( Env(), o_screen );
aBaseLink.Produce_byData(pCe->CeId());
o_screen
<< "\n";