diff options
author | Kurt Zenker <kz@openoffice.org> | 2009-06-04 15:47:31 +0000 |
---|---|---|
committer | Kurt Zenker <kz@openoffice.org> | 2009-06-04 15:47:31 +0000 |
commit | c60ba8c007d730f9553e50b70de5696632166392 (patch) | |
tree | 12e20440c86363994fe77fc4aad4dce3f1dd623e /autodoc/source/display | |
parent | 4fbb6a8a259b4b3203e5d7d9272531e2ca8bc308 (diff) |
CWS-TOOLING: integrate CWS cmcfixes59
2009-05-18 10:10:11 +0200 cmc r272001 : #i102012# remove extensions warnings, and set as warnings-free
2009-05-16 17:29:59 +0200 cmc r271981 : #i101990# silence warning, logic is unchanged
2009-05-16 17:13:59 +0200 cmc r271980 : #i100412 remove warning, logic is unchanged
2009-05-16 17:08:57 +0200 cmc r271979 : #i100412 remove warning, logic is unchanged, matches comments for intent
2009-05-16 17:01:08 +0200 cmc r271978 : #i86576# remove uncallable code
2009-05-16 15:41:46 +0200 cmc r271977 : #i101988# fix up consts for warning-free
Diffstat (limited to 'autodoc/source/display')
31 files changed, 6 insertions, 463 deletions
diff --git a/autodoc/source/display/html/aryattrs.cxx b/autodoc/source/display/html/aryattrs.cxx index d33785fb43af..4a8ca3f6c44d 100644 --- a/autodoc/source/display/html/aryattrs.cxx +++ b/autodoc/source/display/html/aryattrs.cxx @@ -81,25 +81,6 @@ Ce_IsInternal( const ary::cpp::CodeEntity & i_rCe ) } const char * -Namespace_DisplayName( const ary::cpp::Namespace & i_rNsp ) -{ - return i_rNsp.Depth() > 0 - ? i_rNsp.LocalName().c_str() - : "GlobalNamespace of C++"; -} - -const char * -TypeText( ary::cpp::Type_id i_nId, - const ary::cpp::Gate & i_rAryGate ) -{ - static StreamStr sResult(2000); - sResult.seekp(0); - i_rAryGate.Types().Get_TypeText(sResult, i_nId); - - return sResult.c_str(); -} - -const char * SyntaxText_PreName( const ary::cpp::Function & i_rFunction, const ary::cpp::Gate & i_rAryGate ) { diff --git a/autodoc/source/display/html/aryattrs.hxx b/autodoc/source/display/html/aryattrs.hxx index 5eaead6b7a5f..a1cb7a6d0ea4 100644 --- a/autodoc/source/display/html/aryattrs.hxx +++ b/autodoc/source/display/html/aryattrs.hxx @@ -59,15 +59,6 @@ const char * Get_TypeKey( bool Ce_IsInternal( const ary::cpp::CodeEntity & i_rCe ); - -const char * Namespace_DisplayName( - const ary::cpp::Namespace & - i_rNsp ); - -const char * TypeText( - ary::cpp::Type_id i_nId, - const ary::cpp::Gate & i_rAryGate ); - const char * SyntaxText_PreName( const ary::cpp::Function & i_rFunction, diff --git a/autodoc/source/display/html/dsply_op.cxx b/autodoc/source/display/html/dsply_op.cxx index 99337f05f359..9c460f74f4eb 100644 --- a/autodoc/source/display/html/dsply_op.cxx +++ b/autodoc/source/display/html/dsply_op.cxx @@ -64,15 +64,6 @@ OperationsDisplay::~OperationsDisplay() } void -OperationsDisplay::PrepareForGlobals() -{ - if (pClassMembersDisplay) - pClassMembersDisplay = 0; - - csv::erase_map_of_heap_ptrs( aMap_GlobalFunctionsDisplay ); -} - -void OperationsDisplay::PrepareForStdMembers() { csv::erase_map_of_heap_ptrs( aMap_GlobalFunctionsDisplay ); diff --git a/autodoc/source/display/html/dsply_op.hxx b/autodoc/source/display/html/dsply_op.hxx index c62d90211676..2ef609cadc9e 100644 --- a/autodoc/source/display/html/dsply_op.hxx +++ b/autodoc/source/display/html/dsply_op.hxx @@ -68,7 +68,6 @@ class OperationsDisplay : public ary::Display, io_rInfo ); virtual ~OperationsDisplay(); - void PrepareForGlobals(); void PrepareForStdMembers(); void PrepareForStaticMembers(); void Create_Files(); diff --git a/autodoc/source/display/html/easywri.cxx b/autodoc/source/display/html/easywri.cxx index 893f6ce1e7c3..7fe416539cd6 100644 --- a/autodoc/source/display/html/easywri.cxx +++ b/autodoc/source/display/html/easywri.cxx @@ -59,22 +59,6 @@ EasyWriter::Finish_OutputNode() aCurDestination.pop(); } -void -EasyWriter::Add_HorizontalLine() -{ - Out() << new HorizontalLine; -} - -void -EasyWriter::Write( const char * i_sFormatTag, - const char * i_sText ) -{ - DYN csi::xml::Element * dpNew = new csi::xml::APureElement( i_sFormatTag ); - *dpNew << i_sText; - Out() << dpNew; -} - - csi::xml::Element & EasyWriter::Out() { diff --git a/autodoc/source/display/html/easywri.hxx b/autodoc/source/display/html/easywri.hxx index 011d0d4b19fc..22b5338b4aa7 100644 --- a/autodoc/source/display/html/easywri.hxx +++ b/autodoc/source/display/html/easywri.hxx @@ -59,11 +59,6 @@ class EasyWriter { Open_OutputNode(io_rDestination); } void Leave() { Finish_OutputNode(); } - void Add_HorizontalLine(); - void Write( - const char * i_sFormatTag, - const char * i_sText ); - // ACCESS csi::xml::Element & Out(); // CurOutputNode diff --git a/autodoc/source/display/html/hd_chlst.cxx b/autodoc/source/display/html/hd_chlst.cxx index 1697c3fc7cdd..89c759d1ccbc 100644 --- a/autodoc/source/display/html/hd_chlst.cxx +++ b/autodoc/source/display/html/hd_chlst.cxx @@ -78,12 +78,6 @@ struct ChildList_Display::S_AreaCo Area_Result & o_rResult, const char * i_sLabel, const char * i_sTitle ); - S_AreaCo( - Area_Result & o_rResult, - const char * i_sLabel, - const char * i_sTitle_classes, - const char * i_sTitle_structs, - const char * i_sTitle_unions ); ~S_AreaCo(); void PerformResult(); @@ -564,17 +558,6 @@ S_AreaCo::S_AreaCo( Area_Result & o_rResult, } ChildList_Display:: -S_AreaCo::S_AreaCo( Area_Result & o_rResult, - const char * i_sLabel, - const char * i_sTitle_classes, - const char * i_sTitle_structs, - const char * i_sTitle_unions ) - : aArea(i_sLabel, i_sTitle_classes, i_sTitle_structs, i_sTitle_unions ), - pResult(&o_rResult) -{ -} - -ChildList_Display:: S_AreaCo::~S_AreaCo() { } diff --git a/autodoc/source/display/html/hdimpl.cxx b/autodoc/source/display/html/hdimpl.cxx index 3e72b57edb38..f4a6a8bf14c5 100644 --- a/autodoc/source/display/html/hdimpl.cxx +++ b/autodoc/source/display/html/hdimpl.cxx @@ -288,19 +288,6 @@ Get_LinkedTypeText( csi::xml::Element & o_rOut, << sPostName; } - -csi::html::Table & -Create_ChildListTable( csi::xml::Element & o_rParentElement, - const char * i_sTitle, - const char * i_sLabel ) -{ - Create_ChildListLabel(o_rParentElement, i_sLabel); - csi::html::Table & ret = Create_ChildListTable(i_sTitle); - o_rParentElement << &ret; - - return ret; -} - void Create_ChildListLabel( csi::xml::Element & o_rParentElement, const char * i_sLabel ) diff --git a/autodoc/source/display/html/hdimpl.hxx b/autodoc/source/display/html/hdimpl.hxx index 1bac430a0353..6b3c195d845d 100644 --- a/autodoc/source/display/html/hdimpl.hxx +++ b/autodoc/source/display/html/hdimpl.hxx @@ -127,10 +127,6 @@ const char * PathPerNamespace( i_rEnv, const char * i_sPathFromNamespaceDir ); -csi::html::Table & Create_ChildListTable( - csi::xml::Element & o_rParentElement, - const char * i_sTitle, - const char * i_sLabel ); void Create_ChildListLabel( csi::xml::Element & o_rParentElement, const char * i_sLabel ); diff --git a/autodoc/source/display/html/html_kit.cxx b/autodoc/source/display/html/html_kit.cxx index 191a9d28a396..7d6bf1a2e3e6 100644 --- a/autodoc/source/display/html/html_kit.cxx +++ b/autodoc/source/display/html/html_kit.cxx @@ -46,15 +46,6 @@ using namespace csi::xml; using namespace csi::html; -PageTitle_Central::PageTitle_Central( XmlElement & o_rOwner ) -{ - pOut = new AnElement("h1"); - o_rOwner - >> *pOut - << new AlignAttr("center"); -} - - void PageTitle_Left::operator()( XmlElement & o_rOwner, const char * i_sTypeTitle, @@ -295,24 +286,6 @@ FlagTable::SetColumn( uintt i_nColumnPosition, } // endif } -void -FlagTable::SetColumn( uintt i_nColumnPosition, - const char * i_sColumnName, - const char * i_sValue ) -{ - csv_assert( i_nColumnPosition < aCells.size() ); - - TableCell & - rCell1 = *aCells[i_nColumnPosition].first; - TableCell & - rCell2 = *aCells[i_nColumnPosition].second; - rCell1 - << i_sColumnName; - rCell2 - << new ClassAttr( "flagtext" ) - << i_sValue; -} - IndexList::IndexList( XmlElement & o_rOwner ) : pList( new DefList ), pTerm(0), diff --git a/autodoc/source/display/html/html_kit.hxx b/autodoc/source/display/html/html_kit.hxx index 325b0dd1d786..aa082200f80c 100644 --- a/autodoc/source/display/html/html_kit.hxx +++ b/autodoc/source/display/html/html_kit.hxx @@ -55,17 +55,6 @@ namespace adcdisp typedef csi::xml::Element XmlElement; -class PageTitle_Central -{ - public: - PageTitle_Central( - XmlElement & o_rOwner ); - XmlElement & Out() { return *pOut; } - - private: - XmlElement * pOut; -}; - class PageTitle_Left { public: @@ -179,10 +168,6 @@ class FlagTable uintt i_nColumnPosition, /// Starting with 0. const char * i_sColumnName, bool i_bValue ); /// "YES" or "NO" - void SetColumn( - uintt i_nColumnPosition, /// Starting with 0. - const char * i_sColumnName, - const char * i_sValue ); private: typedef std::pair< csi::html::TableCell*, csi::html::TableCell* > CellPair; diff --git a/autodoc/source/display/html/navibar.cxx b/autodoc/source/display/html/navibar.cxx index 8c5ba037d682..d6046d99d8c7 100644 --- a/autodoc/source/display/html/navibar.cxx +++ b/autodoc/source/display/html/navibar.cxx @@ -144,6 +144,12 @@ SubRow::SubRow( const char * i_sTitle ) SubRow::~SubRow() { + for ( List_Items::iterator it = aItemList.begin(); + it != aItemList.end(); + ++it ) + { + delete (*it); + } } inline void diff --git a/autodoc/source/display/html/opageenv.cxx b/autodoc/source/display/html/opageenv.cxx index a81050e3eed4..657dc49839f5 100644 --- a/autodoc/source/display/html/opageenv.cxx +++ b/autodoc/source/display/html/opageenv.cxx @@ -57,18 +57,9 @@ const String C_sIndexDir( "ix" ); namespace { -void CreateDirectory( const String & i_sPath ); void CreateDirectory( const csv::ploc::Path & i_rPath ); void -CreateDirectory( const String & i_sPath ) -{ - csv::ploc::Directory aDirectory(i_sPath); - if (NOT aDirectory.Exists()) - aDirectory.PhysicalCreate(); -} - -void CreateDirectory( const csv::ploc::Path & i_rPath ) { csv::ploc::Directory aDirectory(i_rPath); diff --git a/autodoc/source/display/html/outfile.cxx b/autodoc/source/display/html/outfile.cxx index fc3c06a12f57..f6fe8ab9b613 100644 --- a/autodoc/source/display/html/outfile.cxx +++ b/autodoc/source/display/html/outfile.cxx @@ -258,13 +258,6 @@ HtmlDocuFile::SetTitle( const char * i_sTitle ) } void -HtmlDocuFile::SetBodyAttr( const char * i_sAttrName, - const char * i_sAttrValue ) -{ - aBodyData << new AnAttribute( i_sAttrName, i_sAttrValue ); -} - -void HtmlDocuFile::SetCopyright( const char * i_sCopyright ) { sCopyright = i_sCopyright; diff --git a/autodoc/source/display/html/outfile.hxx b/autodoc/source/display/html/outfile.hxx index 1df4cf4b284d..535147332efb 100644 --- a/autodoc/source/display/html/outfile.hxx +++ b/autodoc/source/display/html/outfile.hxx @@ -56,9 +56,6 @@ class HtmlDocuFile uintt i_depthInOutputTree ); void SetTitle( const char * i_sTitle ); - void SetBodyAttr( - const char * i_sAttrName, - const char * i_sAttrValue ); void SetCopyright( const char * i_sCopyright ); void EmptyBody(); diff --git a/autodoc/source/display/html/protarea.cxx b/autodoc/source/display/html/protarea.cxx index 7ea02ed0c346..a41e81e03933 100644 --- a/autodoc/source/display/html/protarea.cxx +++ b/autodoc/source/display/html/protarea.cxx @@ -56,22 +56,6 @@ ProtectionArea::ProtectionArea( const char * i_sLabel, { } -ProtectionArea::ProtectionArea( const char * i_sLabel, - const char * i_sTitle_class, - const char * i_sTitle_struct, - const char * i_sTitle_union ) - : pSglTable(0), - aClassesTables(), - sLabel(i_sLabel) -{ - aClassesTables[ Index(ary::cpp::CK_class) ] - = new S_Slot_Table(i_sTitle_class); - aClassesTables[ Index(ary::cpp::CK_struct) ] - = new S_Slot_Table(i_sTitle_struct); - aClassesTables[ Index(ary::cpp::CK_union) ] - = new S_Slot_Table(i_sTitle_union); -} - ProtectionArea::~ProtectionArea() { @@ -131,19 +115,6 @@ ProtectionArea::WasUsed_Area() const OR static_cast< cdyntab& >(aClassesTables[2])->WasUsed(); } -bool -ProtectionArea::WasUsed_Table() const -{ - return pSglTable->WasUsed(); -} - -bool -ProtectionArea::WasUsed_Table( ary::cpp::E_ClassKey i_eClassKey ) const -{ - return aClassesTables[Index(i_eClassKey)]->WasUsed(); -} - - //******************* S_Slot_Table **********************// ProtectionArea:: diff --git a/autodoc/source/display/html/protarea.hxx b/autodoc/source/display/html/protarea.hxx index 403945d3ec80..c60731d33758 100644 --- a/autodoc/source/display/html/protarea.hxx +++ b/autodoc/source/display/html/protarea.hxx @@ -51,11 +51,6 @@ class ProtectionArea ProtectionArea( const char * i_sLabel, const char * i_sTitle ); - ProtectionArea( - const char * i_sLabel, - const char * i_sTitle_class, - const char * i_sTitle_struct, - const char * i_sTitle_union ); ~ProtectionArea(); csi::html::Table & GetTable(); @@ -71,10 +66,6 @@ class ProtectionArea int Size() const { return pSglTable ? 1 : 3; } bool WasUsed_Area() const; - bool WasUsed_Table() const; - bool WasUsed_Table( - ary::cpp::E_ClassKey - i_eClassKey ) const; private: struct S_Slot_Table { diff --git a/autodoc/source/display/idl/hfi_hierarchy.cxx b/autodoc/source/display/idl/hfi_hierarchy.cxx index a9c918664009..6ba2a439311e 100644 --- a/autodoc/source/display/idl/hfi_hierarchy.cxx +++ b/autodoc/source/display/idl/hfi_hierarchy.cxx @@ -47,17 +47,6 @@ -HF_IdlBaseNode::HF_IdlBaseNode( const CE & i_rCe, - const GATE & i_rGate ) - : nType(0), - aBases(), - nCountBases(0), - nPosition(0), - pDerived(0) -{ - GatherBases(i_rCe, i_rGate); -} - HF_IdlBaseNode::HF_IdlBaseNode( const TYPE & i_rType, const GATE & i_rGate, intt i_nPositionOffset, @@ -93,90 +82,6 @@ HF_IdlBaseNode::FillPositionList( std::vector< const HF_IdlBaseNode* > & o_rPosi } void -HF_IdlBaseNode::WriteBaseHierarchy( csi::xml::Element & o_rOut, - const HF_IdlInterface & io_rDisplayer, - const String & i_sMainNodesText ) -{ - typedef const HF_IdlBaseNode * NodePtr; - typedef std::vector<NodePtr> NodeList; - - // Get base classes in sequence of display: - NodeList aPositionList; - intt nSize = Position()+1; - aPositionList.reserve(nSize); - FillPositionList( aPositionList ); - - // Write out hierarchy: - csi::xml::Element & - rPre = o_rOut - >> *new csi::xml::AnElement("pre") - << new csi::html::StyleAttr("font-family:monospace;"); - io_rDisplayer.Out().Enter(rPre); - - for ( int line = 0; line < nSize; ++line ) - { - char * sLine1 = new char[2 + line*5]; - char * sLine2 = new char[1 + line*5]; - *sLine1 = '\0'; - *sLine2 = '\0'; - - bool bBaseForThisLineReached = false; - for ( int col = 0; col < line; ++col ) - { - intt nDerivPos = aPositionList[col]->Derived()->Position(); - - if ( nDerivPos >= line ) - strcat(sLine1, " | "); - else - strcat(sLine1, " "); - - if ( nDerivPos > line ) - { - strcat(sLine2, " | "); - } - else if ( nDerivPos == line ) - { - if (NOT bBaseForThisLineReached) - { - bBaseForThisLineReached = true; - strcat(sLine2, " +--"); - } - else - { - strcat(sLine2, "--+--"); - } - } - else // nDerivPos < line - { - if (bBaseForThisLineReached) - strcat(sLine2, "-----"); - else - strcat(sLine2, " "); - } - } // end for (col) - strcat(sLine1,"\n"); - rPre - << sLine1 - << sLine2; - delete [] sLine1; - delete [] sLine2; - - if (line < nSize - 1) - { - io_rDisplayer.Display_BaseNode(*aPositionList[line]); - } - else - { - rPre - >> *new Html::Strong - << i_sMainNodesText; - } - rPre << "\n"; - } // end for (line) - io_rDisplayer.Out().Leave(); -} - -void HF_IdlBaseNode::GatherBases( const CE & i_rCe, const GATE & i_rGate ) { diff --git a/autodoc/source/display/idl/hfi_hierarchy.hxx b/autodoc/source/display/idl/hfi_hierarchy.hxx index 17618257839c..556908b4869e 100644 --- a/autodoc/source/display/idl/hfi_hierarchy.hxx +++ b/autodoc/source/display/idl/hfi_hierarchy.hxx @@ -65,18 +65,6 @@ class HF_IdlBaseNode typedef ary::idl::Ce_id Ce_id; typedef ary::idl::Type_id Type_id; - /** Constructor for the most derived class, whose base hierarchy - is to be built. - - The constructor recursively calls further constructors of - HF_IdlBaseNode for the bases of ->i_rCe. - So it builds up a complete hierarchy tree of all base classes - of ->i_rCe. - */ - HF_IdlBaseNode( - const CE & i_rCe, - const GATE & i_rGate ); - /** @descr The constructor recursively calls further constructors of HF_IdlBaseNode for the bases of ->i_rType, if ->i_rType matches to a @@ -98,26 +86,6 @@ class HF_IdlBaseNode std::vector< const HF_IdlBaseNode* > & o_rPositionList ) const; - /** Writes the base hierarchy of this node into ->o_rOut. - - It ends at the position where the name of the most derived - class would have to be written. Example: - - abc::MyClass - | - | AnotherClass - | | - +--+--XYZ - - The "XYZ" would NOT be written, that is the task of the caller. - - */ - void WriteBaseHierarchy( - csi::xml::Element & o_rOut, - const HF_IdlInterface & - io_rDisplayer, - const String & i_sMainNodesText ); - Type_id Type() const { return nType; } intt BaseCount() const { return nCountBases; } intt Position() const { return nPosition; } diff --git a/autodoc/source/display/idl/hfi_interface.cxx b/autodoc/source/display/idl/hfi_interface.cxx index e3760945a7c5..26d548c613e8 100644 --- a/autodoc/source/display/idl/hfi_interface.cxx +++ b/autodoc/source/display/idl/hfi_interface.cxx @@ -293,32 +293,6 @@ HF_IdlInterface::produce_BaseHierarchy( Xml::Element & o_screen, // NEW Write_BaseHierarchy(rBaseList, Env(), i_ce); -// csi::xml::Element & -// rPre = rBaseList -// >> *new csi::xml::AnElement("pre") -// << new csi::html::StyleAttr("font-family:monospace;"); -// -// std::vector<uintt> -// aSetColumns; -// rPre -// >> *new csi::html::Strong -// << i_ce.LocalName(); -// rPre -// << "\n"; -// Write_BaseHierarchy( rPre, -// Env(), -// i_ce, -// Env().Gate(), -// aSetColumns ); -// -// rPre -// << "\n"; -// NEW - -// HF_IdlBaseNode -// aMyNode(i_ce, Env().Gate()); -// aMyNode.WriteBaseHierarchy(rBaseList, *this, i_ce.LocalName()); - // Write comments: // KORR_FUTURE: Make sure, no empty table is constructed when comments list is empty. @@ -384,13 +358,3 @@ HF_IdlInterface::produce_BaseHierarchy( Xml::Element & o_screen, } // endif ( (*i_commentedRef).Info() != 0 ) else } // end for } - -void -HF_IdlInterface::Display_BaseNode( const HF_IdlBaseNode & i_rNode ) const -{ - // KORR_FUTURE: Check if Env().CurPageCe() is really always the right one - // (probably works). - HF_IdlTypeText - aDisplay( Env(), CurOut(), true, Env().CurPageCe()); - aDisplay.Produce_byData(i_rNode.Type()); -} diff --git a/autodoc/source/display/idl/hfi_interface.hxx b/autodoc/source/display/idl/hfi_interface.hxx index dacb2daa58a6..b737d26f7cbf 100644 --- a/autodoc/source/display/idl/hfi_interface.hxx +++ b/autodoc/source/display/idl/hfi_interface.hxx @@ -55,9 +55,6 @@ class HF_IdlInterface : public HtmlFactory_Idl void Produce_byData( const client & i_ce ) const; - void Display_BaseNode( - const HF_IdlBaseNode & - i_rNode ) const; private: // Locals DYN HF_NaviSubRow & make_Navibar( diff --git a/autodoc/source/display/idl/hfi_tag.cxx b/autodoc/source/display/idl/hfi_tag.cxx index 8d194bc43222..99f4a83732ca 100644 --- a/autodoc/source/display/idl/hfi_tag.cxx +++ b/autodoc/source/display/idl/hfi_tag.cxx @@ -93,28 +93,6 @@ HF_IdlTag::Produce_byData( Xml::Element & o_rTitle, } void -HF_IdlTag::Produce_byData( Xml::Element & o_rTitle, - Xml::Element & o_rText, - const std::vector< csi::dsapi::DT_SeeAlsoAtTag* > & - i_seeAlsoVector ) const -{ - o_rTitle << "See also"; - for ( std::vector< csi::dsapi::DT_SeeAlsoAtTag* >::const_iterator - it = i_seeAlsoVector.begin(); - it != i_seeAlsoVector.end(); - ++it ) - { - if (it != i_seeAlsoVector.begin()) - { - o_rText << ", "; - } - HF_IdlTypeText - aLinkText(Env(), o_rText, true, &aTextOut.ScopeGivingCe()); - aLinkText.Produce_byData( (*it)->LinkText() ); - } -} - -void HF_IdlTag::Display_StdAtTag( const csi::dsapi::DT_StdAtTag & i_rTag ) { if ( i_rTag.Text().IsEmpty() ) diff --git a/autodoc/source/display/idl/hfi_tag.hxx b/autodoc/source/display/idl/hfi_tag.hxx index 23f16a46919f..c070c5d15a0a 100644 --- a/autodoc/source/display/idl/hfi_tag.hxx +++ b/autodoc/source/display/idl/hfi_tag.hxx @@ -142,11 +142,6 @@ class HF_IdlTag : public HtmlFactory_Idl, Xml::Element & o_rText, const ary::inf::AtTag2 & i_rTag ) const; - void Produce_byData( - Xml::Element & o_rTitle, - Xml::Element & o_rText, - const std::vector< csi::dsapi::DT_SeeAlsoAtTag* > & - i_seeAlsoVector ) const; private: virtual void Display_StdAtTag( const csi::dsapi::DT_StdAtTag & diff --git a/autodoc/source/display/idl/hfi_typetext.cxx b/autodoc/source/display/idl/hfi_typetext.cxx index 310a1691b315..1d4b720e7d1e 100644 --- a/autodoc/source/display/idl/hfi_typetext.cxx +++ b/autodoc/source/display/idl/hfi_typetext.cxx @@ -651,28 +651,6 @@ HF_IdlTypeText::errorOut_UnresolvedLink( const StringVector & i_module, errorOut_UnresolvedLink(slName().c_str()); } -void -HF_IdlTypeText::errorOut_UnresolvedLink( const String & i_module, - const String & i_ce, - const String & i_member ) const -{ - StreamLock slName(500); - - if (i_module.size() > 0) - { - slName() << i_module; - if (NOT i_ce.empty()) - slName() << "::"; - } - if (NOT i_ce.empty()) - { - slName() << i_ce; - if (NOT i_member.empty()) - slName() << "::" << i_member; - } - errorOut_UnresolvedLink(slName().c_str()); -} - bool HF_IdlTypeText::is_ExternLink( const StringVector & i_module ) const { diff --git a/autodoc/source/display/idl/hfi_typetext.hxx b/autodoc/source/display/idl/hfi_typetext.hxx index 007eff351ba3..98296e12f20c 100644 --- a/autodoc/source/display/idl/hfi_typetext.hxx +++ b/autodoc/source/display/idl/hfi_typetext.hxx @@ -125,10 +125,6 @@ class HF_IdlTypeText : public HtmlFactory_Idl i_module, const String & i_ce, const String & i_member ) const; - void errorOut_UnresolvedLink( - const String & i_module, - const String & i_ce, - const String & i_member ) const; bool is_ExternLink( const StringVector & i_module ) const; diff --git a/autodoc/source/display/idl/hi_linkhelper.cxx b/autodoc/source/display/idl/hi_linkhelper.cxx index 73f4e5afa89f..26c612ee4841 100644 --- a/autodoc/source/display/idl/hi_linkhelper.cxx +++ b/autodoc/source/display/idl/hi_linkhelper.cxx @@ -66,20 +66,6 @@ LinkHelper::Search_Module( output::Node & i_node ) const return & rEnv.Data().Find_Module( ary::idl::Ce_id(nId) ); } -LinkHelper::OutPosition -LinkHelper::PositionOf_Ce(const CE & i_ce) const -{ - static StringVector aModule_; - csv::erase_container(aModule_); - String sCe; - String sMember; - rEnv.Data().Get_CeText(aModule_, sCe, sMember, i_ce); - output::Node & - rNode = rEnv.OutputTree().RootNode().Provide_Child(aModule_); - return OutPosition(rNode,sCe); -} - - namespace { const String C_sXrefsSuffix("-xref"); diff --git a/autodoc/source/display/idl/hi_linkhelper.hxx b/autodoc/source/display/idl/hi_linkhelper.hxx index 45f9465d32ce..98b3f43f1716 100644 --- a/autodoc/source/display/idl/hi_linkhelper.hxx +++ b/autodoc/source/display/idl/hi_linkhelper.hxx @@ -56,8 +56,6 @@ class LinkHelper OutPosition PositionOf_CurModule() const { return OutPosition( rEnv.CurPosition(), output::ModuleFileName()); } - OutPosition PositionOf_Ce( - const CE & i_ce ) const; OutPosition PositionOf_CurXRefs( const String & i_ceName) const; @@ -75,21 +73,6 @@ class LinkHelper const CE * Search_CeFromType( ary::idl::Type_id i_type ) const; - -// OutPosition Search_Ce( -// String & o_member, -// const char * i_sText, -// OutPosition * i_referingScope = 0 ) const; - -// OutPosition PositionOf_Ce( -// const char * i_sScope, -// const char * i_sCeName ) const -// { const CE * -// pce = rEnv.Data().Search_Ce( i_sScope, -// i_sCeName ); -// if (pce != 0) return rEnv.Data().PositionOfCe(*pce); -// else return OutPosition(); } - void Get_Link2Position( StreamStr & o_link, OutPosition & i_pos ) const diff --git a/autodoc/source/display/inc/toolkit/htmlfile.hxx b/autodoc/source/display/inc/toolkit/htmlfile.hxx index bb3fe906cd49..02a6ce9d1fd6 100644 --- a/autodoc/source/display/inc/toolkit/htmlfile.hxx +++ b/autodoc/source/display/inc/toolkit/htmlfile.hxx @@ -56,8 +56,6 @@ class DocuFile_Html i_rFilePath ); void SetTitle( const char * i_sTitle ); - void SetInlineStyle( - const char * i_sStyle ); void SetRelativeCssPath( const char * i_sCssFile_relativePath ); void SetCopyright( diff --git a/autodoc/source/display/inc/toolkit/out_position.hxx b/autodoc/source/display/inc/toolkit/out_position.hxx index 8c98c39554b1..2426f37277a6 100644 --- a/autodoc/source/display/inc/toolkit/out_position.hxx +++ b/autodoc/source/display/inc/toolkit/out_position.hxx @@ -75,9 +75,6 @@ class Position void Get_Chain( StringVector & o_result ) const { pDirectory->Get_Chain(o_result); } - String LinkTo( - const Position & i_destination, - const String & i_localLabel = String::Null_() ) const; String LinkToRoot( const String & i_localLabel = String::Null_() ) const; diff --git a/autodoc/source/display/toolkit/htmlfile.cxx b/autodoc/source/display/toolkit/htmlfile.cxx index 954be214aa91..c0a33d098849 100644 --- a/autodoc/source/display/toolkit/htmlfile.cxx +++ b/autodoc/source/display/toolkit/htmlfile.cxx @@ -72,12 +72,6 @@ DocuFile_Html::SetTitle( const char * i_sTitle ) } void -DocuFile_Html::SetInlineStyle( const char * i_sStyle ) -{ - sStyle = i_sStyle; -} - -void DocuFile_Html::SetRelativeCssPath( const char * i_sCssFile_relativePath ) { sCssFile = i_sCssFile_relativePath; diff --git a/autodoc/source/display/toolkit/out_position.cxx b/autodoc/source/display/toolkit/out_position.cxx index e86801795398..13c5596e5f7e 100644 --- a/autodoc/source/display/toolkit/out_position.cxx +++ b/autodoc/source/display/toolkit/out_position.cxx @@ -133,16 +133,6 @@ Position::operator-=( intt i_levels ) } String -Position::LinkTo( const Position & i_destination, - const String & i_localLabel ) const -{ - StreamLock aLink(C_nAssumedMaxLinkLength); - StreamStr & rLink = aLink(); - Get_LinkTo(rLink, i_destination, i_localLabel); - return rLink.c_str(); -} - -String Position::LinkToRoot( const String & ) const { StreamLock sl(C_nAssumedMaxLinkLength); |