From 17ecf0036d44657b954de6c8f7efd536ab5c4809 Mon Sep 17 00:00:00 2001 From: Caolán McNamara Date: Tue, 24 Jan 2012 11:08:48 +0000 Subject: callcatcher: update list, remove newly unused methods --- autodoc/inc/ary/info/all_tags.hxx | 91 ------ autodoc/inc/ary/info/ci_attag.hxx | 2 - autodoc/inc/ary/info/ci_text.hxx | 2 - autodoc/inc/ary/info/infodisp.hxx | 13 - autodoc/source/ary/info/all_tags.cxx | 209 -------------- autodoc/source/ary/info/ci_attag.cxx | 8 - autodoc/source/ary/info/ci_text.cxx | 12 - autodoc/source/display/idl/hfi_linklist.cxx | 380 -------------------------- autodoc/source/display/idl/hfi_linklist.hxx | 147 ---------- autodoc/source/display/idl/hfi_method.hxx | 4 - autodoc/source/inc/tools/tkpchars.hxx | 3 - autodoc/source/parser/inc/tokens/stmstate.hxx | 3 - autodoc/source/parser/inc/tokens/stmstfin.hxx | 82 ------ autodoc/source/parser/inc/tokens/tkp.hxx | 8 - autodoc/source/parser/inc/tokens/tkpcontx.hxx | 4 - autodoc/source/parser/inc/tokens/tkpstama.hxx | 125 --------- autodoc/source/parser/tokens/makefile.mk | 2 - autodoc/source/parser/tokens/stmstate.cxx | 7 - autodoc/source/parser/tokens/stmstfin.cxx | 63 ----- autodoc/source/parser/tokens/tkp.cxx | 15 - autodoc/source/parser/tokens/tkpcontx.cxx | 10 - autodoc/source/parser/tokens/tkpstama.cxx | 175 ------------ autodoc/source/tools/tkpchars.cxx | 22 -- 23 files changed, 1387 deletions(-) delete mode 100644 autodoc/source/display/idl/hfi_linklist.cxx delete mode 100644 autodoc/source/display/idl/hfi_linklist.hxx delete mode 100644 autodoc/source/parser/inc/tokens/stmstfin.hxx delete mode 100644 autodoc/source/parser/inc/tokens/tkpstama.hxx delete mode 100644 autodoc/source/parser/tokens/stmstfin.cxx delete mode 100644 autodoc/source/parser/tokens/tkpstama.cxx (limited to 'autodoc') diff --git a/autodoc/inc/ary/info/all_tags.hxx b/autodoc/inc/ary/info/all_tags.hxx index 79bb4de3bc1e..4753601815d8 100644 --- a/autodoc/inc/ary/info/all_tags.hxx +++ b/autodoc/inc/ary/info/all_tags.hxx @@ -138,25 +138,6 @@ class ImplementsTag : public AtTag AtTag * pNext; }; -class KeywordTag : public AtTag -{ - public: - KeywordTag(); - - virtual bool Add_SpecialMeaningToken( - const char * i_sText, - intt i_nNr ); - virtual const char * - Title() const; - virtual UINT8 NrOfSpecialMeaningTokens() const; - virtual AtTag * GetFollower(); - - private: - virtual DocuText * Text(); - - StringVector sKeys; -}; - class ParameterTag : public AtTag { public: @@ -184,30 +165,6 @@ class ParameterTag : public AtTag AtTag * pNext; }; -class SeeTag : public AtTag -{ - public: - SeeTag(); - - virtual bool Add_SpecialMeaningToken( - const char * i_sText, - intt i_nNr ); - virtual const char * - Title() const; - virtual UINT8 NrOfSpecialMeaningTokens() const; - virtual AtTag * GetFollower(); - - const std::vector< QualifiedName > & - References() const { return sReferences; } - private: - virtual void do_StoreAt( - DocuDisplay & o_rDisplay ) const; - virtual DocuText * Text(); - - std::vector< QualifiedName > - sReferences; -}; - class TemplateTag : public AtTag { public: @@ -235,54 +192,6 @@ class TemplateTag : public AtTag AtTag * pNext; }; -class LabelTag : public AtTag -{ - public: - LabelTag(); - - virtual bool Add_SpecialMeaningToken( - const char * i_sText, - intt i_nNr ); - virtual const char * - Title() const; - virtual UINT8 NrOfSpecialMeaningTokens() const; - virtual AtTag * GetFollower(); - - private: - virtual DocuText * Text(); - - String sLabel; -}; - -class SinceTag : public AtTag -{ - public: - SinceTag(); - - virtual bool Add_SpecialMeaningToken( - const char * i_sText, - intt i_nNr ); - virtual const char * - Title() const; - virtual UINT8 NrOfSpecialMeaningTokens() const; - virtual AtTag * GetFollower(); - - const String & Version() const { return sVersion; } - - private: - virtual void do_StoreAt( - DocuDisplay & o_rDisplay ) const; - virtual DocuText * Text(); - - // Data - String sVersion; -}; - - - -// IMPLEMENTATION - - } } diff --git a/autodoc/inc/ary/info/ci_attag.hxx b/autodoc/inc/ary/info/ci_attag.hxx index 720e6014bce5..2e32e242be0b 100644 --- a/autodoc/inc/ary/info/ci_attag.hxx +++ b/autodoc/inc/ary/info/ci_attag.hxx @@ -51,8 +51,6 @@ class AtTag public: virtual ~AtTag() {} - void Set_HtmlUseInDocuText( - bool i_bUseIt ); virtual bool Add_SpecialMeaningToken( /// @return false, if token was not spüecial. const char * i_sText, intt i_nNr ) = 0; diff --git a/autodoc/inc/ary/info/ci_text.hxx b/autodoc/inc/ary/info/ci_text.hxx index 9c4331c6b7bb..4e8bf7a99073 100644 --- a/autodoc/inc/ary/info/ci_text.hxx +++ b/autodoc/inc/ary/info/ci_text.hxx @@ -61,8 +61,6 @@ class DocuText DYN DocuToken & let_drToken ) { aTokens.push_back(&let_drToken); } const TokenList & Tokens() const { return aTokens; } - void StoreAt( - DocuDisplay & o_rDisplay ) const; bool IsNoHtml() const { return NOT bUsesHtml; } bool IsEmpty() const { return aTokens.size() == 0; } diff --git a/autodoc/inc/ary/info/infodisp.hxx b/autodoc/inc/ary/info/infodisp.hxx index 38aae93b0feb..1a2f350be7be 100644 --- a/autodoc/inc/ary/info/infodisp.hxx +++ b/autodoc/inc/ary/info/infodisp.hxx @@ -44,12 +44,8 @@ namespace info class BaseTag; class ExceptionTag; class ImplementsTag; - class KeywordTag; class ParameterTag; - class SeeTag; class TemplateTag; - class LabelTag; - class SinceTag; class DT_Text; class DT_MaybeLink; class DT_Whitespace; @@ -79,20 +75,11 @@ class DocuDisplay virtual void Display_ImplementsTag( const ImplementsTag & i_rData ) = 0; - virtual void Display_KeywordTag( - const KeywordTag & i_rData ) = 0; virtual void Display_ParameterTag( const ParameterTag & i_rData ) = 0; - virtual void Display_SeeTag( - const SeeTag & i_rData ) = 0; virtual void Display_TemplateTag( const TemplateTag & i_rData ) = 0; - virtual void Display_LabelTag( - const LabelTag & i_rData ) = 0; - virtual void Display_SinceTag( - const ary::info::SinceTag & - i_rData ) = 0; virtual void Display_DT_Text( const DT_Text & i_rData ) = 0; virtual void Display_DT_MaybeLink( diff --git a/autodoc/source/ary/info/all_tags.cxx b/autodoc/source/ary/info/all_tags.cxx index 5699efc5bd0f..897ab6fc875c 100644 --- a/autodoc/source/ary/info/all_tags.cxx +++ b/autodoc/source/ary/info/all_tags.cxx @@ -244,49 +244,6 @@ ImplementsTag::Text() return 0; } - -//***************************** KeywordTag ***********************// - - -KeywordTag::KeywordTag() -// : sKeys -{ -} - -bool -KeywordTag::Add_SpecialMeaningToken( const char * i_sText, - intt ) -{ - sKeys.push_back(i_sText); - return true; -} - -const char * -KeywordTag::Title() const -{ - return "Keywords"; -} - -UINT8 -KeywordTag::NrOfSpecialMeaningTokens() const -{ - return std::numeric_limits::max(); -} - -AtTag * -KeywordTag::GetFollower() -{ - return this; -} - -DocuText * -KeywordTag::Text() -{ - return 0; -} - - - //***************************** ParameterTag ***********************// @@ -344,60 +301,6 @@ ParameterTag::do_StoreAt( DocuDisplay & o_rDisplay ) const o_rDisplay.Display_ParameterTag( *this ); } - - -//***************************** SeeTag ***********************// - - - -SeeTag::SeeTag() -// : sReferences -{ -} - -bool -SeeTag::Add_SpecialMeaningToken( const char * i_sText, - intt ) -{ - static QualifiedName aNull_; - sReferences.push_back(aNull_); - sReferences.back().AssignText(i_sText,"::"); - - return true; -} - -const char * -SeeTag::Title() const -{ - return "See Also"; -} - -UINT8 -SeeTag::NrOfSpecialMeaningTokens() const -{ - return std::numeric_limits::max(); -} - -AtTag * -SeeTag::GetFollower() -{ - return this; -} - -void -SeeTag::do_StoreAt( DocuDisplay & o_rDisplay ) const -{ - o_rDisplay.Display_SeeTag( *this ); -} - -DocuText * -SeeTag::Text() -{ - return 0; -} - - - //***************************** TemplateTag ***********************// @@ -453,118 +356,6 @@ TemplateTag::Text() return &aText; } - -//***************************** LabelTag ***********************// - - - -LabelTag::LabelTag() - : sLabel() -{ -} - -bool -LabelTag::Add_SpecialMeaningToken( const char * i_sText, - intt i_nNr ) -{ - if ( i_nNr == 1 AND sLabel.length() == 0 ) - { - sLabel = i_sText; - return true; - } - // KORR_FUTURE -// else // Throw exception because of double label. - return false; -} - -const char * -LabelTag::Title() const -{ - return "Label"; -} - -UINT8 -LabelTag::NrOfSpecialMeaningTokens() const -{ - return 1; -} - -AtTag * -LabelTag::GetFollower() -{ - return this; -} - -DocuText * -LabelTag::Text() -{ - return 0; -} - - -//***************************** SinceTag ***********************// - -SinceTag::SinceTag() - : sVersion() -{ -} - -bool -SinceTag::Add_SpecialMeaningToken( const char * i_sText, - intt ) -{ - const char cCiphersend = '9' + 1; - if ( sVersion.empty() - AND NOT csv::in_range('0', *i_sText, cCiphersend) - AND autodoc::CommandLine::Get_().DoesTransform_SinceTag() ) - { - return true; - } - - if (sVersion.empty()) - { - sVersion = i_sText; - } - else - { - StreamLock sHelp(100); - sVersion = sHelp() << sVersion << " " << i_sText << c_str; - } - - return true; -} - -const char * -SinceTag::Title() const -{ - return "Label"; -} - -UINT8 -SinceTag::NrOfSpecialMeaningTokens() const -{ - return UINT8(-1); -} - -AtTag * -SinceTag::GetFollower() -{ - return this; -} - -void -SinceTag::do_StoreAt( DocuDisplay & o_rDisplay ) const -{ - o_rDisplay.Display_SinceTag( *this ); -} - -DocuText * -SinceTag::Text() -{ - return 0; -} - - } // namespace info } // namespace ary diff --git a/autodoc/source/ary/info/ci_attag.cxx b/autodoc/source/ary/info/ci_attag.cxx index 73da1bebe9df..b8f6a20f9139 100644 --- a/autodoc/source/ary/info/ci_attag.cxx +++ b/autodoc/source/ary/info/ci_attag.cxx @@ -40,14 +40,6 @@ namespace ary namespace info { -void -AtTag::Set_HtmlUseInDocuText( bool i_bUseIt ) -{ - DocuText * pText = Text(); - if ( pText != 0 ) - pText->Set_HtmlUse(i_bUseIt); -} - void AtTag::Add_Token( const char * i_sText ) { diff --git a/autodoc/source/ary/info/ci_text.cxx b/autodoc/source/ary/info/ci_text.cxx index bf4aa5e7a362..e6f9460650e3 100644 --- a/autodoc/source/ary/info/ci_text.cxx +++ b/autodoc/source/ary/info/ci_text.cxx @@ -54,18 +54,6 @@ DocuText::~DocuText() } } -void -DocuText::StoreAt( DocuDisplay & o_rDisplay ) const -{ - ary::info::DocuText::TokenList::const_iterator itEnd = aTokens.end(); - for ( ary::info::DocuText::TokenList::const_iterator it = aTokens.begin(); - it != itEnd; - ++it ) - { - (*it)->StoreAt(o_rDisplay); - } -} - } // namespace info } // namespace ary diff --git a/autodoc/source/display/idl/hfi_linklist.cxx b/autodoc/source/display/idl/hfi_linklist.cxx deleted file mode 100644 index f0cf47e29c8c..000000000000 --- a/autodoc/source/display/idl/hfi_linklist.cxx +++ /dev/null @@ -1,380 +0,0 @@ -/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ -/************************************************************************* - * - * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * - * Copyright 2000, 2010 Oracle and/or its affiliates. - * - * OpenOffice.org - a multi-platform office productivity suite - * - * This file is part of OpenOffice.org. - * - * OpenOffice.org is free software: you can redistribute it and/or modify - * it under the terms of the GNU Lesser General Public License version 3 - * only, as published by the Free Software Foundation. - * - * OpenOffice.org is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU Lesser General Public License version 3 for more details - * (a copy is included in the LICENSE file that accompanied this code). - * - * You should have received a copy of the GNU Lesser General Public License - * version 3 along with OpenOffice.org. If not, see - * - * for a copy of the LGPLv3 License. - * - ************************************************************************/ - -#include -#include "hfi_linklist.hxx" - - -// NOT FULLY DEFINED SERVICES -#include -#include -#include -#include -#include -#include -#include "hfi_doc.hxx" -#include "hfi_tag.hxx" -#include "hfi_typetext.hxx" -#include "hi_ary.hxx" -#include "hi_env.hxx" - - - - -//******************* HF_CommentedLink_Table **********************************// - -HF_CommentedLink_Table::HF_CommentedLink_Table( Environment & io_rEnv, - Xml::Element & o_rOut, - const String & i_sTitle, - const String & i_sLabel, - bool i_bBorder ) - : HtmlFactory_Idl(io_rEnv,&o_rOut), - pTable( new Html::Table( (i_bBorder ? "1" : "0"), "100%", "5", "0") ), - pCurLinkColumn(0), - pCurCommentColumn(0) -{ - *pTable - << new Html::ClassAttr("commentedlinks"); - - CurOut() - >> *new Html::Label(i_sLabel) - << new Html::LineBreak; - CurOut() - << pTable; -// HF_SubTitle aTitle(*pTable); -// aTitle.Produce_it(i_sTitle); -} - -HF_CommentedLink_Table::~HF_CommentedLink_Table() -{ -} - -void -HF_CommentedLink_Table::Add_Line() -{ - Html::TableRow & - rRow = pTable->AddRow(); - - pCurLinkColumn = & (rRow.AddCell() - << new Html::WidthAttr("30%") - << new Xml::AnAttribute("valign","top") ); - pCurCommentColumn = & rRow.AddCell(); -} - -Xml::Element & -HF_CommentedLink_Table::Cur_LinkColumn() -{ - csv_assert(pCurLinkColumn != 0); - return *pCurLinkColumn; -} - -Xml::Element & -HF_CommentedLink_Table::Cur_CommentColumn() -{ - csv_assert(pCurCommentColumn != 0); - return *pCurCommentColumn; -} - - -//******************* HF_MemberTable **********************************// - -HF_MemberTable::HF_MemberTable( Environment & io_rEnv, - Xml::Element & o_rOut, - const String & i_sTitle, - const String & i_sLabel, - bool i_bInline ) - : HtmlFactory_Idl(io_rEnv,&o_rOut), - pTable( new Html::Table("1", "100%", "5", "0") ), - pCurDeclaration(0), - pCurDescription(0), - bInline(i_bInline) -{ - *pTable - << new Html::ClassAttr("memberlist"); - - CurOut() - >> *new Html::Label(i_sLabel) - << new Html::LineBreak; - CurOut() - << pTable; -// HF_SubTitle aTitle(*pTable); -// aTitle.Produce_it(i_sTitle); -} - -HF_MemberTable::~HF_MemberTable() -{ -} - -void -HF_MemberTable::Add_Line() -{ - if (bInline) - { - Html::TableRow & rRow = pTable->AddRow(); - - pCurDeclaration = &( rRow.AddCell() - << new Xml::AnAttribute("valign","top") - << new Html::WidthAttr("30%") ); - pCurDescription = & rRow.AddCell(); - } - else - { - Html::DefList * - pMemberSpace = new Html::DefList; - *pMemberSpace - << new Html::ClassAttr("member"); - - pTable->AddRow().AddCell() << pMemberSpace; - - pCurDeclaration = - & ( *pMemberSpace - >> *new Html::DefListTerm - << new Html::ClassAttr("member") ); - pCurDescription = - & ( *pMemberSpace - >> *new Html::DefListDefinition() - << new Html::ClassAttr("member") ); - } -} - -Xml::Element & -HF_MemberTable::Cur_Declaration() -{ - csv_assert(pCurDeclaration != 0); - return *pCurDeclaration; -} - -Xml::Element & -HF_MemberTable::Cur_Description() -{ - csv_assert(pCurDescription != 0); - return *pCurDescription; -} - - - -//******************* HF_IdlLinkList **********************************// - -HF_IdlLinkList::HF_IdlLinkList( Environment & io_rEnv, - Xml::Element * o_pOut ) - : HtmlFactory_Idl(io_rEnv,o_pOut) -{ -} - -HF_IdlLinkList::~HF_IdlLinkList() -{ -} - -void -HF_IdlLinkList::Produce_NamespaceMembers( const String & i_sTitle, - const String & i_sLabel, - const std::vector & i_rList, - bool i_bNestedNamespaces ) const -{ - HF_CommentedLink_Table - aTableMaker( Env(), CurOut(), - i_sTitle, i_sLabel, - true ); - - std::vector::const_iterator itEnd = i_rList.end(); - for ( std::vector::const_iterator it = i_rList.begin(); - it != itEnd; - ++it ) - { - static String sEntryName; - static String sEntryLink; - const ce_info * - pDocu = 0; - Get_EntryData_NamespaceMembers( sEntryName, sEntryLink, pDocu, *it, i_bNestedNamespaces ); - aTableMaker.Add_Line(); - - aTableMaker.Cur_LinkColumn() - >> *new Html::Link(sEntryLink) - << sEntryName; - - if ( pDocu != 0 ) - { - HF_IdlShortDocu - aTextDisplay(Env(), aTableMaker.Cur_CommentColumn() ); - aTextDisplay.Produce_byData( pDocu ); - } - } // end for -} - -void -HF_IdlLinkList::Produce_GlobalLinks( const String & i_sTitle, - const String & i_sLabel, - ce_list & i_rList ) const -{ - HF_CommentedLink_Table - aTableMaker( Env(), CurOut(), - i_sTitle, i_sLabel, - true ); - - for ( ; i_rList; ++i_rList ) - { - aTableMaker.Add_Line(); - HF_IdlTypeText - aLinkText( Env(), aTableMaker.Cur_LinkColumn(), true ); - aLinkText.Produce_byData(*i_rList); - - const ce_info * - pDocu = Get_EntryDocu(*i_rList); - if ( pDocu != 0 ) - { - HF_IdlShortDocu - aTextDisplay(Env(), aTableMaker.Cur_CommentColumn() ); - aTextDisplay.Produce_byData( pDocu, *i_rList ); - } - } -} - -void -HF_IdlLinkList::Produce_GlobalCommentedLinks( const String & i_sTitle, - const String & i_sLabel, - comref_list & i_rList ) const -{ - HF_CommentedLink_Table - aTableMaker( Env(), CurOut(), - i_sTitle, i_sLabel, - true ); -/* - for ( ; i_rList; ++i_rList ) - { - aTableMaker.Add_Line(); - HF_IdlTypeText - aLinkText( Env(), aTableMaker.Cur_LinkColumn(), true ); - aLinkText.Produce_byData( (*i_rList).first ); - - HF_DocEntryList - aDocList( aTableMaker.Cur_CommentColumn() ); - if ( (*i_rList).second != 0 ) - { - HF_IdlDocu - aDocuDisplay( Env(), aDocList ); - aDocuDisplay.Produce_byData( (*i_rList).second ); - } - else - { - const ce_info * - pShort = Get_EntryDocu( - Env().Gate().Types().Search_CeRelatedTo( - (*i_rList).first) ); - if ( pShort != 0 ) - { - if (pShort->IsDeprecated()) - { - aDocList.Produce_Term() - << "[ DEPRECATED ]"; - } - if (pShort->IsOptional()) - { - aDocList.Produce_Term() - << "[ OPTIONAL ]"; - } - - aDocList.Produce_Term() - << "Description"; - - HF_IdlDocuTextDisplay - aShortDisplay( Env(), &aDocList.Produce_Definition() ); - aShortDisplay.Set_CurScopeTo( - Env().Gate().Types().Search_CeRelatedTo((*i_rList).first) ); - pShort->Short().DisplayAt(aShortDisplay); - } - } - } -*/ -} - -void -HF_IdlLinkList::Produce_MemberLinks( const String & i_sTitle, - const String & i_sLabel, - ce_list & i_rList ) const -{ - HF_CommentedLink_Table - aTableMaker( Env(), CurOut(), - i_sTitle, i_sLabel, - true ); - -/* - for ( ; i_rList; ++i_rList ) - { - const ary::idl::CodeEntity & - rCe = Env().Gate().Ces().Find_Ce(*i_rList); - - aTableMaker.Add_Line(); - aTableMaker.Cur_LinkColumn() - >> *new Html::Link( - StreamLock(200)() << "#" << rCe.LocalName() << c_str) - << rCe.LocalName(); - - const ce_info * - pDocu = rCe.Docu(); - if ( pDocu != 0 ) - { - HF_IdlShortDocu - aTextDisplay(Env(), aTableMaker.Cur_CommentColumn() ); - aTextDisplay.Produce_byData( *pDocu ); - } - } // end for -*/ -} - -void -HF_IdlLinkList::Get_EntryData_NamespaceMembers( - String & o_sEntryName, - String & o_sEntryLink, - const ce_info * & o_pDocu, - ce_id i_nMemberId, - bool i_bIsNestedNamespace ) const -{ - const ary::idl::CodeEntity & - rCe = Env().Data().Find_Ce(i_nMemberId); - - o_sEntryName = rCe.LocalName(); - o_sEntryLink = StreamLock(200)() << rCe.LocalName() - << ( i_bIsNestedNamespace - ? "/module-ix" - : "" ) - << ".html" - << c_str; - o_pDocu = rCe.Docu(); -} - -const ary::doc::OldIdlDocu * -HF_IdlLinkList::Get_EntryDocu(ce_id i_nMemberId) const -{ - if (i_nMemberId.IsValid()) - return Env().Data().Find_Ce(i_nMemberId).Docu(); - else - return 0; -} - - -/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/autodoc/source/display/idl/hfi_linklist.hxx b/autodoc/source/display/idl/hfi_linklist.hxx deleted file mode 100644 index 83a8998a2976..000000000000 --- a/autodoc/source/display/idl/hfi_linklist.hxx +++ /dev/null @@ -1,147 +0,0 @@ -/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ -/************************************************************************* - * - * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * - * Copyright 2000, 2010 Oracle and/or its affiliates. - * - * OpenOffice.org - a multi-platform office productivity suite - * - * This file is part of OpenOffice.org. - * - * OpenOffice.org is free software: you can redistribute it and/or modify - * it under the terms of the GNU Lesser General Public License version 3 - * only, as published by the Free Software Foundation. - * - * OpenOffice.org is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU Lesser General Public License version 3 for more details - * (a copy is included in the LICENSE file that accompanied this code). - * - * You should have received a copy of the GNU Lesser General Public License - * version 3 along with OpenOffice.org. If not, see - * - * for a copy of the LGPLv3 License. - * - ************************************************************************/ - -#ifndef ADC_DISPLAY_HFI_LINKLIST_HXX -#define ADC_DISPLAY_HFI_LINKLIST_HXX - - - -// USED SERVICES - // BASE CLASSES -#include "hi_factory.hxx" - // COMPONENTS - // PARAMETERS -#include -#include -#include - - - - -class HF_CommentedLink_Table : public HtmlFactory_Idl -{ - public: - HF_CommentedLink_Table( - Environment & io_rEnv, - Xml::Element & o_rOut, - const String & i_sTitle, - const String & i_sLabel, - bool i_bBorder = false ); - virtual ~HF_CommentedLink_Table(); - - void Add_Line(); - Xml::Element & Cur_LinkColumn(); - Xml::Element & Cur_CommentColumn(); - - private: - // DATA - Html::Table * pTable; - Xml::Element * pCurLinkColumn; - Xml::Element * pCurCommentColumn; -}; - -class HF_MemberTable : public HtmlFactory_Idl -{ - public: - HF_MemberTable( - Environment & io_rEnv, - Xml::Element & o_rOut, - const String & i_sTitle, - const String & i_sLabel, - bool i_bInline = false ); - virtual ~HF_MemberTable(); - - void Add_Line(); - Xml::Element & Cur_Declaration(); - Xml::Element & Cur_Description(); - - private: - // DATA - Html::Table * pTable; - Xml::Element * pCurDeclaration; - Xml::Element * pCurDescription; - bool bInline; -}; - - - - -class HF_IdlLinkList : public HtmlFactory_Idl -{ - public: - typedef ary::StdConstIterator - comref_list; - - HF_IdlLinkList( - Environment & io_rEnv, - Xml::Element * o_pOut ); - virtual ~HF_IdlLinkList(); - - void Produce_NamespaceMembers( - const String & i_sTitle, - const String & i_sLabel, - const std::vector & - i_rList, - bool i_bNestedNamespaces = false ) const; - void Produce_GlobalLinks( - const String & i_sTitle, - const String & i_sLabel, - ce_list & i_rList ) const; - void Produce_GlobalCommentedLinks( - const String & i_sTitle, - const String & i_sLabel, - comref_list & i_rList ) const; - void Produce_MemberLinks( - const String & i_sTitle, - const String & i_sLabel, - ce_list & i_rList ) const; - private: - void Get_EntryData_NamespaceMembers( - String & o_sEntryName, - String & o_sEntryLink, - const ce_info * & o_pDocuText, - ce_id i_nMemberId, - bool i_bIsNestedNamespace ) const; - const ce_info * Get_EntryDocu( - ce_id i_nMemberId ) const; -}; - - - - - - - - -// IMPLEMENTATION - - -#endif - - -/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/autodoc/source/display/idl/hfi_method.hxx b/autodoc/source/display/idl/hfi_method.hxx index 7da0e5fd605c..55f99db17e20 100644 --- a/autodoc/source/display/idl/hfi_method.hxx +++ b/autodoc/source/display/idl/hfi_method.hxx @@ -38,10 +38,6 @@ // PARAMETERS #include #include -typedef ary::doc::OldIdlDocu CodeInfo; -#include "hfi_linklist.hxx" - - namespace csi { diff --git a/autodoc/source/inc/tools/tkpchars.hxx b/autodoc/source/inc/tools/tkpchars.hxx index 780352b888b3..c5b952fb0f2f 100644 --- a/autodoc/source/inc/tools/tkpchars.hxx +++ b/autodoc/source/inc/tools/tkpchars.hxx @@ -75,9 +75,6 @@ class CharacterSource void LoadText( csv::bstream & io_rSource); - void InsertTextAtCurPos( - const char * i_sText2Insert ); - /// @return CurChar() after moving forward one char. char MoveOn(); /** @return diff --git a/autodoc/source/parser/inc/tokens/stmstate.hxx b/autodoc/source/parser/inc/tokens/stmstate.hxx index e966b4740b75..9a60f73446d7 100644 --- a/autodoc/source/parser/inc/tokens/stmstate.hxx +++ b/autodoc/source/parser/inc/tokens/stmstate.hxx @@ -34,7 +34,6 @@ // COMPONENTS // PARAMETERS class StmArrayStatus; -class StmBoundsStatus; /** A StmStatus is a state within a StateMachine. There are two kinds of it. Either its an array of pointers to @@ -55,8 +54,6 @@ class StmStatus // := "State machine status" // OPERATIONS virtual StmArrayStatus * AsArray(); - virtual StmBoundsStatus * - AsBounds(); // INQUIRY virtual bool IsADefault() const = 0; diff --git a/autodoc/source/parser/inc/tokens/stmstfin.hxx b/autodoc/source/parser/inc/tokens/stmstfin.hxx deleted file mode 100644 index 7ded64933bb5..000000000000 --- a/autodoc/source/parser/inc/tokens/stmstfin.hxx +++ /dev/null @@ -1,82 +0,0 @@ -/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ -/************************************************************************* - * - * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * - * Copyright 2000, 2010 Oracle and/or its affiliates. - * - * OpenOffice.org - a multi-platform office productivity suite - * - * This file is part of OpenOffice.org. - * - * OpenOffice.org is free software: you can redistribute it and/or modify - * it under the terms of the GNU Lesser General Public License version 3 - * only, as published by the Free Software Foundation. - * - * OpenOffice.org is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU Lesser General Public License version 3 for more details - * (a copy is included in the LICENSE file that accompanied this code). - * - * You should have received a copy of the GNU Lesser General Public License - * version 3 along with OpenOffice.org. If not, see - * - * for a copy of the LGPLv3 License. - * - ************************************************************************/ - -#ifndef ADC_STMSTFIN_HXX -#define ADC_STMSTFIN_HXX - -// USED SERVICES - // BASE CLASSES -#include - // COMPONENTS - // PARAMETERS - - -class TkpContext; -class StateMachineContext; - -/** -**/ -class StmBoundsStatus : public StmStatus -{ - public: - // LIFECYCLE - StmBoundsStatus( - StateMachineContext & - o_rOwner, - TkpContext & i_rFollowUpContext, - uintt i_nStatusFunctionNr, - bool i_bIsDefault ); - // INQUIRY - TkpContext * FollowUpContext(); - uintt StatusFunctionNr() const; - virtual bool IsADefault() const; - - // ACCESS - virtual StmBoundsStatus * - AsBounds(); - - private: - StateMachineContext * - pOwner; - TkpContext * pFollowUpContext; - uintt nStatusFunctionNr; - bool bIsDefault; -}; - -inline TkpContext * -StmBoundsStatus::FollowUpContext() - { return pFollowUpContext; } -inline uintt -StmBoundsStatus::StatusFunctionNr() const - { return nStatusFunctionNr; } - - -#endif - - -/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/autodoc/source/parser/inc/tokens/tkp.hxx b/autodoc/source/parser/inc/tokens/tkp.hxx index 97fc9578ae5c..4105dafaf9ec 100644 --- a/autodoc/source/parser/inc/tokens/tkp.hxx +++ b/autodoc/source/parser/inc/tokens/tkp.hxx @@ -42,9 +42,6 @@ class TkpContext; a text. Start() starts to parse the text from the given i_rSource. - GetNextToken() returns a Token on the heap as long as there are - still characters in the text left. This can be checked by - HasMore(). The algorithms for parsing tokens from the text are an issue of the derived classes. @@ -65,11 +62,6 @@ class TokenParser CharacterSource & i_rSource ); - /** @short Gets the next identifiable token out of the - source code. - */ - void GetNextToken(); - /// @return true, if there are more tokens to parse. bool HasMore() const { return bHasMore; } diff --git a/autodoc/source/parser/inc/tokens/tkpcontx.hxx b/autodoc/source/parser/inc/tokens/tkpcontx.hxx index c8818b4bfc20..dda63d00abe1 100644 --- a/autodoc/source/parser/inc/tokens/tkpcontx.hxx +++ b/autodoc/source/parser/inc/tokens/tkpcontx.hxx @@ -88,9 +88,6 @@ class TkpContext virtual bool PassNewToken() = 0; virtual TkpContext & FollowUpContext() = 0; - - static TkpNullContext & - Null_(); }; class StateMachineContext @@ -100,7 +97,6 @@ class StateMachineContext virtual ~StateMachineContext() {} - /// Is used by StmBoundsStatus only. virtual void PerformStatusFunction( uintt i_nStatusSignal, F_CRTOK i_fTokenCreateFunction, diff --git a/autodoc/source/parser/inc/tokens/tkpstama.hxx b/autodoc/source/parser/inc/tokens/tkpstama.hxx deleted file mode 100644 index 9c09ba6bc808..000000000000 --- a/autodoc/source/parser/inc/tokens/tkpstama.hxx +++ /dev/null @@ -1,125 +0,0 @@ -/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ -/************************************************************************* - * - * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * - * Copyright 2000, 2010 Oracle and/or its affiliates. - * - * OpenOffice.org - a multi-platform office productivity suite - * - * This file is part of OpenOffice.org. - * - * OpenOffice.org is free software: you can redistribute it and/or modify - * it under the terms of the GNU Lesser General Public License version 3 - * only, as published by the Free Software Foundation. - * - * OpenOffice.org is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU Lesser General Public License version 3 for more details - * (a copy is included in the LICENSE file that accompanied this code). - * - * You should have received a copy of the GNU Lesser General Public License - * version 3 along with OpenOffice.org. If not, see - * - * for a copy of the LGPLv3 License. - * - ************************************************************************/ - -#ifndef ADC_TKPSTAMA_HXX -#define ADC_TKPSTAMA_HXX - -// USED SERVICES - // BASE CLASSES -#include - // COMPONENTS -#include -#include - -/** @descr - This state-machine models state transitions from one state to another - per indices of branches. If the indices represent ascii-char-values, - the state-machine can be used for recognising tokens of text. - - The state-machine can be a status itself. - - StateMachine needs the array-size of all stati as a guess, how many stati - the state machine will contain, when at work. - - -**/ -class StateMachine -{ - public: - // Types - typedef StmStatus::Branch Branch; - typedef StmStatus * * StatusList; - - //# Interface self - // LIFECYCLE - StateMachine( - intt in_nStatusSize, - intt in_nInitial_StatusListSize ); /// The user of the constructor should guess - /// the approximate number of stati here to - /// avoid multiple reallocations. - /// @#AddStatus - intt AddStatus( /// @return the new #Status' ID - DYN StmStatus * let_dpStatus); - /// @#AddToken - void AddToken( - const char * in_sToken, - TextToken::F_CRTOK in_fTokenCreateFunction, - const INT16 * in_aBranches, - INT16 in_nBoundsStatus ); - ~StateMachine(); - - - // OPERATIONS - StmBoundsStatus & - GetCharChain( - TextToken::F_CRTOK & - o_nTokenCreateFunction, - CharacterSource & io_rText ); - private: - // SERVICE FUNCTIONS - StmStatus & Status( - intt in_nStatusNr) const; - StmArrayStatus & - CurrentStatus() const; - StmBoundsStatus * - BoundsStatus() const; - - /// Sets the PeekedStatus. - void Peek( - intt in_nBranch); - - void ResizeStati(); // Adds space for 32 stati. - - // DATA - StatusList pStati; /// List of Status, implemented as simple C-array of length #nStatiSpace - /// with nStatiLength valid members (beginning from zero). - intt nCurrentStatus; - intt nPeekedStatus; - - intt nStatusSize; /// Size of the branch array of a single status. - - intt nNrofStati; /// Nr of Stati so far. - intt nStatiSpace; /// Size of allocated array for #pStati (size in items). -}; - - - -/** @#AddToken - @descr - Adds a token, which will be recogniszeds by the - statemachine. - - -**/ - - - -#endif - - -/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/autodoc/source/parser/tokens/makefile.mk b/autodoc/source/parser/tokens/makefile.mk index beb3207154fb..32bfac814998 100644 --- a/autodoc/source/parser/tokens/makefile.mk +++ b/autodoc/source/parser/tokens/makefile.mk @@ -47,8 +47,6 @@ PRJINC=$(PRJ)$/source OBJFILES= \ $(OBJ)$/stmstarr.obj \ $(OBJ)$/stmstate.obj \ - $(OBJ)$/stmstfin.obj \ - $(OBJ)$/tkpstama.obj \ $(OBJ)$/tkp.obj \ $(OBJ)$/tkpcontx.obj \ $(OBJ)$/tokdeal.obj diff --git a/autodoc/source/parser/tokens/stmstate.cxx b/autodoc/source/parser/tokens/stmstate.cxx index 6530ebbbe838..9063b6128f67 100644 --- a/autodoc/source/parser/tokens/stmstate.cxx +++ b/autodoc/source/parser/tokens/stmstate.cxx @@ -38,11 +38,4 @@ StmStatus::AsArray() return 0; } -StmBoundsStatus * -StmStatus::AsBounds() -{ - return 0; -} - - /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/autodoc/source/parser/tokens/stmstfin.cxx b/autodoc/source/parser/tokens/stmstfin.cxx deleted file mode 100644 index 84b7a9cf39e9..000000000000 --- a/autodoc/source/parser/tokens/stmstfin.cxx +++ /dev/null @@ -1,63 +0,0 @@ -/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ -/************************************************************************* - * - * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * - * Copyright 2000, 2010 Oracle and/or its affiliates. - * - * OpenOffice.org - a multi-platform office productivity suite - * - * This file is part of OpenOffice.org. - * - * OpenOffice.org is free software: you can redistribute it and/or modify - * it under the terms of the GNU Lesser General Public License version 3 - * only, as published by the Free Software Foundation. - * - * OpenOffice.org is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU Lesser General Public License version 3 for more details - * (a copy is included in the LICENSE file that accompanied this code). - * - * You should have received a copy of the GNU Lesser General Public License - * version 3 along with OpenOffice.org. If not, see - * - * for a copy of the LGPLv3 License. - * - ************************************************************************/ - -#include -#include - - -// NOT FULLY DECLARED SERVICES -#include - - -StmBoundsStatus::StmBoundsStatus( StateMachineContext & - o_rOwner, - TkpContext & i_rFollowUpContext, - uintt i_nStatusFunctionNr, - bool i_bIsDefault ) - : pOwner(&o_rOwner), - pFollowUpContext(&i_rFollowUpContext), - nStatusFunctionNr(i_nStatusFunctionNr), - bIsDefault(i_bIsDefault) -{ -} - -bool -StmBoundsStatus::IsADefault() const -{ - return bIsDefault; -} - -StmBoundsStatus * -StmBoundsStatus::AsBounds() -{ - return this; -} - - - -/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/autodoc/source/parser/tokens/tkp.cxx b/autodoc/source/parser/tokens/tkp.cxx index 7be7bcb55842..8d90ff0f6755 100644 --- a/autodoc/source/parser/tokens/tkp.cxx +++ b/autodoc/source/parser/tokens/tkp.cxx @@ -47,21 +47,6 @@ TokenParser::Start( CharacterSource & i_rSource ) InitSource(i_rSource); } -void -TokenParser::GetNextToken() -{ - csv_assert(pChars != 0); - - bHasMore = NOT pChars->IsFinished(); - - for ( bool bDone = NOT bHasMore; NOT bDone; ) - { - CurrentContext().ReadCharChain(*pChars); - bDone = CurrentContext().PassNewToken(); - SetCurrentContext(CurrentContext().FollowUpContext()); - } -} - void TokenParser::InitSource( CharacterSource & i_rSource ) { diff --git a/autodoc/source/parser/tokens/tkpcontx.cxx b/autodoc/source/parser/tokens/tkpcontx.cxx index c1979bfe6c44..06f4da58565d 100644 --- a/autodoc/source/parser/tokens/tkpcontx.cxx +++ b/autodoc/source/parser/tokens/tkpcontx.cxx @@ -31,16 +31,6 @@ // NOT FULLY DECLARED SERVICES - - -TkpNullContext G_aNullContext; - -TkpNullContext & -TkpContext::Null_() -{ - return G_aNullContext; -} - TkpNullContext::~TkpNullContext() { } diff --git a/autodoc/source/parser/tokens/tkpstama.cxx b/autodoc/source/parser/tokens/tkpstama.cxx deleted file mode 100644 index f3e88b323040..000000000000 --- a/autodoc/source/parser/tokens/tkpstama.cxx +++ /dev/null @@ -1,175 +0,0 @@ -/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ -/************************************************************************* - * - * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * - * Copyright 2000, 2010 Oracle and/or its affiliates. - * - * OpenOffice.org - a multi-platform office productivity suite - * - * This file is part of OpenOffice.org. - * - * OpenOffice.org is free software: you can redistribute it and/or modify - * it under the terms of the GNU Lesser General Public License version 3 - * only, as published by the Free Software Foundation. - * - * OpenOffice.org is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU Lesser General Public License version 3 for more details - * (a copy is included in the LICENSE file that accompanied this code). - * - * You should have received a copy of the GNU Lesser General Public License - * version 3 along with OpenOffice.org. If not, see - * - * for a copy of the LGPLv3 License. - * - ************************************************************************/ - -#include -#include - -// NOT FULLY DECLARED SERVICES -#include -#include - -const intt C_nStatuslistResizeValue = 32; -const intt C_nTopStatus = 0; - -StateMachine::StateMachine( intt in_nStatusSize, - intt in_nInitial_StatusListSize ) - : pStati(new StmStatus*[in_nInitial_StatusListSize]), - nCurrentStatus(C_nTopStatus), - nPeekedStatus(C_nTopStatus), - nStatusSize(in_nStatusSize), - nNrofStati(0), - nStatiSpace(in_nInitial_StatusListSize) -{ - csv_assert(in_nStatusSize > 0); - csv_assert(in_nInitial_StatusListSize > 0); - - memset(pStati, 0, sizeof(StmStatus*) * nStatiSpace); -} - -intt -StateMachine::AddStatus(StmStatus * let_dpStatus) -{ - if (nNrofStati == nStatiSpace) - { - ResizeStati(); - } - pStati[nNrofStati] = let_dpStatus; - return nNrofStati++; -} - -void -StateMachine::AddToken( const char * in_sToken, - TextToken::F_CRTOK in_fTokenCreateFunction, - const INT16 * in_aBranches, - INT16 in_nBoundsStatus ) -{ - if (csv::no_str(in_sToken)) - return; - - - nCurrentStatus = 0; - nPeekedStatus = 0; - - for ( const char * pChar = in_sToken; - *pChar != NULCH; - ++pChar ) - { - Peek(*pChar); - StmStatus & rPst = Status(nPeekedStatus); - if ( rPst.IsADefault() OR rPst.AsBounds() != 0 ) - { - nPeekedStatus = AddStatus( new StmArrayStatus(nStatusSize, in_aBranches, 0, false ) ); - CurrentStatus().SetBranch( *pChar, nPeekedStatus ); - } - nCurrentStatus = nPeekedStatus; - } // end for - StmArrayStatus & rLastStatus = CurrentStatus(); - rLastStatus.SetTokenCreateFunction(in_fTokenCreateFunction); - for (intt i = 0; i < nStatusSize; i++) - { - if (Status(rLastStatus.NextBy(i)).AsBounds() != 0) - rLastStatus.SetBranch(i,in_nBoundsStatus); - } // end for -} - -StateMachine::~StateMachine() -{ - for (intt i = 0; i < nNrofStati; i++) - { - delete pStati[i]; - } - delete [] pStati; -} - -StmBoundsStatus & -StateMachine::GetCharChain( TextToken::F_CRTOK & o_nTokenCreateFunction, - CharacterSource & io_rText ) -{ - nCurrentStatus = C_nTopStatus; - - Peek(io_rText.CurChar()); - while (BoundsStatus() == 0) - { - nCurrentStatus = nPeekedStatus; - Peek(io_rText.MoveOn()); - } - o_nTokenCreateFunction = CurrentStatus().TokenCreateFunction(); - - return *BoundsStatus(); -} - -void -StateMachine::ResizeStati() -{ - intt nNewSize = nStatiSpace + C_nStatuslistResizeValue; - intt i = 0; - StatusList pNewStati = new StmStatus*[nNewSize]; - - for ( ; i < nNrofStati; i++) - { - pNewStati[i] = pStati[i]; - } - memset( pNewStati+i, - 0, - (nNewSize-i) * sizeof(StmStatus*) ); - - delete [] pStati; - pStati = pNewStati; - nStatiSpace = nNewSize; -} - -StmStatus & -StateMachine::Status(intt in_nStatusNr) const -{ - csv_assert( csv::in_range(intt(0), in_nStatusNr, intt(nNrofStati)) ); - return *pStati[in_nStatusNr]; -} - -StmArrayStatus & -StateMachine::CurrentStatus() const -{ - StmArrayStatus * pCurSt = Status(nCurrentStatus).AsArray(); - - csv_assert(pCurSt != 0); - return *pCurSt; -} - -StmBoundsStatus * -StateMachine::BoundsStatus() const -{ - return Status(nPeekedStatus).AsBounds(); -} - -void -StateMachine::Peek(intt in_nBranch) -{ - StmArrayStatus & rSt = CurrentStatus(); - nPeekedStatus = rSt.NextBy(in_nBranch); -} - -/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/autodoc/source/tools/tkpchars.cxx b/autodoc/source/tools/tkpchars.cxx index ad5d3f0b3727..92d91d5e6db1 100644 --- a/autodoc/source/tools/tkpchars.cxx +++ b/autodoc/source/tools/tkpchars.cxx @@ -73,28 +73,6 @@ CharacterSource::LoadText(csv::bstream & io_rSource) BeginSource(); } -/// KORR_FUTURE: So far, this works only when tokens do not cross inserted text boundaries. -void -CharacterSource::InsertTextAtCurPos( const char * i_sText2Insert ) -{ - if ( !i_sText2Insert || !i_sText2Insert[0] ) - return; - - aSourcesStack.push( S_SourceState( - dpSource, - nSourceSize, - nCurPos, - nLastCut, - nLastTokenStart, - cCharAtLastCut ) ); - - nSourceSize = strlen(i_sText2Insert); - dpSource = new char[nSourceSize+1]; - strcpy( dpSource, i_sText2Insert); // SAFE STRCPY (#100211# - checked) - - BeginSource(); -} - const char * CharacterSource::CutToken() { -- cgit