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 | |
| 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')
154 files changed, 16 insertions, 6043 deletions
diff --git a/autodoc/inc/ary/adoc/a_docuaccess.hxx b/autodoc/inc/ary/adoc/a_docuaccess.hxx deleted file mode 100644 index dc386b51529c..000000000000 --- a/autodoc/inc/ary/adoc/a_docuaccess.hxx +++ /dev/null @@ -1,194 +0,0 @@ -/************************************************************************* - * - * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * - * Copyright 2008 by Sun Microsystems, Inc. - * - * OpenOffice.org - a multi-platform office productivity suite - * - * $RCSfile: a_docuaccess.hxx,v $ - * $Revision: 1.3 $ - * - * 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 - * <http://www.openoffice.org/license.html> - * for a copy of the LGPLv3 License. - * - ************************************************************************/ - -#ifndef ARY_ADOC_DOCUACCESS_HXX -#define ARY_ADOC_DOCUACCESS_HXX - - - -// USED SERVICES - // BASE CLASSES - // OTHER -#include <ary/doc/d_hypertext.hxx> - - -namespace ary -{ -namespace doc -{ - class Documentation; - class NamedList; - class Struct; -} -} - - -namespace ary -{ -namespace adoc -{ - -enum E_LifeCycle -{ - lc_unkown, - lc_owned, - lc_extern, - lc_refcounted -}; - - -class TypeNameReceiver; - - - -/** Semantic access to a documentation whose content follows the rules of - autodoc standard documentation. -*/ -class DocuAccess -{ - public: - enum E_TagId - { - ti_none = 0, - - ti_attention, - ti_author, - ti_base, - ti_change, - ti_collab, - ti_deprecated, - ti_derive, - ti_descr, - ti_docdate, - ti_exception, - ti_instance, - ti_internal, - ti_invariant, - ti_key, - ti_life, - ti_multi, - ti_onerror, - ti_param, - ti_persistence, - ti_postcond, - ti_precond, - ti_published, - ti_resp, - ti_return, - ti_returns, - ti_see, - ti_short, - ti_since, - ti_summary, - ti_throws, - ti_todo, - ti_tpl, - ti_version, - ti_ATTENTION, - ti_UnknownAtTag, - ti_DocuReference, - ti_NVI, - - ti_extra, /// Tag that is not known. - - ti_MAX /// Keep this the highest value. - }; - - explicit DocuAccess( - ary::doc::Documentation * - io_docu = 0 ); - ary::doc::Documentation * - Assign_Container( /// @return Previously assigned container. - ary::doc::Documentation * - io_docu ); - ary::doc::Documentation * - Release_Container(); - - void Set_Deprecated(); - void Set_Internal(); - void Set_Published(); - - ary::doc::HyperText & - Add_Description(); - - ary::doc::HyperText & - Add_StdTag( - E_TagId i_tag ); - ary::doc::HyperText & - Add_base( - const String & i_baseTypeName ); - ary::doc::HyperText & - Add_collab( - const String & i_partner ); - ary::doc::HyperText & - Add_key( - const String & i_keyWord ); - ary::doc::HyperText & - Add_param( - const String & i_parameterName, - const String & i_validRange ); - ary::doc::HyperText & - Add_see( - const String & i_referencedEntity ); - ary::doc::HyperText & - Add_since( - const String & i_versionId, - const String & i_fullVersionText ); - ary::doc::HyperText & - Add_throws( - const String & i_exceptionName ); - ary::doc::HyperText & - Add_tpl( - const String & i_templateParameter ); - ary::doc::HyperText & - Add_ExtraTag( - const String & i_tagName ); - ary::doc::HyperText & - Add_TagWithMissingParameter( - E_TagId i_tag ); - - private: - ary::doc::Struct & Data(); - ary::doc::Struct & Get_Data(); - ary::doc::NamedList & - Get_List( - E_TagId i_tag ); - // DATA - ary::doc::Documentation * - pContainer; - ary::doc::Struct * pData; -}; - - - - -} // namespace adoc -} // namespace ary -#endif diff --git a/autodoc/inc/ary/cpp/c_class.hxx b/autodoc/inc/ary/cpp/c_class.hxx index f093270ec050..491b166ea7a5 100644 --- a/autodoc/inc/ary/cpp/c_class.hxx +++ b/autodoc/inc/ary/cpp/c_class.hxx @@ -89,7 +89,6 @@ class Class : public CodeEntity, // LIFECYCLE - Class(); Class( const String & i_sLocalName, Ce_id i_nOwner, @@ -189,9 +188,6 @@ class Class : public CodeEntity, CIterator_Locals PosOfName( const List_LocalCe& i_rList, const String & i_sName ) const; - Iterator_Locals PosOfName( - List_LocalCe & io_rList, - const String & i_sName ); // DATA CeEssentials aEssentials; node_t aAssignedNode; diff --git a/autodoc/inc/ary/cpp/c_define.hxx b/autodoc/inc/ary/cpp/c_define.hxx index cbc62f4dece7..9322b641b7d3 100644 --- a/autodoc/inc/ary/cpp/c_define.hxx +++ b/autodoc/inc/ary/cpp/c_define.hxx @@ -61,10 +61,6 @@ class Define : public DefineEntity i_definition, loc::Le_id i_declaringFile ); virtual ~Define(); - - // INQUIRY - void GetText( - csv::StreamStr & o_rText ) const; private: // Interface csv::ConstProcessorClient virtual void do_Accept( diff --git a/autodoc/inc/ary/cpp/c_enum.hxx b/autodoc/inc/ary/cpp/c_enum.hxx index ca65f9d35c56..41c291e05283 100644 --- a/autodoc/inc/ary/cpp/c_enum.hxx +++ b/autodoc/inc/ary/cpp/c_enum.hxx @@ -66,7 +66,6 @@ class Enum : public CodeEntity, }; // LIFECYCLE - Enum(); Enum( const String & i_sLocalName, Ce_id i_nOwner, diff --git a/autodoc/inc/ary/cpp/c_enuval.hxx b/autodoc/inc/ary/cpp/c_enuval.hxx index 216da3a915c8..0031eef09327 100644 --- a/autodoc/inc/ary/cpp/c_enuval.hxx +++ b/autodoc/inc/ary/cpp/c_enuval.hxx @@ -56,7 +56,6 @@ class EnumValue : public CodeEntity enum E_ClassId { class_id = 1006 }; // LIFECYCLE - EnumValue(); EnumValue( const String & i_sLocalName, Ce_id i_nOwner, diff --git a/autodoc/inc/ary/cpp/c_funct.hxx b/autodoc/inc/ary/cpp/c_funct.hxx index 038d086adeb8..cfcf48fb519c 100644 --- a/autodoc/inc/ary/cpp/c_funct.hxx +++ b/autodoc/inc/ary/cpp/c_funct.hxx @@ -60,7 +60,6 @@ class Function : public CodeEntity public: enum E_ClassId { class_id = 1004 }; - Function(); Function( const String & i_sLocalName, Ce_id i_nOwner, diff --git a/autodoc/inc/ary/cpp/c_macro.hxx b/autodoc/inc/ary/cpp/c_macro.hxx index d58e5edcfce8..a323543deec9 100644 --- a/autodoc/inc/ary/cpp/c_macro.hxx +++ b/autodoc/inc/ary/cpp/c_macro.hxx @@ -62,11 +62,6 @@ class Macro : public DefineEntity i_definition, loc::Le_id i_declaringFile ); ~Macro(); - // INQUIRY - void GetText( - csv::StreamStr & o_rText, - const StringVector & - i_rGivenArguments ) const; const StringVector & Params() const { return aParams; } private: diff --git a/autodoc/inc/ary/cpp/c_osigna.hxx b/autodoc/inc/ary/cpp/c_osigna.hxx index a4b2e78a0c36..5ae9ae834804 100644 --- a/autodoc/inc/ary/cpp/c_osigna.hxx +++ b/autodoc/inc/ary/cpp/c_osigna.hxx @@ -60,7 +60,6 @@ class OperationSignature public: typedef std::vector<Type_id> ParameterTypeList; - OperationSignature(); OperationSignature( ParameterTypeList i_parameterTypes, // Non const, because it will be swapped with aParameterTypes. E_ConVol i_conVol ); diff --git a/autodoc/inc/ary/cpp/c_traits.hxx b/autodoc/inc/ary/cpp/c_traits.hxx index 51eb09027816..94bc28577e15 100644 --- a/autodoc/inc/ary/cpp/c_traits.hxx +++ b/autodoc/inc/ary/cpp/c_traits.hxx @@ -67,9 +67,6 @@ struct Ce_Traits static entity_base_type & EntityOf_( id_type i_id ); - static id_type IdOf_( - const entity_base_type & - i_entity ); }; @@ -86,10 +83,6 @@ struct CeNode_Traits : public Ce_Traits static symtree::Node<CeNode_Traits> * NodeOf_( entity_base_type & i_entity ); - static const String & - LocalNameOf_( - const entity_base_type & - i_entity ); static entity_base_type * ParentOf_( const entity_base_type & @@ -148,9 +141,6 @@ struct Def_Traits static entity_base_type & EntityOf_( id_type i_id ); - static id_type IdOf_( - const entity_base_type & - i_entity ); }; @@ -181,9 +171,6 @@ struct Type_Traits static entity_base_type & EntityOf_( id_type i_id ); - static id_type IdOf_( - const entity_base_type & - i_entity ); }; /** An instance of COMPARE for ->::ary::SortedIds<>. diff --git a/autodoc/inc/ary/cpp/c_tydef.hxx b/autodoc/inc/ary/cpp/c_tydef.hxx index d29dc9e901a5..6bbd6eddcbd8 100644 --- a/autodoc/inc/ary/cpp/c_tydef.hxx +++ b/autodoc/inc/ary/cpp/c_tydef.hxx @@ -56,7 +56,6 @@ class Typedef : public CodeEntity // LIFECYCLE enum E_ClassId { class_id = 1003 }; - Typedef(); Typedef( const String & i_sLocalName, Ce_id i_nOwner, diff --git a/autodoc/inc/ary/cpp/c_vari.hxx b/autodoc/inc/ary/cpp/c_vari.hxx index d5a5445f67d4..c8a5e0537fba 100644 --- a/autodoc/inc/ary/cpp/c_vari.hxx +++ b/autodoc/inc/ary/cpp/c_vari.hxx @@ -56,7 +56,6 @@ class Variable : public CodeEntity // LIFECYCLE enum E_ClassId { class_id = 1005 }; - Variable(); Variable( const String & i_sLocalName, Ce_id i_nOwner, diff --git a/autodoc/inc/ary/cpp/usedtype.hxx b/autodoc/inc/ary/cpp/usedtype.hxx index f66537c541c5..8df1f106f468 100644 --- a/autodoc/inc/ary/cpp/usedtype.hxx +++ b/autodoc/inc/ary/cpp/usedtype.hxx @@ -81,8 +81,6 @@ class UsedType : public Type const char * i_sSeg ); ut::List_TplParameter & Enter_Template(); - void LeaveTemplate(); - void Set_Unsigned(); void Set_Signed(); void Set_BuiltIn( @@ -191,12 +189,6 @@ class List_TplParameter void AddParam_Type( Type_id i_nType ); - void AddParam_Constant( - const String & i_sConst ); - - const_iterator Begin() const; - const_iterator End() const; - /// puts "< " TemplateArgumentList " >" to o_rOut. void Get_Text( StreamStr & o_rOut, diff --git a/autodoc/inc/ary/doc/d_docu.hxx b/autodoc/inc/ary/doc/d_docu.hxx index 426ab06900c6..11a9c6533029 100644 --- a/autodoc/inc/ary/doc/d_docu.hxx +++ b/autodoc/inc/ary/doc/d_docu.hxx @@ -53,8 +53,6 @@ class Documentation : public csv::ConstProcessorClient { public: Documentation(); - explicit Documentation( - DYN Node & pass_data); ~Documentation(); // OPERATIONS void Clear(); diff --git a/autodoc/inc/ary/doc/d_hypertext.hxx b/autodoc/inc/ary/doc/d_hypertext.hxx deleted file mode 100644 index e8ddb49ddf2c..000000000000 --- a/autodoc/inc/ary/doc/d_hypertext.hxx +++ /dev/null @@ -1,64 +0,0 @@ -/************************************************************************* - * - * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * - * Copyright 2008 by Sun Microsystems, Inc. - * - * OpenOffice.org - a multi-platform office productivity suite - * - * $RCSfile: d_hypertext.hxx,v $ - * $Revision: 1.3 $ - * - * 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 - * <http://www.openoffice.org/license.html> - * for a copy of the LGPLv3 License. - * - ************************************************************************/ - -#ifndef ARY_DOC_D_HYPERTEXT_HXX -#define ARY_DOC_D_HYPERTEXT_HXX - -// USED SERVICES -#include <ary/doc/ht/dht_component.hxx> - -namespace csv -{ - class ProcessorIfc; -} - - - - -namespace ary -{ -namespace doc -{ - - -typedef std::vector<ht::Component> HyperText; - -void Accept( - const HyperText & i_text, - csv::ProcessorIfc & io_processor ); - -const HyperText & NullText(); - - - - -} // namspace doc -} // namspace ary -#endif diff --git a/autodoc/inc/ary/doc/d_namedlist.hxx b/autodoc/inc/ary/doc/d_namedlist.hxx deleted file mode 100644 index c60c847b3a8c..000000000000 --- a/autodoc/inc/ary/doc/d_namedlist.hxx +++ /dev/null @@ -1,116 +0,0 @@ -/************************************************************************* - * - * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * - * Copyright 2008 by Sun Microsystems, Inc. - * - * OpenOffice.org - a multi-platform office productivity suite - * - * $RCSfile: d_namedlist.hxx,v $ - * $Revision: 1.3 $ - * - * 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 - * <http://www.openoffice.org/license.html> - * for a copy of the LGPLv3 License. - * - ************************************************************************/ - -#ifndef ARY_DOC_D_NAMEDLIST_HXX -#define ARY_DOC_D_NAMEDLIST_HXX - -// BASE CLASSES -#include <ary/doc/d_node.hxx> - -// USED SERVICES - - - - -namespace ary -{ -namespace doc -{ - - -/** Represents a list of documentation elements of the same type, which - are accessible by their names as a key. - - Actually it is not necessary (by the interface of the class) that - all elements have the same type, but that is its intended purpose - and other uses should be carefully reconsidered. - - @example - Elements could be for example a list of base classes or parameters - which are just a list on one hand, but may be accessed via the name - of the base class/parameter as well. - -*/ -class NamedList : public Node -{ - public: - enum E_HandleDuplicateNames - { - hdn_normal = 0, - hdn_put_together, - hdn_keep_only_first - }; - - // LIFECYCLE - explicit NamedList( - nodetype::id i_id ); - virtual ~NamedList(); - - // OPERATORS - const Node * operator[]( - const String & i_name ) const; - // OPERATIONS - /** When Node name already exists, the new ->Node is discarded. - */ - void Add_Node( - const String & i_name, - DYN Node & pass_Element, - E_HandleDuplicateNames - eHandleDuplicateNames = hdn_normal ); - private: - // Interface csv::ConstProcessorClient: - virtual void do_Accept( - csv::ProcessorIfc & io_processor ) const; - // Locals - void AddNode_normal( - const String & i_name, - DYN Node & pass_Element ); - void AddNode_put_together( - const String & i_name, - DYN Node & pass_Element ); - void AddNode_keep_only_first( - const String & i_name, - DYN Node & pass_Element ); - - // DATA - /** aNames is built exactly parallel to ->aElements. Each - element of aNames contains the key to the corresponding - ->Node in ->aElements. - */ - StringVector aNames; - NodeList aElements; -}; - - - - -} // doc -} // ary -#endif diff --git a/autodoc/inc/ary/doc/d_oldcppdocu.hxx b/autodoc/inc/ary/doc/d_oldcppdocu.hxx index dbeceb2afce3..33f15663a2f3 100644 --- a/autodoc/inc/ary/doc/d_oldcppdocu.hxx +++ b/autodoc/inc/ary/doc/d_oldcppdocu.hxx @@ -100,8 +100,6 @@ class OldCppDocu : public Node virtual bool IsInternal() const; virtual bool IsInterface() const; - static const OldCppDocu & - Null_(); private: // Interface csv::ConstProcessorClient: virtual void do_Accept( diff --git a/autodoc/inc/ary/doc/d_parametrized.hxx b/autodoc/inc/ary/doc/d_parametrized.hxx index 9938a099a35b..93337794ebfb 100644 --- a/autodoc/inc/ary/doc/d_parametrized.hxx +++ b/autodoc/inc/ary/doc/d_parametrized.hxx @@ -34,11 +34,6 @@ // USED SERVICES // BASE CLASSES #include <ary/doc/d_node.hxx> - // OTHER -#include <ary/doc/d_hypertext.hxx> - - - namespace ary { diff --git a/autodoc/inc/ary/doc/d_struct.hxx b/autodoc/inc/ary/doc/d_struct.hxx deleted file mode 100644 index fd803234aa70..000000000000 --- a/autodoc/inc/ary/doc/d_struct.hxx +++ /dev/null @@ -1,90 +0,0 @@ -/************************************************************************* - * - * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * - * Copyright 2008 by Sun Microsystems, Inc. - * - * OpenOffice.org - a multi-platform office productivity suite - * - * $RCSfile: d_struct.hxx,v $ - * $Revision: 1.3 $ - * - * 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 - * <http://www.openoffice.org/license.html> - * for a copy of the LGPLv3 License. - * - ************************************************************************/ - -#ifndef ARY_DOC_D_STRUCT_HXX -#define ARY_DOC_D_STRUCT_HXX - -// USED SERVICES - // BASE CLASSES -#include <ary/doc/d_node.hxx> - - - - -namespace ary -{ -namespace doc -{ - - -/** Represents a documentation structure whose elements - are accessible by a slot id. - - @attention - Maximum possible number of slots is 254. -*/ -class Struct : public Node -{ - public: - typedef nodetype::id slot_id; - - // LIFECYCLE - explicit Struct( - nodetype::id i_type ); - virtual ~Struct(); - - // OPERATIONS - /** Sorts the new node into the right slot. - - @return pass_node - */ - Node & Add_Node( - DYN Node & pass_node ); - - // INQUIRY - const Node * Slot( - slot_id i_slot ) const; - // ACCESS - Node * Slot( - slot_id i_slot ); - private: - // Interface csv::ConstProcessorClient: - virtual void do_Accept( - csv::ProcessorIfc & io_processor ) const; - // DATA - NodeList aElements; -}; - - - - -} // namespace doc -} // namespace ary -#endif diff --git a/autodoc/inc/ary/doc/d_summary.hxx b/autodoc/inc/ary/doc/d_summary.hxx deleted file mode 100644 index 12ea12de8f2f..000000000000 --- a/autodoc/inc/ary/doc/d_summary.hxx +++ /dev/null @@ -1,110 +0,0 @@ -/************************************************************************* - * - * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * - * Copyright 2008 by Sun Microsystems, Inc. - * - * OpenOffice.org - a multi-platform office productivity suite - * - * $RCSfile: d_summary.hxx,v $ - * $Revision: 1.3 $ - * - * 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 - * <http://www.openoffice.org/license.html> - * for a copy of the LGPLv3 License. - * - ************************************************************************/ - -#ifndef ARY_DOC_D_SUMMARY_HXX -#define ARY_DOC_D_SUMMARY_HXX - -// BASE CLASSES -#include <ary/doc/d_node.hxx> -// USED SERVICES -#include <ary/doc/d_hypertext.hxx> - - - - -namespace ary -{ -namespace doc -{ - - -/** The summary of a documentation block. - - The summary can be: - - the first paragraph of a description (standard), - which should be contained within 2 lines, - - else the first three lines of the description followed by a "(...)". - - If there is no description, first the @return unit will be chosen, if - both are not there, the @resp unit, else the first unit of the docu. - - With an explicit @summary unit the summary can be forced to be longer than - 3 lines. -*/ -class Summary : public Node -{ - public: - // LIFECYCLE - Summary( - nodetype::id i_slot ); - virtual ~Summary(); - - // INQUIRY - const HyperText & Text() const; - bool IsComplete() const; - nodetype::id Origin() const; - - // ACESS - void Set( - const HyperText & i_text, - bool i_isIncomplete, - nodetype::id i_origin ); - private: - // Interface csv::ConstProcessorClient: - virtual void do_Accept( - csv::ProcessorIfc & io_processor ) const; - // DATA - const HyperText * pText; - bool bIncomplete; - nodetype::id nOrigin; /// For example from: description, @return, @responsibility. -}; - - - - -// IMPLEMENTATION -inline bool -Summary::IsComplete() const -{ - return bIncomplete; -} - -inline nodetype::id -Summary::Origin() const -{ - return nOrigin; -} - - - - -} // namespace doc -} // namespace ary -#endif diff --git a/autodoc/inc/ary/doc/d_unit.hxx b/autodoc/inc/ary/doc/d_unit.hxx deleted file mode 100644 index 3d1894375ab4..000000000000 --- a/autodoc/inc/ary/doc/d_unit.hxx +++ /dev/null @@ -1,99 +0,0 @@ -/************************************************************************* - * - * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * - * Copyright 2008 by Sun Microsystems, Inc. - * - * OpenOffice.org - a multi-platform office productivity suite - * - * $RCSfile: d_unit.hxx,v $ - * $Revision: 1.3 $ - * - * 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 - * <http://www.openoffice.org/license.html> - * for a copy of the LGPLv3 License. - * - ************************************************************************/ - -#ifndef ARY_DOC_D_UNIT_HXX -#define ARY_DOC_D_UNIT_HXX - -// BASE CLASSES -#include <ary/doc/d_node.hxx> - -// USED SERVICES -#include <ary/doc/d_hypertext.hxx> - - - - -namespace ary -{ -namespace doc -{ - - -/** A documentation with a title and a text. - - @example - ReturnValue - The number of items counted. -*/ -class Unit : public Node -{ - public: - - // LIFECYCLE - explicit Unit( - nodetype::id i_id ); - virtual ~Unit(); - - // INQUIRY - const HyperText & Doc() const; - - // ACESS - HyperText & Doc(); - - private: - // Interface csv::ConstProcessorClient: - virtual void do_Accept( - csv::ProcessorIfc & io_processor ) const; - // DATA - HyperText aDoc; -}; - - - - -// IMPLEMENTATION -inline const HyperText & -Unit::Doc() const -{ - return aDoc; -} - -inline HyperText & -Unit::Doc() -{ - return aDoc; -} - - - - -} // namespace doc -} // namespace ary -#endif diff --git a/autodoc/inc/ary/doc/ht/dht_component.hxx b/autodoc/inc/ary/doc/ht/dht_component.hxx deleted file mode 100644 index 60a7e6c49a7a..000000000000 --- a/autodoc/inc/ary/doc/ht/dht_component.hxx +++ /dev/null @@ -1,99 +0,0 @@ -/************************************************************************* - * - * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * - * Copyright 2008 by Sun Microsystems, Inc. - * - * OpenOffice.org - a multi-platform office productivity suite - * - * $RCSfile: dht_component.hxx,v $ - * $Revision: 1.3 $ - * - * 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 - * <http://www.openoffice.org/license.html> - * for a copy of the LGPLv3 License. - * - ************************************************************************/ - -#ifndef ARY_DHT_COMPONENT_HXX -#define ARY_DHT_COMPONENT_HXX - - - - -namespace ary -{ -namespace doc -{ -namespace ht -{ - class Interpreter; - class Processor; - - -/** Interface for components of a ->HyperText. - - This may be a text, whitespace or link etc. -*/ -class Component -{ - // COPYABLE - public: - Component(); - explicit Component( - const Interpreter & i_interpreter ); - Component( - const Interpreter & i_interpreter, - const String & i_data ); - ~Component(); - - void Accept( - Processor & io_processor ) const; - - const Interpreter & AssociatedInterpreter() const; - const String & Data() const; - - private: - // DATA - String aData; - const Interpreter * pInterpreter; -}; - - - - -// IMPLEMENTATION - -inline const Interpreter & -Component::AssociatedInterpreter() const -{ - csv_assert(pInterpreter != 0); - return *pInterpreter; -} - -inline const String & -Component::Data() const -{ - return aData; -} - - - - -} // namespace ht -} // namespace doc -} // namespace ary -#endif diff --git a/autodoc/inc/ary/doc/ht/dht_html.hxx b/autodoc/inc/ary/doc/ht/dht_html.hxx deleted file mode 100644 index d00c684ac516..000000000000 --- a/autodoc/inc/ary/doc/ht/dht_html.hxx +++ /dev/null @@ -1,75 +0,0 @@ -/************************************************************************* - * - * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * - * Copyright 2008 by Sun Microsystems, Inc. - * - * OpenOffice.org - a multi-platform office productivity suite - * - * $RCSfile: dht_html.hxx,v $ - * $Revision: 1.3 $ - * - * 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 - * <http://www.openoffice.org/license.html> - * for a copy of the LGPLv3 License. - * - ************************************************************************/ - -#ifndef ARY_DHT_HTML_HXX -#define ARY_DHT_HTML_HXX -// KORR_DEPRECATED_3.0 -// There will be only one kind of documentation in the future -// that gracefully recognizes HTML, but also does simple formatting -// without it. - -// BASE CLASSES -#include <ary/doc/ht/dht_interpreter.hxx> - - - - -namespace ary -{ -namespace doc -{ -namespace ht -{ - class Component; - - -/** Documentation text in HTML format. -*/ -class HtmlText : public Interpreter -{ - public: - virtual ~HtmlText(); - - static Component Create_Component_( - const String & i_text ); - private: - // Interface Interpreter: - virtual void do_Accept( - Processor & io_processor, - const String & i_data ) const; -}; - - - - -} // namespace ht -} // namespace doc -} // namespace ary -#endif diff --git a/autodoc/inc/ary/doc/ht/dht_link2ce.hxx b/autodoc/inc/ary/doc/ht/dht_link2ce.hxx deleted file mode 100644 index 4329fcf3ad5d..000000000000 --- a/autodoc/inc/ary/doc/ht/dht_link2ce.hxx +++ /dev/null @@ -1,76 +0,0 @@ -/************************************************************************* - * - * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * - * Copyright 2008 by Sun Microsystems, Inc. - * - * OpenOffice.org - a multi-platform office productivity suite - * - * $RCSfile: dht_link2ce.hxx,v $ - * $Revision: 1.3 $ - * - * 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 - * <http://www.openoffice.org/license.html> - * for a copy of the LGPLv3 License. - * - ************************************************************************/ - -#ifndef ARY_DOC_DHT_LINK2CE_HXX -#define ARY_DOC_DHT_LINK2CE_HXX - -// BASE CLASSES -#include <ary/doc/ht/dht_interpreter.hxx> - - - - -namespace ary -{ -namespace doc -{ -namespace ht -{ - class Component; - - -/** Link to an ->::ary::Entity. -*/ -class Link2Ce : public Interpreter -{ - public: - virtual ~Link2Ce(); - - static Component Create_Component_( - const String & i_ceAbsolutePath, - const String & i_display ); - static void Resolve_( - String & o_absolutePath, - String & o_display, - const String & i_data); - private: - // Interface Interpreter: - virtual void do_Accept( - Processor & io_processor, - const String & i_data ) const; -}; - - - - -} // namespace ht -} // namespace doc -} // namespace ary -#endif diff --git a/autodoc/inc/ary/doc/ht/dht_link2param.hxx b/autodoc/inc/ary/doc/ht/dht_link2param.hxx deleted file mode 100644 index 07906ac4d089..000000000000 --- a/autodoc/inc/ary/doc/ht/dht_link2param.hxx +++ /dev/null @@ -1,74 +0,0 @@ -/************************************************************************* - * - * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * - * Copyright 2008 by Sun Microsystems, Inc. - * - * OpenOffice.org - a multi-platform office productivity suite - * - * $RCSfile: dht_link2param.hxx,v $ - * $Revision: 1.3 $ - * - * 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 - * <http://www.openoffice.org/license.html> - * for a copy of the LGPLv3 License. - * - ************************************************************************/ - -#ifndef ARY_DHT_LINK2PARAM_HXX -#define ARY_DHT_LINK2PARAM_HXX - -// BASE CLASSES -#include <ary/doc/ht/dht_interpreter.hxx> - -// USED SERVICES - - - - -namespace ary -{ -namespace doc -{ -namespace ht -{ - class Component; - - -/** Interpretes a link to a parameter of the just described function. -*/ -class Link2Param : public Interpreter -{ - public: - virtual ~Link2Param(); - - static Component Create_Component_( - const String & i_parameterName, - const String & i_display ); - private: - // Interface Interpreter: - virtual void do_Accept( - Processor & io_processor, - const String & i_data ) const; -}; - - - - -} // namespace ht -} // namespace doc -} // namespace ary -#endif diff --git a/autodoc/inc/ary/doc/ht/dht_link2unknown.hxx b/autodoc/inc/ary/doc/ht/dht_link2unknown.hxx deleted file mode 100644 index ec6ed3d88d05..000000000000 --- a/autodoc/inc/ary/doc/ht/dht_link2unknown.hxx +++ /dev/null @@ -1,79 +0,0 @@ -/************************************************************************* - * - * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * - * Copyright 2008 by Sun Microsystems, Inc. - * - * OpenOffice.org - a multi-platform office productivity suite - * - * $RCSfile: dht_link2unknown.hxx,v $ - * $Revision: 1.3 $ - * - * 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 - * <http://www.openoffice.org/license.html> - * for a copy of the LGPLv3 License. - * - ************************************************************************/ - -#ifndef ARY_DHT_LINK2UNKNOWN_HXX -#define ARY_DHT_LINK2UNKNOWN_HXX - -// BASE CLASSES -#include <ary/doc/ht/dht_interpreter.hxx> - -// USED SERVICES - - - - -namespace ary -{ -namespace doc -{ -namespace ht -{ - class Component; - - -/** Interpretes a link in documentation to a yet unknown target. -*/ -class Link2Unknown : public Interpreter -{ - public: - virtual ~Link2Unknown(); - - static Component Create_Component_( - const String & i_typeText, - const String & i_display ); - static void Resolve_( - String & o_typeText, - String & o_display, - const String & i_data); - private: - // Interface Interpreter: - virtual void do_Accept( - Processor & io_processor, - const String & i_data ) const; -}; - - - - - -} // namespace ht -} // namespace doc -} // namespace ary -#endif diff --git a/autodoc/inc/ary/doc/ht/dht_link2url.hxx b/autodoc/inc/ary/doc/ht/dht_link2url.hxx deleted file mode 100644 index e153fc0c9fde..000000000000 --- a/autodoc/inc/ary/doc/ht/dht_link2url.hxx +++ /dev/null @@ -1,79 +0,0 @@ -/************************************************************************* - * - * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * - * Copyright 2008 by Sun Microsystems, Inc. - * - * OpenOffice.org - a multi-platform office productivity suite - * - * $RCSfile: dht_link2url.hxx,v $ - * $Revision: 1.3 $ - * - * 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 - * <http://www.openoffice.org/license.html> - * for a copy of the LGPLv3 License. - * - ************************************************************************/ - -#ifndef ARY_DHT_LINK2URL_HXX -#define ARY_DHT_LINK2URL_HXX - -// BASE CLASSES -#include <ary/doc/ht/dht_interpreter.hxx> - -// USED SERVICES - - - - -namespace ary -{ -namespace doc -{ -namespace ht // Hypertext -{ - class Component; - - - -/** Interpretes a html link within a documentation text. -*/ -class Link2Url : public Interpreter -{ - public: - virtual ~Link2Url(); - - static Component Create_Component_( - const String & i_url, - const String & i_display ); - static void Resolve_( - String & o_url, - String & o_display, - const String & i_data); - private: - // Interface Interpreter: - virtual void do_Accept( - Processor & io_processor, - const String & i_data ) const; -}; - - - - -} // namespace ht -} // namespace doc -} // namespace ary -#endif diff --git a/autodoc/inc/ary/doc/ht/dht_plain.hxx b/autodoc/inc/ary/doc/ht/dht_plain.hxx index 7ce9cf29a159..8b137891791f 100644 --- a/autodoc/inc/ary/doc/ht/dht_plain.hxx +++ b/autodoc/inc/ary/doc/ht/dht_plain.hxx @@ -1,71 +1 @@ -/************************************************************************* - * - * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * - * Copyright 2008 by Sun Microsystems, Inc. - * - * OpenOffice.org - a multi-platform office productivity suite - * - * $RCSfile: dht_plain.hxx,v $ - * $Revision: 1.3 $ - * - * 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 - * <http://www.openoffice.org/license.html> - * for a copy of the LGPLv3 License. - * - ************************************************************************/ -#ifndef ARY_DHT_PLAIN_HXX -#define ARY_DHT_PLAIN_HXX - -// BASE CLASSES -#include <ary/doc/ht/dht_interpreter.hxx> - - - - -namespace ary -{ -namespace doc -{ -namespace ht -{ - class Component; - - -/** Documentation text, simple ASCII. -*/ -class PlainText : public Interpreter -{ - public: - virtual ~PlainText(); - - static Component Create_Component_( - const String & i_text ); - private: - // Interface Interpreter: - virtual void do_Accept( - Processor & io_processor, - const String & i_data ) const; -}; - - - - -} // namespace ht -} // namespace doc -} // namespace ary -#endif diff --git a/autodoc/inc/ary/doc/ht/dht_processor.hxx b/autodoc/inc/ary/doc/ht/dht_processor.hxx deleted file mode 100644 index f324aa967e33..000000000000 --- a/autodoc/inc/ary/doc/ht/dht_processor.hxx +++ /dev/null @@ -1,220 +0,0 @@ -/************************************************************************* - * - * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * - * Copyright 2008 by Sun Microsystems, Inc. - * - * OpenOffice.org - a multi-platform office productivity suite - * - * $RCSfile: dht_processor.hxx,v $ - * $Revision: 1.3 $ - * - * 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 - * <http://www.openoffice.org/license.html> - * for a copy of the LGPLv3 License. - * - ************************************************************************/ - -#ifndef ARY_DHT_PROCESSOR_HXX -#define ARY_DHT_PROCESSOR_HXX - -// BASE CLASSES -#include <cosv/tpl/processor.hxx> - -// USED SERVICES -#include <ary/doc/d_hypertext.hxx> - - - - -namespace ary -{ -namespace doc -{ -namespace ht -{ - class PlainText; - class HtmlText; - - class Link2Ce; - class Link2Url; - class Link2Unknown; - class Link2Param; - - class Blank; - class Indentation; - class NewParagraph; - class SummarySeparator; - - -/** Interface for processing {->Component}s of a ->HyperText with - the visitor pattern. -*/ -class Processor : public csv::ProcessorIfc, - public csv::ConstProcessor<HyperText> -{ - public: - virtual ~Processor() {} - - using csv::ConstProcessor<HyperText>::Process; - - // Texts - void Process( - const PlainText & i_interpreter, - const String & i_data ); - void Process( - const HtmlText & i_interpreter, - const String & i_data ); - // Links - void Process( - const Link2Ce & i_interpreter, - const String & i_data ); - void Process( - const Link2Url & i_interpreter, - const String & i_data ); - void Process( - const Link2Unknown & - i_interpreter, - const String & i_data ); - void Process( - const Link2Param & i_interpreter, - const String & i_data ); - // Explicit Whitespace - void Process( - const Blank & i_interpreter ); - void Process( - const Indentation & i_interpreter, - const String & i_data ); - void Process( - const NewParagraph & - i_interpreter ); - void Process( - const SummarySeparator & - i_interpreter ); - private: - // Interface csv::ConstProcessor<HyperText>: - virtual void do_Process( - const HyperText & i_cient ); - // Locals - virtual void do_Process( - const PlainText & i_interpreter, - const String & i_data ) = 0; - virtual void do_Process( - const HtmlText & i_interpreter, - const String & i_data ) = 0; - virtual void do_Process( - const Link2Ce & i_interpreter, - const String & i_data ) = 0; - virtual void do_Process( - const Link2Url & i_interpreter, - const String & i_data ) = 0; - virtual void do_Process( - const Link2Unknown & - i_interpreter, - const String & i_data ) = 0; - virtual void do_Process( - const Link2Param & i_interpreter, - const String & i_data ) = 0; - virtual void do_Process( - const Blank & i_interpreter ) = 0; - virtual void do_Process( - const Indentation & i_interpreter, - const String & i_data ) = 0; - virtual void do_Process( - const NewParagraph & - i_interpreter ) = 0; - virtual void do_Process( - const SummarySeparator & - i_interpreter ) = 0; -}; - - - -// IMPLEMENTATION -inline void -Processor::Process( const PlainText & i_interpreter, - const String & i_data ) -{ - do_Process(i_interpreter, i_data); -} - -inline void -Processor::Process( const HtmlText & i_interpreter, - const String & i_data ) -{ - do_Process(i_interpreter, i_data); -} - -inline void -Processor::Process( const Link2Ce & i_interpreter, - const String & i_data ) -{ - do_Process(i_interpreter, i_data); -} - -inline void -Processor::Process( const Link2Url & i_interpreter, - const String & i_data ) -{ - do_Process(i_interpreter, i_data); -} - -inline void -Processor::Process( const Link2Unknown & i_interpreter, - const String & i_data ) -{ - do_Process(i_interpreter, i_data); -} - -inline void -Processor::Process( const Link2Param & i_interpreter, - const String & i_data ) -{ - do_Process(i_interpreter, i_data); -} - -inline void -Processor::Process( const Blank & i_interpreter ) -{ - do_Process(i_interpreter); -} - -inline void -Processor::Process( const Indentation & i_interpreter, - const String & i_data ) -{ - do_Process(i_interpreter, i_data); -} - -inline void -Processor::Process( const NewParagraph & i_interpreter ) -{ - do_Process(i_interpreter); -} - -inline void -Processor::Process( const SummarySeparator & i_interpreter ) -{ - do_Process(i_interpreter); -} - - - - -} // namespace ht -} // namespace doc -} // namespace ary -#endif diff --git a/autodoc/inc/ary/doc/ht/dht_stream.hxx b/autodoc/inc/ary/doc/ht/dht_stream.hxx deleted file mode 100644 index b45d7d7692b8..000000000000 --- a/autodoc/inc/ary/doc/ht/dht_stream.hxx +++ /dev/null @@ -1,166 +0,0 @@ -/************************************************************************* - * - * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * - * Copyright 2008 by Sun Microsystems, Inc. - * - * OpenOffice.org - a multi-platform office productivity suite - * - * $RCSfile: dht_stream.hxx,v $ - * $Revision: 1.3 $ - * - * 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 - * <http://www.openoffice.org/license.html> - * for a copy of the LGPLv3 License. - * - ************************************************************************/ - -#ifndef ARY_DOC_DHT_STREAM_HXX -#define ARY_DOC_DHT_STREAM_HXX - -// USED SERVICES -#include <ary/doc/d_hypertext.hxx> - - - -namespace ary -{ -namespace doc -{ -namespace ht -{ - class Stream; - - -typedef void (* F_StreamModifier)(Stream&); - -/// Causes the buffer in ->io_stream to be flushed. -void flush( - Stream & io_stream ); -/// Adds a newline. -void newline( - Stream & io_stream ); -/// Adds a single blank char. -void blank( - Stream & io_stream ); -/// Modifies ->Stream to plain text mode. -void plain( - Stream & io_stream ); -/// Modifies ->Stream to html text mode. -void html( - Stream & io_stream ); - - - - -/** Interface to write items into a ->HyperText. - - Text can be intepreted as plain ASCII or as HTML. The default - is plain ASCII. - Also you can add links and can specify the link's label. - If no label is provided for a link, the most specific part of the - link's name will be used. - - - @example - using ary::doc::HyperText; - using ary::doc::ht::Stream; - - Stream aWriter; - HyperText aText; - StreamGuard aGuard(aWriter,aText); - - Ce_id nId = i_ceid; - aWriter << "Hello," << newline; - aWriter.Add_Link2Ce(GetAbsolutePath(nId), "SomeCodeEntity") - aWriter << " will be transfered." << newline; - aWriter Add_Link2Param("io_someParameter"); - aWriter << " shows something else." - << flush; -*/ -class Stream -{ - NON_COPYABLE(Stream); - - public: - /// Marks the mode how documentation text is interpreted. - enum E_TextMode - { - tm_plain, - tm_html - }; - - Stream( - HyperText & o_Receiver, - E_TextMode i_initialTextMode = tm_plain); - /// Also flushes the stream to the connected ->HyperText, if any. - virtual ~Stream(); - - Stream & operator<<( - F_StreamModifier i_modifier ); - /// Inserts text. - Stream & operator<<( - const char * i_text ); - /// Inserts text. - Stream & operator<<( - const String & i_text ); - - void Add_Indentation( - uintt i_count ); - - void Add_Link2Ce( - const String & i_absolutePath, - const String & i_display = String::Null_() ); - void Add_Link2Unknown( - const String & i_type, - const String & i_display = String::Null_() ); - void Add_Link2Url( - const String & i_url, - const String & i_display = String::Null_() ); - void Add_Link2Param( - const String & i_parameter, - const String & i_display = String::Null_() ); - - E_TextMode CurrentMode() const; - - private: - friend void flush(Stream&); - friend void newline(Stream&); - friend void blank(Stream&); - friend void plain(Stream&); - friend void html(Stream&); - - // Locals - typedef void (Stream::*F_TextFlusher)(); - - void Flush(); - void PlainTextFlusher(); - void HtmlTextFlusher(); - - HyperText & Out(); - - // DATA - HyperText & mrOut; - F_TextFlusher mfCurTextFlusher; - StreamStr mText; -}; - - - -} // namspace ht -} // namspace doc -} // namspace ary -#endif diff --git a/autodoc/inc/ary/doc/ht/dht_white.hxx b/autodoc/inc/ary/doc/ht/dht_white.hxx deleted file mode 100644 index b57f857f6ff4..000000000000 --- a/autodoc/inc/ary/doc/ht/dht_white.hxx +++ /dev/null @@ -1,122 +0,0 @@ -/************************************************************************* - * - * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * - * Copyright 2008 by Sun Microsystems, Inc. - * - * OpenOffice.org - a multi-platform office productivity suite - * - * $RCSfile: dht_white.hxx,v $ - * $Revision: 1.3 $ - * - * 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 - * <http://www.openoffice.org/license.html> - * for a copy of the LGPLv3 License. - * - ************************************************************************/ - -#ifndef ARY_DHT_WHITE_HXX -#define ARY_DHT_WHITE_HXX - -// BASE CLASSES -#include <ary/doc/ht/dht_interpreter.hxx> - - - - -namespace ary -{ -namespace doc -{ -namespace ht -{ - class Component; - - -/** One blank character in documentation text. -*/ -class Blank : public Interpreter -{ - public: - virtual ~Blank(); - - static Component Create_Component_(); - - private: - // Interface Interpreter: - virtual void do_Accept( - Processor & io_processor, - const String & i_data ) const; -}; - - -/** New paragraph in documentation text. -*/ -class NewParagraph : public Interpreter -{ - public: - virtual ~NewParagraph(); - - static Component Create_Component_(); - - private: - // Interface Interpreter: - virtual void do_Accept( - Processor & io_processor, - const String & i_data ) const; -}; - -/** An indentation, beginning a line, in documentation text. -*/ -class Indentation : public Interpreter -{ - public: - virtual ~Indentation(); - - static Component Create_Component_( - uintt i_size ); - private: - // Interface Interpreter: - virtual void do_Accept( - Processor & io_processor, - const String & i_data ) const; -}; - - -/** The point where the first paragraph ends. Needed, if this text - has to work as a summary for containing the documentation block. -*/ -class SummarySeparator: public Interpreter -{ - public: - virtual ~SummarySeparator(); - - static Component Create_Component_( - bool i_interrupted ); - private: - // Interface Interpreter: - virtual void do_Accept( - Processor & io_processor, - const String & i_data ) const; -}; - - - - -} // namespace ht -} // namespace doc -} // namespace ary -#endif diff --git a/autodoc/inc/ary/idl/i_module.hxx b/autodoc/inc/ary/idl/i_module.hxx index a0a5ec370c56..0f38d6cd057b 100644 --- a/autodoc/inc/ary/idl/i_module.hxx +++ b/autodoc/inc/ary/idl/i_module.hxx @@ -77,8 +77,6 @@ class Module : public CodeEntity const String & i_sName, Ce_id i_nId ); // INQUIRY - /// @return 0 for the global namespace, +1 for each level below the global namespace. - intt Depth() const; Ce_id Search_Name( const String & i_sName ) const; void Get_Names( diff --git a/autodoc/inc/ary/idl/i_namelookup.hxx b/autodoc/inc/ary/idl/i_namelookup.hxx index fd09fb151828..5d5db55ed832 100644 --- a/autodoc/inc/ary/idl/i_namelookup.hxx +++ b/autodoc/inc/ary/idl/i_namelookup.hxx @@ -85,17 +85,6 @@ class NameLookup Ce_id i_id, ClassId i_class, Ce_id i_owner ); - // INQUIRY - /** - */ - bool Has_Name( - const String & i_name, - ClassId i_class, - Ce_id i_owner ) const; - void Get_Names( - Dyn_StdConstIterator<Map_Names::value_type> & - o_rResult, - const String & i_name ) const; private: // DATA Map_Names aNames; diff --git a/autodoc/inc/ary/idl/i_param.hxx b/autodoc/inc/ary/idl/i_param.hxx index 2ba9f3430d0c..260ab454cab0 100644 --- a/autodoc/inc/ary/idl/i_param.hxx +++ b/autodoc/inc/ary/idl/i_param.hxx @@ -49,7 +49,6 @@ class Parameter { public: // LIFECYCLE - Parameter(); Parameter( const String & i_sName, Type_id i_nType, diff --git a/autodoc/inc/ary/idl/i_traits.hxx b/autodoc/inc/ary/idl/i_traits.hxx index 02badaa97d9a..eac0acfc5c99 100644 --- a/autodoc/inc/ary/idl/i_traits.hxx +++ b/autodoc/inc/ary/idl/i_traits.hxx @@ -53,9 +53,6 @@ struct Ce_Traits static entity_base_type & EntityOf_( id_type i_id ); - static id_type IdOf_( - const entity_base_type & - i_entity ); }; diff --git a/autodoc/inc/ary/loc/loc_dir.hxx b/autodoc/inc/ary/loc/loc_dir.hxx index e84632d48329..c6df9171718c 100644 --- a/autodoc/inc/ary/loc/loc_dir.hxx +++ b/autodoc/inc/ary/loc/loc_dir.hxx @@ -82,8 +82,6 @@ class Directory : public LocationEntity Le_id Parent() const; Le_id AssignedRoot() const; - Le_id Search_Child( - const String & i_name ) const; Le_id Search_Dir( const String & i_name ) const; Le_id Search_File( diff --git a/autodoc/inc/ary/loc/loc_filebase.hxx b/autodoc/inc/ary/loc/loc_filebase.hxx index 409cae7c3c0b..2f9d8e3c5dd5 100644 --- a/autodoc/inc/ary/loc/loc_filebase.hxx +++ b/autodoc/inc/ary/loc/loc_filebase.hxx @@ -52,8 +52,6 @@ class FileBase : public LocationEntity public: virtual ~FileBase() {} - String Extension() const; - protected: FileBase( const String & i_localName , diff --git a/autodoc/inc/ary/loc/loc_traits.hxx b/autodoc/inc/ary/loc/loc_traits.hxx index 11e1f01b8404..9a1306eafedf 100644 --- a/autodoc/inc/ary/loc/loc_traits.hxx +++ b/autodoc/inc/ary/loc/loc_traits.hxx @@ -66,9 +66,6 @@ struct Le_Traits static entity_base_type & EntityOf_( id_type i_id ); - static id_type IdOf_( - const entity_base_type & - i_entity ); }; @@ -81,10 +78,7 @@ struct LeNode_Traits : public Le_Traits static symtree::Node<LeNode_Traits> * NodeOf_( entity_base_type & i_entity ); - static const String & - LocalNameOf_( - const entity_base_type & - i_entity ); + static entity_base_type * ParentOf_( const entity_base_type & diff --git a/autodoc/inc/ary/segmentedname.hxx b/autodoc/inc/ary/segmentedname.hxx deleted file mode 100644 index 0988e9bdd930..000000000000 --- a/autodoc/inc/ary/segmentedname.hxx +++ /dev/null @@ -1,153 +0,0 @@ -/************************************************************************* - * - * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * - * Copyright 2008 by Sun Microsystems, Inc. - * - * OpenOffice.org - a multi-platform office productivity suite - * - * $RCSfile: segmentedname.hxx,v $ - * $Revision: 1.4 $ - * - * 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 - * <http://www.openoffice.org/license.html> - * for a copy of the LGPLv3 License. - * - ************************************************************************/ - -#ifndef ARY_SEGMENTEDNAME_HXX -#define ARY_SEGMENTEDNAME_HXX - - -// USED SERVICES - // BASE CLASSES - // OTHER - - - -namespace ary -{ -namespace sn // segmented name -{ - -/** One segment in a name like "::global::abc<hello,xy>::def". - A segment being the part between "::"s. - - @collab implements ->SegmentedName -*/ -class NameSegment -{ - public: - explicit NameSegment( - const char * i_name ); - explicit NameSegment( - const String & i_name ); - NameSegment( - const NameSegment & i_segment ); - ~NameSegment(); - // OPERATORS - NameSegment & operator=( - const NameSegment & i_other ); - bool operator<( - const NameSegment & i_other ) const; - // OPERATIONS - String & Make_Template(); - - // INQUIRY - const String & Name() const; - const String * TemplateArguments() const; - - void Get_Text( - StreamStr & o_out ) const; - private: - // DATA - String sName; - Dyn<String> pTemplateArguments; -}; - - - -typedef std::vector<NameSegment> NameChain; - -} // namespace sn - - -/** A name of the form "::global::abc<hello,xy>::def". -*/ -class SegmentedName -{ - public: - explicit SegmentedName( - const char * i_text ); - explicit SegmentedName( - const String & i_text ); - ~SegmentedName(); - // OPERATIONS - bool operator<( - const SegmentedName & - i_other ) const; - - // INQUIRY - bool IsAbsolute() const; - const sn::NameChain & - Sequence() const; - - void Get_Text( - StreamStr & o_out ) const; - private: - void Interpret_Text( - const char * i_text ); /// [valid C++ or IDL name]. - - // DATA - sn::NameChain aSegments; - bool bIsAbsolute; -}; - - -// IMPLEMENTATION -namespace sn -{ - -inline const String & -NameSegment::Name() const -{ - return sName; -} - -inline const String * -NameSegment::TemplateArguments() const -{ - return pTemplateArguments.Ptr(); -} - -} // namespace sn - -inline bool -SegmentedName::IsAbsolute() const -{ - return bIsAbsolute; -} - -inline const sn::NameChain & -SegmentedName::Sequence() const -{ - return aSegments; -} - - - -} // namespace ary -#endif diff --git a/autodoc/inc/ary/symtreenode.hxx b/autodoc/inc/ary/symtreenode.hxx index c11210ce6369..f43605cd89b5 100644 --- a/autodoc/inc/ary/symtreenode.hxx +++ b/autodoc/inc/ary/symtreenode.hxx @@ -59,22 +59,19 @@ namespace symtree 1. static entity_base_type & EntityOf_( id_type i_id ); - 2. static id_type IdOf_( - const entity_base_type & - i_entity ); - 3. static symtree::Node<LeNode_Traits> * + 2. static symtree::Node<LeNode_Traits> * NodeOf_( const entity_base_type & i_entity ); - 4. static const String & + 3. static const String & LocalNameOf_( const entity_base_type & i_entity ); - 5. static entity_base_type * + 4. static entity_base_type * ParentOf_( const entity_base_type & i_entity ); - 6. template <class KEY> + 5. template <class KEY> static id_t Search_( const entity_base_type & i_entity, diff --git a/autodoc/inc/ary/x_ary.hxx b/autodoc/inc/ary/x_ary.hxx deleted file mode 100644 index dd1d61efbf5b..000000000000 --- a/autodoc/inc/ary/x_ary.hxx +++ /dev/null @@ -1,83 +0,0 @@ -/************************************************************************* - * - * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * - * Copyright 2008 by Sun Microsystems, Inc. - * - * OpenOffice.org - a multi-platform office productivity suite - * - * $RCSfile: x_ary.hxx,v $ - * $Revision: 1.4 $ - * - * 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 - * <http://www.openoffice.org/license.html> - * for a copy of the LGPLv3 License. - * - ************************************************************************/ - -#ifndef ARY_X_ARY_HXX -#define ARY_X_ARY_HXX - - - - -// USED SERVICES - // BASE CLASSES -#include <cosv/x.hxx> - // OTHER - - - -namespace ary -{ - -class X_Ary : public csv::Exception -{ - public: - enum E_Event - { - x_Any, - x_MultipleRepository, - x_MissingRepository, - x_EntityNotFound, - x_ConflictingNames, - x_InvalidId, - x_UnexpectedTypeOfObject, - x_InvalidCast, - x_CorruptData - }; - - // LIFECYCLE - X_Ary( - E_Event i_eEvent ); - // INQUIRY - E_Event GetEvent() const; - virtual void GetInfo( - std::ostream & o_rOutputMedium ) const; - private: - E_Event eEvent; -}; - -// IMPLEMENTATION -inline X_Ary::E_Event -X_Ary::GetEvent() const - { return eEvent; } - - - - -} // namespace ary -#endif diff --git a/autodoc/prj/build.lst b/autodoc/prj/build.lst index 8d4566f3d31e..fd4d3f7c7963 100644 --- a/autodoc/prj/build.lst +++ b/autodoc/prj/build.lst @@ -25,7 +25,6 @@ ar autodoc\source\ary\inc\cpp get - all ar_sri_cpp NULL ar autodoc\source\ary\inc\idl get - all ar_sri_idl NULL ar autodoc\source\ary\inc\loc get - all ar_sri_loc NULL ar autodoc\source\ary\inc\store get - all ar_sri_store NULL -ar autodoc\source\ary\adoc nmake - all ar_sr_adoc NULL ar autodoc\source\ary\cpp nmake - all ar_sr_cpp NULL ar autodoc\source\ary\doc nmake - all ar_sr_doc NULL ar autodoc\source\ary\idl nmake - all ar_sr_idl NULL @@ -65,4 +64,4 @@ ar autodoc\source\parser_i\tokens nmake - all ar_sp2_tok NULL ar autodoc\source\tools nmake - all ar_st NULL ar autodoc\source\mkinc get - all ar_smk NULL ar autodoc\source\exes get - all ar_se NULL -ar autodoc\source\exes\adc_uni nmake - all ar_se_uni ar_sr_adoc ar_sr_cpp ar_sr_doc ar_sr_idl ar_sr_info ar_sr_kernel ar_sr_loc ar_sr_cinfo ar_sd_html ar_sd_kernel ar_sd_idl ar_sp_adoc ar_sp_cpp ar_sp_krnl ar_sp_sem ar_sp_tok ar_sp2_idl ar_sd_tkit ar_sp2_idoc ar_sp2_tok ar_st NULL +ar autodoc\source\exes\adc_uni nmake - all ar_se_uni ar_sr_cpp ar_sr_doc ar_sr_idl ar_sr_info ar_sr_kernel ar_sr_loc ar_sr_cinfo ar_sd_html ar_sd_kernel ar_sd_idl ar_sp_adoc ar_sp_cpp ar_sp_krnl ar_sp_sem ar_sp_tok ar_sp2_idl ar_sd_tkit ar_sp2_idoc ar_sp2_tok ar_st NULL diff --git a/autodoc/source/ary/adoc/a_docuaccess.cxx b/autodoc/source/ary/adoc/a_docuaccess.cxx deleted file mode 100644 index 15afdd3f7906..000000000000 --- a/autodoc/source/ary/adoc/a_docuaccess.cxx +++ /dev/null @@ -1,276 +0,0 @@ -/************************************************************************* - * - * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * - * Copyright 2008 by Sun Microsystems, Inc. - * - * OpenOffice.org - a multi-platform office productivity suite - * - * $RCSfile: a_docuaccess.cxx,v $ - * $Revision: 1.3 $ - * - * 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 - * <http://www.openoffice.org/license.html> - * for a copy of the LGPLv3 License. - * - ************************************************************************/ - -#include <precomp.h> -#include <ary/adoc/a_docuaccess.hxx> - - -// NOT FULLY DEFINED SERVICES -#include <ary/doc/d_boolean.hxx> -#include <ary/doc/d_docu.hxx> -#include <ary/doc/d_namedlist.hxx> -#include <ary/doc/d_parametrized.hxx> -#include <ary/doc/d_struct.hxx> -#include <ary/doc/d_unit.hxx> - - - - -namespace ary -{ -namespace adoc -{ - -using namespace ::ary::doc; -typedef ::ary::doc::nodetype::id nt; - - - -inline ary::doc::Struct & -DocuAccess::Data() -{ - csv_assert(pContainer != 0); - if (pData != 0) - return *pData; - return Get_Data(); -} - - - - - -DocuAccess::DocuAccess( ary::doc::Documentation * io_docu ) - : pContainer(io_docu) -{ -} - - -ary::doc::Documentation * -DocuAccess::Assign_Container( ary::doc::Documentation * io_docu ) -{ - ary::doc::Documentation * - ret = Release_Container(); - pContainer = io_docu; - return ret; -} - -ary::doc::Documentation * -DocuAccess::Release_Container() -{ - // KORR_FUTURE - // Is this enough? - return pContainer; -} - -void -DocuAccess::Set_Deprecated() -{ - Data().Add_Node(* new Boolean( nt(ti_deprecated) )); -} - -void -DocuAccess::Set_Internal() -{ - Data().Add_Node(* new Boolean( nt(ti_internal) )); -} - -void -DocuAccess::Set_Published() -{ - Data().Add_Node(* new Boolean( nt(ti_published) )); -} - -ary::doc::HyperText & -DocuAccess::Add_Description() -{ - Unit & - nu = * new Unit( nt(ti_descr) ); - Data().Add_Node(nu); - return nu.Doc(); -} - -ary::doc::HyperText & -DocuAccess::Add_StdTag( E_TagId i_tag ) -{ - Unit & - nu = * new Unit( nt(i_tag) ); - Data().Add_Node(nu); - return nu.Doc(); -} - -ary::doc::HyperText & -DocuAccess::Add_base( const String & i_baseTypeName ) -{ - Unit & - nu = * new Unit( nt(ti_base) ); - Get_List(ti_base).Add_Node( i_baseTypeName, - nu, - NamedList::hdn_put_together ); - return nu.Doc(); -} - -ary::doc::HyperText & -DocuAccess::Add_collab( const String & i_partner ) -{ - Parametrized<String> & - np = * new Parametrized<String>( nt(ti_collab), i_partner ); - Data().Add_Node(np); - return np.Doc(); -} - -ary::doc::HyperText & -DocuAccess::Add_key( const String & i_keyWord ) -{ - Parametrized<String> & - np = * new Parametrized<String>( nt(ti_key), i_keyWord ); - Data().Add_Node(np); - return np.Doc(); -} - -typedef std::pair<String, String> ParamNameAndRange; - -ary::doc::HyperText & -DocuAccess::Add_param( const String & i_parameterName, - const String & i_validRange ) -{ - NamedList & - params = Get_List(ti_param); - - Parametrized<ParamNameAndRange> & - np = * new Parametrized<ParamNameAndRange>( - nt(ti_param), - ParamNameAndRange(i_parameterName,i_validRange) ); - params.Add_Node( i_parameterName, - np, - NamedList::hdn_put_together ); - return np.Doc(); -} - -ary::doc::HyperText & -DocuAccess::Add_see( const String & i_referencedEntity ) -{ - Parametrized<String> & - np = * new Parametrized<String>( nt(ti_see), i_referencedEntity ); - Data().Add_Node(np); - return np.Doc(); -} - -typedef std::pair<String, String> SinceInfo; - -ary::doc::HyperText & -DocuAccess::Add_since( const String & i_versionId, - const String & i_fullVersionText ) -{ - Parametrized<SinceInfo> & - np = * new Parametrized<SinceInfo>( - nt(ti_since), - SinceInfo(i_versionId, i_fullVersionText) ); - Data().Add_Node(np); - return np.Doc(); -} - -ary::doc::HyperText & -DocuAccess::Add_throws( const String & i_exceptionName ) -{ - Parametrized<String> & - np = * new Parametrized<String>( - nt(ti_throws), - i_exceptionName ); - Data().Add_Node(np); - return np.Doc(); -} - -ary::doc::HyperText & -DocuAccess::Add_tpl( const String & i_templateParameter ) -{ - Unit & - nu = * new Unit( nt(ti_tpl) ); - Get_List(ti_tpl).Add_Node( i_templateParameter, - nu, - NamedList::hdn_put_together ); - return nu.Doc(); -} - -ary::doc::HyperText & -DocuAccess::Add_ExtraTag( const String & i_tagName ) -{ - Unit & - nu = * new Unit( nt(ti_extra) ); - Get_List(ti_extra).Add_Node( i_tagName, - nu, - NamedList::hdn_normal ); - return nu.Doc(); -} - -ary::doc::HyperText & -DocuAccess::Add_TagWithMissingParameter(E_TagId i_tag) -{ - // KORR - - Parametrized<bool> & - np = * new Parametrized<bool>( - nt(i_tag), - false ); - Data().Add_Node(np); - return np.Doc(); -} - -const int C_MainStructNodeId = 1; - -ary::doc::Struct & -DocuAccess::Get_Data() -{ - csv_assert(pContainer != 0); - if (pContainer->Data() == 0) - { - pContainer->Set_Data(* new Struct(C_MainStructNodeId)); - } - - // KORR - was, wenn keine struct da ist? - pData = dynamic_cast< Struct* >(pContainer->Data()); - return *pData; -} - -ary::doc::NamedList & -DocuAccess::Get_List(E_TagId i_tag) -{ - Node * - ret = Data().Slot( nt(i_tag) ); - if (ret == 0) - ret = & Data().Add_Node(* new NamedList( nt(i_tag) )); - csv_assert( dynamic_cast< NamedList* >(ret) != 0 ); - return static_cast< NamedList& >(*ret); -} - - - - -} // Namespace adoc -} // Namespace ary diff --git a/autodoc/source/ary/adoc/makefile.mk b/autodoc/source/ary/adoc/makefile.mk deleted file mode 100644 index 44147a133acc..000000000000 --- a/autodoc/source/ary/adoc/makefile.mk +++ /dev/null @@ -1,56 +0,0 @@ -#************************************************************************* -# -# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. -# -# Copyright 2008 by Sun Microsystems, Inc. -# -# OpenOffice.org - a multi-platform office productivity suite -# -# $RCSfile: makefile.mk,v $ -# -# $Revision: 1.3 $ -# -# 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 -# <http://www.openoffice.org/license.html> -# for a copy of the LGPLv3 License. -# -#************************************************************************* - -PRJ=..$/..$/.. - -PRJNAME=autodoc -TARGET=ary_adoc - - -# --- Settings ----------------------------------------------------- - -ENABLE_EXCEPTIONS=true -PRJINC=$(PRJ)$/source - -.INCLUDE : settings.mk -.INCLUDE : $(PRJ)$/source$/mkinc$/fullcpp.mk - - -# --- Files -------------------------------------------------------- - - -OBJFILES= \ - $(OBJ)$/a_docuaccess.obj - - -# --- Targets ------------------------------------------------------ - -.INCLUDE : target.mk diff --git a/autodoc/source/ary/cpp/c_class.cxx b/autodoc/source/ary/cpp/c_class.cxx index 906eba7b67bc..1847c767a24b 100644 --- a/autodoc/source/ary/cpp/c_class.cxx +++ b/autodoc/source/ary/cpp/c_class.cxx @@ -43,29 +43,6 @@ namespace ary namespace cpp { - -Class::Class() - : aEssentials(), - aAssignedNode(), - aBaseClasses(), - aTemplateParameterTypes(), - aClasses(), - aEnums(), - aTypedefs(), - aOperations(), - aStaticOperations(), - aData(), - aStaticData(), - aFriendClasses(), - aFriendOperations(), - aKnownDerivatives(), - eClassKey(CK_class), - eProtection(PROTECT_global), - eVirtuality(VIRTUAL_none) -{ - aAssignedNode.Assign_Entity(*this); -} - Class::Class( const String & i_sLocalName, Ce_id i_nOwner, E_Protection i_eProtection, @@ -306,20 +283,5 @@ Class::PosOfName( const List_LocalCe & i_rList, return i_rList.end(); } -Class::Iterator_Locals -Class::PosOfName( List_LocalCe & i_rList, - const String & i_sName ) -{ - for ( Iterator_Locals ret = i_rList.begin(); - ret != i_rList.end(); - ++ret ) - { - if ( (*ret).sLocalName == i_sName ) - return ret; - } - return i_rList.end(); -} - - } // namespace cpp } // namespace ary diff --git a/autodoc/source/ary/cpp/c_define.cxx b/autodoc/source/ary/cpp/c_define.cxx index e631029f2fc6..fdcaf9645a96 100644 --- a/autodoc/source/ary/cpp/c_define.cxx +++ b/autodoc/source/ary/cpp/c_define.cxx @@ -75,37 +75,5 @@ Define::inq_DefinitionText() const return aDefinition; } -void -Define::GetText( StreamStr & o_rText ) const -{ - if ( aDefinition.begin() == aDefinition.end() ) - return; - - - bool bSwitch_Stringify = false; - bool bSwitch_Concatenate = false; - - for ( StringVector::const_iterator it = aDefinition.begin(); - it != aDefinition.end(); - ++it ) - { - if ( HandleOperatorsBeforeTextItem( o_rText, - bSwitch_Stringify, - bSwitch_Concatenate, - *it ) ) - { - continue; - } - - o_rText << (*it); - - Do_bStringify_end(o_rText, bSwitch_Stringify); - o_rText << " "; - } - o_rText.seekp(-1, csv::cur); -} - - - } // namespace cpp } // namespace ary diff --git a/autodoc/source/ary/cpp/c_enum.cxx b/autodoc/source/ary/cpp/c_enum.cxx index 574cf9aaa232..520411258db3 100644 --- a/autodoc/source/ary/cpp/c_enum.cxx +++ b/autodoc/source/ary/cpp/c_enum.cxx @@ -44,14 +44,6 @@ namespace ary namespace cpp { - -Enum::Enum() - : aEssentials(), - aValues(), - eProtection(PROTECT_global) -{ -} - Enum::Enum( const String & i_sLocalName, Ce_id i_nOwner, E_Protection i_eProtection, diff --git a/autodoc/source/ary/cpp/c_enuval.cxx b/autodoc/source/ary/cpp/c_enuval.cxx index 985023db6e2d..9406a004f917 100644 --- a/autodoc/source/ary/cpp/c_enuval.cxx +++ b/autodoc/source/ary/cpp/c_enuval.cxx @@ -41,12 +41,6 @@ namespace cpp { -EnumValue::EnumValue() -// : aEssentials, - // sInitialisation -{ -} - EnumValue::EnumValue( const String & i_sLocalName, Ce_id i_nOwner, String i_sInitialisation ) diff --git a/autodoc/source/ary/cpp/c_funct.cxx b/autodoc/source/ary/cpp/c_funct.cxx index a8ecc903c5e7..bd8ad201b5a0 100644 --- a/autodoc/source/ary/cpp/c_funct.cxx +++ b/autodoc/source/ary/cpp/c_funct.cxx @@ -84,19 +84,6 @@ namespace ary namespace cpp { -Function::Function() - : aEssentials(), - aTemplateParameterTypes(), - aSignature(), - nReturnType(0), - eProtection(PROTECT_global), - eVirtuality(VIRTUAL_none), - aFlags(), - aParameterInfos(), - pExceptions() -{ -} - Function::Function( const String & i_sLocalName, Ce_id i_nOwner, E_Protection i_eProtection, diff --git a/autodoc/source/ary/cpp/c_macro.cxx b/autodoc/source/ary/cpp/c_macro.cxx index 23e4b3cebe4d..ab9b1f70dd42 100644 --- a/autodoc/source/ary/cpp/c_macro.cxx +++ b/autodoc/source/ary/cpp/c_macro.cxx @@ -77,52 +77,5 @@ Macro::inq_DefinitionText() const return aDefinition; } -void -Macro::GetText( StreamStr & o_rText, - const StringVector & i_rGivenArguments ) const -{ - bool bSwitch_Stringify = false; - bool bSwitch_Concatenate = false; - intt nActiveParamNr = -1; - - if ( aDefinition.begin() == aDefinition.end() ) - return; - - for ( StringVector::const_iterator it = aDefinition.begin(); - it != aDefinition.end(); - ++it ) - { - if ( HandleOperatorsBeforeTextItem( o_rText, - bSwitch_Stringify, - bSwitch_Concatenate, - *it ) ) - { - continue; - } - - for ( StringVector::const_iterator param_it = aParams.begin(); - param_it != aParams.end() AND nActiveParamNr == -1; - ++param_it ) - { - if ( strcmp(*it, *param_it) == 0 ) - nActiveParamNr = param_it - aParams.begin(); - } - if ( nActiveParamNr == -1 ) - { - o_rText << (*it); - } - else - { - o_rText << i_rGivenArguments[nActiveParamNr]; - nActiveParamNr = -1; - } - - Do_bStringify_end(o_rText, bSwitch_Stringify); - o_rText << " "; - } - o_rText.seekp(-1, csv::cur); -} - - } // namespace cpp } // namespace ary diff --git a/autodoc/source/ary/cpp/c_osigna.cxx b/autodoc/source/ary/cpp/c_osigna.cxx index 758b583b7892..4842d1b15f9c 100644 --- a/autodoc/source/ary/cpp/c_osigna.cxx +++ b/autodoc/source/ary/cpp/c_osigna.cxx @@ -41,12 +41,6 @@ namespace cpp { -OperationSignature::OperationSignature() - : // aParameterTypes, - eConVol(CONVOL_none) -{ -} - OperationSignature::OperationSignature( std::vector<Type_id> i_parameterTypes, E_ConVol i_conVol ) : aParameterTypes(i_parameterTypes), diff --git a/autodoc/source/ary/cpp/c_reposypart.cxx b/autodoc/source/ary/cpp/c_reposypart.cxx index 1a2f7daa39d3..ece40fa5ca95 100644 --- a/autodoc/source/ary/cpp/c_reposypart.cxx +++ b/autodoc/source/ary/cpp/c_reposypart.cxx @@ -51,7 +51,6 @@ #include <ary/loc/locp_le.hxx> #include <ary/getncast.hxx> #include <loc_internalgate.hxx> -#include <nametree.hxx> #include <reposy.hxx> #include "ca_ce.hxx" #include "ca_def.hxx" diff --git a/autodoc/source/ary/cpp/c_traits.cxx b/autodoc/source/ary/cpp/c_traits.cxx index 16a4d9198b43..23e9bd4fd626 100644 --- a/autodoc/source/ary/cpp/c_traits.cxx +++ b/autodoc/source/ary/cpp/c_traits.cxx @@ -61,15 +61,6 @@ Ce_Traits::EntityOf_(id_type i_id) return Ce_Storage::Instance_()[i_id]; } -Ce_Traits::id_type -Ce_Traits::IdOf_(const entity_base_type & i_entity) -{ - return i_entity.CeId(); -} - - - - //******************** CeNode_Traits ********************// const symtree::Node<CeNode_Traits> * CeNode_Traits::NodeOf_(const entity_base_type & i_entity) @@ -91,12 +82,6 @@ CeNode_Traits::NodeOf_(entity_base_type & io_entity) return 0; } -const String & -CeNode_Traits::LocalNameOf_(const entity_base_type & i_entity) -{ - return i_entity.LocalName(); -} - Ce_Traits::entity_base_type * CeNode_Traits::ParentOf_(const entity_base_type & i_entity) { @@ -195,13 +180,6 @@ Def_Traits::EntityOf_(id_type i_id) return Def_Storage::Instance_()[i_id]; } -Def_Traits::id_type -Def_Traits::IdOf_(const entity_base_type & i_entity) -{ - return i_entity.DefId(); -} - - //******************** Def_Compare ********************// const Def_Compare::key_type & Def_Compare::KeyOf_(const entity_base_type & i_entity) @@ -227,13 +205,6 @@ Type_Traits::EntityOf_(id_type i_id) return Type_Storage::Instance_()[i_id]; } -Type_Traits::id_type -Type_Traits::IdOf_(const entity_base_type & i_entity) -{ - return i_entity.TypeId(); -} - - //******************** Type_Compare ********************// const UsedType_Compare::key_type & UsedType_Compare::KeyOf_(const entity_base_type & i_entity) diff --git a/autodoc/source/ary/cpp/c_tydef.cxx b/autodoc/source/ary/cpp/c_tydef.cxx index 04a29d3922d5..d7927efd27a5 100644 --- a/autodoc/source/ary/cpp/c_tydef.cxx +++ b/autodoc/source/ary/cpp/c_tydef.cxx @@ -44,14 +44,6 @@ namespace ary namespace cpp { - -Typedef::Typedef() - : // aEssentials, - nDescribingType(0), - eProtection(PROTECT_global) -{ -} - Typedef::Typedef( const String & i_sLocalName, Cid i_nOwner, E_Protection i_eProtection, diff --git a/autodoc/source/ary/cpp/c_vari.cxx b/autodoc/source/ary/cpp/c_vari.cxx index ecc18f039e31..32dbac810112 100644 --- a/autodoc/source/ary/cpp/c_vari.cxx +++ b/autodoc/source/ary/cpp/c_vari.cxx @@ -41,15 +41,6 @@ namespace ary namespace cpp { - -Variable::Variable() - : // aEssentials, - nType(0), - eProtection(PROTECT_global) - // aFlags -{ -} - Variable::Variable( const String & i_sLocalName, Cid i_nOwner, E_Protection i_eProtection, diff --git a/autodoc/source/ary/cpp/tplparam.cxx b/autodoc/source/ary/cpp/tplparam.cxx index d7a4e0b69849..b773f8777d57 100644 --- a/autodoc/source/ary/cpp/tplparam.cxx +++ b/autodoc/source/ary/cpp/tplparam.cxx @@ -72,35 +72,6 @@ TplParameter_Type::Get_Text( StreamStr & o_rOut, i_rGate.Types().Get_TypeText( o_rOut, nType ); } -TplParameter_Const::TplParameter_Const( const String & i_sConst ) - : sConstant(i_sConst) -{ -} - -TplParameter_Const::~TplParameter_Const() -{ -} - -intt -TplParameter_Const::Compare( const TemplateParameter & i_rOther ) const -{ - const TplParameter_Const * pOther - = dynamic_cast< const TplParameter_Const* >( &i_rOther ); - if (pOther == 0) - return +1; - - return strcmp( sConstant.c_str(), pOther->sConstant.c_str() ); -} - -void -TplParameter_Const::Get_Text( StreamStr & o_out, - const ary::cpp::Gate & ) const -{ - o_out << sConstant; -} - - - } // namespace ut } // namespace cpp } // namespace ary diff --git a/autodoc/source/ary/cpp/tplparam.hxx b/autodoc/source/ary/cpp/tplparam.hxx index 242ccebea933..5a937963e01b 100644 --- a/autodoc/source/ary/cpp/tplparam.hxx +++ b/autodoc/source/ary/cpp/tplparam.hxx @@ -81,27 +81,6 @@ class TplParameter_Type : public TemplateParameter Tid nType; }; -class TplParameter_Const : public TemplateParameter -{ - public: - TplParameter_Const( - const String & i_sConst ); - ~TplParameter_Const(); - - virtual intt Compare( - const TemplateParameter & - i_rOther ) const; - virtual void Get_Text( - StreamStr & o_rOut, - const ary::cpp::Gate & - i_rGate ) const; - private: - String sConstant; -}; - - - - } // namespace ut } // namespace cpp } // namespace ary diff --git a/autodoc/source/ary/cpp/usedtype.cxx b/autodoc/source/ary/cpp/usedtype.cxx index 4896e74e197f..e60b60492c4e 100644 --- a/autodoc/source/ary/cpp/usedtype.cxx +++ b/autodoc/source/ary/cpp/usedtype.cxx @@ -47,7 +47,6 @@ #include <ary/cpp/cp_type.hxx> #include <ary/doc/d_oldcppdocu.hxx> #include <ary/getncast.hxx> -#include <instlist.hxx> #include "tplparam.hxx" @@ -211,11 +210,6 @@ UsedType::Enter_Template() } void -UsedType::LeaveTemplate() -{ -} - -void UsedType::Set_Unsigned() { eTypeSpecialisation = TYSP_unsigned; @@ -308,8 +302,7 @@ UsedType::Connect2CeOnlyKnownViaBaseClass(const Gate & i_gate) // If there are no matches, or only one match that was already // accepted, all work is done. - if ( nRelatedCe.IsValid() - AND instances.size() == 1 + if ( (nRelatedCe.IsValid() AND instances.size() == 1) OR instances.size() == 0 ) return; @@ -532,24 +525,6 @@ List_TplParameter::AddParam_Type( Type_id i_nType ) } void -List_TplParameter::AddParam_Constant( const String & i_sConst ) -{ - aTplParameters.push_back( new TplParameter_Const(i_sConst) ); -} - -List_TplParameter::const_iterator -List_TplParameter::Begin() const -{ - return aTplParameters.begin(); -} - -List_TplParameter::const_iterator -List_TplParameter::End() const -{ - return aTplParameters.end(); -} - -void List_TplParameter::Get_Text( StreamStr & o_rOut, const ary::cpp::Gate & i_rGate ) const { diff --git a/autodoc/source/ary/doc/d_docu.cxx b/autodoc/source/ary/doc/d_docu.cxx index b0ab4979eed1..21d0ea502b7b 100644 --- a/autodoc/source/ary/doc/d_docu.cxx +++ b/autodoc/source/ary/doc/d_docu.cxx @@ -34,10 +34,6 @@ // NOT FULLY DEFINED SERVICES #include <ary/doc/d_node.hxx> -#include <ary/doc/d_hypertext.hxx> - - - namespace ary { @@ -49,11 +45,6 @@ Documentation::Documentation() { } -Documentation::Documentation(DYN Node & pass_data) - : pData(&pass_data) -{ -} - Documentation::~Documentation() { } diff --git a/autodoc/source/ary/doc/d_hypertext.cxx b/autodoc/source/ary/doc/d_hypertext.cxx deleted file mode 100644 index eaa95be9ed6b..000000000000 --- a/autodoc/source/ary/doc/d_hypertext.cxx +++ /dev/null @@ -1,82 +0,0 @@ -/************************************************************************* - * - * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * - * Copyright 2008 by Sun Microsystems, Inc. - * - * OpenOffice.org - a multi-platform office productivity suite - * - * $RCSfile: d_hypertext.cxx,v $ - * $Revision: 1.3 $ - * - * 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 - * <http://www.openoffice.org/license.html> - * for a copy of the LGPLv3 License. - * - ************************************************************************/ - -#include <precomp.h> -#include <ary/doc/d_hypertext.hxx> - - -// NOT FULLY DEFINED SERVICES -#include <cosv/tpl/funcall.hxx> -#include <ary/doc/ht/dht_component.hxx> -#include <ary/doc/ht/dht_processor.hxx> - - -namespace ary -{ -namespace doc -{ - - - -void -Accept( const HyperText & i_text, - csv::ProcessorIfc & io_processor ) -{ - csv::CheckedCall(io_processor, i_text); -} - - -namespace ht -{ - -void -Processor::do_Process( const HyperText & i_client ) -{ - csv::for_each_in( i_client, - csv::make_func(&Component::Accept, *this) ); -} - - -} // namespace ht - - - - -const HyperText & -NullText() -{ - static const HyperText aNullText_; - return aNullText_; -} - - - -} // namespace doc -} // namespace ary diff --git a/autodoc/source/ary/doc/d_namedlist.cxx b/autodoc/source/ary/doc/d_namedlist.cxx deleted file mode 100644 index fd0ec04e286c..000000000000 --- a/autodoc/source/ary/doc/d_namedlist.cxx +++ /dev/null @@ -1,148 +0,0 @@ -/************************************************************************* - * - * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * - * Copyright 2008 by Sun Microsystems, Inc. - * - * OpenOffice.org - a multi-platform office productivity suite - * - * $RCSfile: d_namedlist.cxx,v $ - * $Revision: 1.3 $ - * - * 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 - * <http://www.openoffice.org/license.html> - * for a copy of the LGPLv3 License. - * - ************************************************************************/ - -#include <precomp.h> -#include <ary/doc/d_namedlist.hxx> - - -// NOT FULLY DEFINED SERVICES -#include <algorithm> - - - -namespace ary -{ -namespace doc -{ - - -typedef StringVector::const_iterator name_const_iterator; -typedef StringVector::iterator name_iterator; -typedef NodeList::iterator node_iterator; - - -NamedList::NamedList(nodetype::id i_id) - : Node(i_id), - aNames(), - aElements() -{ -} - -NamedList::~NamedList() -{ -} - -const Node * -NamedList::operator[](const String & i_name) const -{ - name_const_iterator - itFound = std::find(aNames.begin(), aNames.end(), i_name); - if (itFound != aNames.end()) - return & aElements[itFound - aNames.begin()]; - return 0; -} - -void -NamedList::Add_Node( const String & i_name, - DYN Node & pass_Element, - E_HandleDuplicateNames eHandleDuplicateNames ) -{ - switch (eHandleDuplicateNames) - { - case hdn_normal: - AddNode_normal(i_name,pass_Element); - break; - case hdn_put_together: - AddNode_put_together(i_name,pass_Element); - break; - case hdn_keep_only_first: - AddNode_keep_only_first(i_name,pass_Element); - break; - default: - csv_assert(false); - } -} - -void -NamedList::AddNode_normal( const String & i_name, - DYN Node & pass_Element ) -{ - aNames.push_back(i_name); - aElements.push_back(pass_Element); -} - -void -NamedList::AddNode_put_together( const String & i_name, - DYN Node & pass_Element ) -{ - name_iterator - itFound = std::find(aNames.begin(), aNames.end(), i_name); - if (itFound == aNames.end()) - { - AddNode_normal(i_name, pass_Element); - return; - } - - // Find position after last equal name: - for ( ++itFound; - itFound != aNames.end() - ? *itFound == i_name - : false; - ++itFound ) {} - - // Calculate same position in aElements: - node_iterator - itElem = aElements.begin() + (itFound - aNames.begin()); - - aNames.insert(itFound, i_name); - aElements.insert(itElem, pass_Element); -} - -void -NamedList::AddNode_keep_only_first( const String & i_name, - DYN Node & pass_Element ) -{ - if (std::find(aNames.begin(), aNames.end(), i_name) == aNames.end()) - AddNode_normal(i_name, pass_Element); - else - delete &pass_Element; -} - -void -NamedList::do_Accept(csv::ProcessorIfc & io_processor ) const -{ - csv::CheckedCall(io_processor,*this); -} - - - - -} // namespace doc -} // namespace ary diff --git a/autodoc/source/ary/doc/d_node.cxx b/autodoc/source/ary/doc/d_node.cxx index a591824330bc..ff7cafabc9ff 100644 --- a/autodoc/source/ary/doc/d_node.cxx +++ b/autodoc/source/ary/doc/d_node.cxx @@ -32,11 +32,6 @@ #include <ary/doc/d_node.hxx> -// NOT FULLY DEFINED SERVICES -#include <ary/doc/d_hypertext.hxx> - - - namespace ary { namespace doc diff --git a/autodoc/source/ary/doc/d_oldcppdocu.cxx b/autodoc/source/ary/doc/d_oldcppdocu.cxx index f29f93c99058..26aee0059f61 100644 --- a/autodoc/source/ary/doc/d_oldcppdocu.cxx +++ b/autodoc/source/ary/doc/d_oldcppdocu.cxx @@ -329,23 +329,11 @@ OldCppDocu::IsInterface() const return bIsInterface; } - -const OldCppDocu & -OldCppDocu::Null_() -{ - static const OldCppDocu - aNull_; - return aNull_; -} - void OldCppDocu::do_Accept(csv::ProcessorIfc & io_processor) const { csv::CheckedCall(io_processor, *this); } - - - } // namespace doc } // namespace ary diff --git a/autodoc/source/ary/doc/d_struct.cxx b/autodoc/source/ary/doc/d_struct.cxx deleted file mode 100644 index 08479988d154..000000000000 --- a/autodoc/source/ary/doc/d_struct.cxx +++ /dev/null @@ -1,121 +0,0 @@ -/************************************************************************* - * - * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * - * Copyright 2008 by Sun Microsystems, Inc. - * - * OpenOffice.org - a multi-platform office productivity suite - * - * $RCSfile: d_struct.cxx,v $ - * $Revision: 1.3 $ - * - * 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 - * <http://www.openoffice.org/license.html> - * for a copy of the LGPLv3 License. - * - ************************************************************************/ - -#include <precomp.h> -#include <ary/doc/d_struct.hxx> - - -// NOT FULLY DEFINED SERVICES -#include <algorithm> - - -namespace ary -{ -namespace doc -{ - - - - - -Struct::Struct( nodetype::id i_id ) - : Node(i_id), - aElements() -{ -} - -Struct::~Struct() -{ -} - - -struct GetSlotId -{ - GetSlotId( - Struct::slot_id i_slot ) - : nSlot(i_slot) {} - - bool operator()( - const Node & i_node ) const - { return i_node.Type() == nSlot; } - - private: - Struct::slot_id nSlot; -}; - -Node & -Struct::Add_Node( DYN Node & pass_node ) -{ - NodeList::iterator - itFind = std::find_if( aElements.begin(), - aElements.end(), - GetSlotId(pass_node.Type()) ); - if ( itFind == aElements.end() ) - aElements.push_back(pass_node); - else - (*itFind).Add_toChain(pass_node); - return pass_node; -} - -const Node * -Struct::Slot( slot_id i_slot ) const -{ - NodeList::const_iterator - itFind = std::find_if( aElements.begin(), - aElements.end(), - GetSlotId(i_slot) ); - if ( itFind != aElements.end() ) - return &(*itFind); - return 0; -} - -Node * -Struct::Slot(slot_id i_slot) -{ - NodeList::iterator - itFind = std::find_if( aElements.begin(), - aElements.end(), - GetSlotId(i_slot) ); - if ( itFind != aElements.end() ) - return &(*itFind); - return 0; -} - -void -Struct::do_Accept(csv::ProcessorIfc & io_processor ) const -{ - csv::CheckedCall(io_processor,*this); -} - - - - -} // namespace doc -} // namespace ary diff --git a/autodoc/source/ary/doc/d_summary.cxx b/autodoc/source/ary/doc/d_summary.cxx deleted file mode 100644 index 1f4aee6be548..000000000000 --- a/autodoc/source/ary/doc/d_summary.cxx +++ /dev/null @@ -1,88 +0,0 @@ -/************************************************************************* - * - * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * - * Copyright 2008 by Sun Microsystems, Inc. - * - * OpenOffice.org - a multi-platform office productivity suite - * - * $RCSfile: d_summary.cxx,v $ - * $Revision: 1.3 $ - * - * 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 - * <http://www.openoffice.org/license.html> - * for a copy of the LGPLv3 License. - * - ************************************************************************/ - -#include <precomp.h> -#include <ary/doc/d_summary.hxx> - - -// NOT FULLY DEFINED SERVICES - - - -namespace ary -{ -namespace doc -{ - - - -Summary::Summary(nodetype::id i_slot) - : Node(i_slot), - pText(0), - bIncomplete(false), - nOrigin(0) -{ -} - -Summary::~Summary() -{ -} - -const HyperText & -Summary::Text() const -{ - static const HyperText aTextNull_; - return pText - ? *pText - : aTextNull_; -} - - -void -Summary::Set( const HyperText & i_text, - bool i_isIncomplete, - nodetype::id i_origin ) -{ - pText = &i_text; - bIncomplete = i_isIncomplete; - nOrigin = i_origin; -} - -void -Summary::do_Accept(csv::ProcessorIfc & io_processor ) const -{ - csv::CheckedCall(io_processor,*this); -} - - - - -} // namespace doc -} // namespace ary diff --git a/autodoc/source/ary/doc/d_unit.cxx b/autodoc/source/ary/doc/d_unit.cxx deleted file mode 100644 index 84664649867d..000000000000 --- a/autodoc/source/ary/doc/d_unit.cxx +++ /dev/null @@ -1,63 +0,0 @@ -/************************************************************************* - * - * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * - * Copyright 2008 by Sun Microsystems, Inc. - * - * OpenOffice.org - a multi-platform office productivity suite - * - * $RCSfile: d_unit.cxx,v $ - * $Revision: 1.3 $ - * - * 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 - * <http://www.openoffice.org/license.html> - * for a copy of the LGPLv3 License. - * - ************************************************************************/ - -#include <precomp.h> -#include <ary/doc/d_unit.hxx> - - -// NOT FULLY DEFINED SERVICES - - - -namespace ary -{ -namespace doc -{ - - -Unit::Unit(nodetype::id i_id) - : Node(i_id), - aDoc() -{ -} - -Unit::~Unit() -{ -} - -void -Unit::do_Accept(csv::ProcessorIfc & io_processor ) const -{ - csv::CheckedCall(io_processor,*this); -} - - -} // namespace doc -} // namespace ary diff --git a/autodoc/source/ary/doc/dht_component.cxx b/autodoc/source/ary/doc/dht_component.cxx deleted file mode 100644 index 7524153d48f7..000000000000 --- a/autodoc/source/ary/doc/dht_component.cxx +++ /dev/null @@ -1,117 +0,0 @@ -/************************************************************************* - * - * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * - * Copyright 2008 by Sun Microsystems, Inc. - * - * OpenOffice.org - a multi-platform office productivity suite - * - * $RCSfile: dht_component.cxx,v $ - * $Revision: 1.3 $ - * - * 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 - * <http://www.openoffice.org/license.html> - * for a copy of the LGPLv3 License. - * - ************************************************************************/ - -#include <precomp.h> -#include <ary/doc/ht/dht_component.hxx> - - -// NOT FULLY DEFINED SERVICES -#include <ary/doc/ht/dht_interpreter.hxx> -#include <ary/doc/ht/dht_processor.hxx> - - - -namespace ary -{ -namespace doc -{ -namespace ht -{ - -class Null_Interpreter : public Interpreter -{ - public: - virtual ~Null_Interpreter(); - private: - virtual void do_Accept( - Processor & io_processor, - const String & i_data ) const; -}; - -namespace -{ - -static const Null_Interpreter - C_aTheNullInterpreter_; -} - - -Component::Component() - : aData(String::Null_()), - pInterpreter(&C_aTheNullInterpreter_) -{ -} - -Component::Component( const Interpreter & i_interpreter ) - : aData(String::Null_()), // Makes sure, no extra memory - // is used for this string. - pInterpreter(&i_interpreter) -{ -} - -Component::Component( const Interpreter & i_interpreter, - const String & i_data ) - : aData(i_data), - pInterpreter(&i_interpreter) -{ -} - -Component::~Component() -{ -} - -void -Component::Accept( Processor & io_processor ) const -{ - csv_assert(pInterpreter != 0); - pInterpreter->Accept(io_processor, aData); -} - - - -//***************** Null_Interpreter **********************// - -Null_Interpreter::~Null_Interpreter() -{ -} - -void -Null_Interpreter::do_Accept( Processor & , - const String & ) const -{ - // Does nothing. -} - - - - -} // namespace ht -} // namespace doc -} // namespace ary diff --git a/autodoc/source/ary/doc/dht_helper.cxx b/autodoc/source/ary/doc/dht_helper.cxx deleted file mode 100644 index 8a00cd1a52a0..000000000000 --- a/autodoc/source/ary/doc/dht_helper.cxx +++ /dev/null @@ -1,88 +0,0 @@ -/************************************************************************* - * - * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * - * Copyright 2008 by Sun Microsystems, Inc. - * - * OpenOffice.org - a multi-platform office productivity suite - * - * $RCSfile: dht_helper.cxx,v $ - * $Revision: 1.3 $ - * - * 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 - * <http://www.openoffice.org/license.html> - * for a copy of the LGPLv3 License. - * - ************************************************************************/ - -#include <precomp.h> -#include "dht_helper.hxx" - - -// NOT FULLY DEFINED SERVICES -#include <ary/doc/ht/dht_component.hxx> - - - -namespace ary -{ -namespace doc -{ -namespace ht -{ - -Component -Create_Component( const Interpreter & i_intepreter, - const String & i_str1, - char i_separator, - const String & i_str2 ) -{ - if (i_str2.empty()) - return Component(i_intepreter, i_str1); - - StreamLock - sl(700); - sl() << i_str1 << i_separator << i_str2; - return Component( i_intepreter, String(sl().c_str()) ); -} - -void -Resolve_ComponentData( String & o_1, - String & o_2, - char i_separator, - const String & i_data ) -{ - const char * - p_begin = i_data.begin(); - const char * - p_separator = strchr(p_begin, i_separator); - if (p_separator != 0) - { - o_1 = String(p_begin, p_separator); - o_2 = String(p_separator+1, i_data.end()); - } - else - { - o_1 = i_data; - o_2 = i_data; - } -} - - - -} // namespace ht -} // namespace doc -} // namespace ary diff --git a/autodoc/source/ary/doc/dht_helper.hxx b/autodoc/source/ary/doc/dht_helper.hxx deleted file mode 100644 index 4bc525c2adc9..000000000000 --- a/autodoc/source/ary/doc/dht_helper.hxx +++ /dev/null @@ -1,75 +0,0 @@ -/************************************************************************* - * - * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * - * Copyright 2008 by Sun Microsystems, Inc. - * - * OpenOffice.org - a multi-platform office productivity suite - * - * $RCSfile: dht_helper.hxx,v $ - * $Revision: 1.3 $ - * - * 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 - * <http://www.openoffice.org/license.html> - * for a copy of the LGPLv3 License. - * - ************************************************************************/ - -#ifndef ARY_DOC_DHT_HELPER_HXX -#define ARY_DOC_DHT_HELPER_HXX - - - -namespace ary -{ -namespace doc -{ -namespace ht -{ - -class Component; -class Interpreter; - - -/** Joins two strings with a separator and creates a component - from the result. - - If ->i_str2 is empty, only i_str1 is used without the separator. -*/ -Component Create_Component( - const Interpreter & i_intepreter, - const String & i_str1, - char i_separator, - const String & i_str2 ); - -/** Joins two strings with a separator and creates a component - from the result. - - If ->i_str2 is empty, only i_str1 is used without the separator. -*/ -void Resolve_ComponentData( - String & o_1, - String & o_2, - char i_separator, - const String & i_data ); - - - -} // namespace ht -} // namespace doc -} // namespace ary - -#endif diff --git a/autodoc/source/ary/doc/dht_html.cxx b/autodoc/source/ary/doc/dht_html.cxx deleted file mode 100644 index c30dfd7ecd6e..000000000000 --- a/autodoc/source/ary/doc/dht_html.cxx +++ /dev/null @@ -1,71 +0,0 @@ -/************************************************************************* - * - * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * - * Copyright 2008 by Sun Microsystems, Inc. - * - * OpenOffice.org - a multi-platform office productivity suite - * - * $RCSfile: dht_html.cxx,v $ - * $Revision: 1.3 $ - * - * 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 - * <http://www.openoffice.org/license.html> - * for a copy of the LGPLv3 License. - * - ************************************************************************/ - -#include <precomp.h> -#include <ary/doc/ht/dht_html.hxx> - - -// NOT FULLY DEFINED SERVICES -#include <ary/doc/ht/dht_component.hxx> -#include <ary/doc/ht/dht_processor.hxx> - - -namespace ary -{ -namespace doc -{ -namespace ht -{ - - - -HtmlText::~HtmlText() -{ -} - -Component -HtmlText::Create_Component_( const String & i_text ) -{ - static const HtmlText aTheInstance_; - return Component(aTheInstance_, i_text); -} - -void -HtmlText::do_Accept( Processor & io_processor, - const String & i_data ) const -{ - io_processor.Process(*this, i_data); -} - - - -} // namespace ht -} // namespace doc -} // namespace ary diff --git a/autodoc/source/ary/doc/dht_link2ce.cxx b/autodoc/source/ary/doc/dht_link2ce.cxx deleted file mode 100644 index aed3230e3cdc..000000000000 --- a/autodoc/source/ary/doc/dht_link2ce.cxx +++ /dev/null @@ -1,91 +0,0 @@ -/************************************************************************* - * - * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * - * Copyright 2008 by Sun Microsystems, Inc. - * - * OpenOffice.org - a multi-platform office productivity suite - * - * $RCSfile: dht_link2ce.cxx,v $ - * $Revision: 1.3 $ - * - * 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 - * <http://www.openoffice.org/license.html> - * for a copy of the LGPLv3 License. - * - ************************************************************************/ - -#include <precomp.h> -#include <ary/doc/ht/dht_link2ce.hxx> - - -// NOT FULLY DEFINED SERVICES -#include <ary/doc/ht/dht_component.hxx> -#include <ary/doc/ht/dht_processor.hxx> -#include "dht_helper.hxx" - - - -namespace ary -{ -namespace doc -{ -namespace ht -{ - -const char C_cSeparator = '#'; - - -Link2Ce::~Link2Ce() -{ -} - -Component -Link2Ce::Create_Component_( const String & i_ceAbsolutePath, - const String & i_display ) -{ - static const Link2Ce - aTheInstance_; - return Create_Component( - aTheInstance_, - i_ceAbsolutePath, - C_cSeparator, - i_display ); -} - -void -Link2Ce::Resolve_( String & o_absolutePath, - String & o_display, - const String & i_data) -{ - Resolve_ComponentData( o_absolutePath, - o_display, - C_cSeparator, - i_data ); -} - -void -Link2Ce::do_Accept( Processor & io_processor, - const String & i_data ) const -{ - io_processor.Process(*this, i_data); -} - - - -} // namespace ht -} // namespace doc -} // namespace ary diff --git a/autodoc/source/ary/doc/dht_link2param.cxx b/autodoc/source/ary/doc/dht_link2param.cxx deleted file mode 100644 index 8e6c80416d0b..000000000000 --- a/autodoc/source/ary/doc/dht_link2param.cxx +++ /dev/null @@ -1,80 +0,0 @@ -/************************************************************************* - * - * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * - * Copyright 2008 by Sun Microsystems, Inc. - * - * OpenOffice.org - a multi-platform office productivity suite - * - * $RCSfile: dht_link2param.cxx,v $ - * $Revision: 1.3 $ - * - * 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 - * <http://www.openoffice.org/license.html> - * for a copy of the LGPLv3 License. - * - ************************************************************************/ - -#include <precomp.h> -#include <ary/doc/ht/dht_link2param.hxx> - - -// NOT FULLY DEFINED SERVICES -#include <ary/doc/ht/dht_component.hxx> -#include <ary/doc/ht/dht_processor.hxx> -#include "dht_helper.hxx" - - -namespace ary -{ -namespace doc -{ -namespace ht -{ - -const char C_cSeparator = '#'; - - - -Link2Param::~Link2Param() -{ -} - -Component -Link2Param::Create_Component_( const String & i_parameterName, - const String & i_display ) -{ - static const Link2Param - aTheInstance_; - return Create_Component( - aTheInstance_, - i_parameterName, - C_cSeparator, - i_display ); -} - -void -Link2Param::do_Accept( Processor & io_processor, - const String & i_data ) const -{ - io_processor.Process(*this, i_data); -} - - - -} // namespace ht -} // namespace doc -} // namespace ary diff --git a/autodoc/source/ary/doc/dht_link2unknown.cxx b/autodoc/source/ary/doc/dht_link2unknown.cxx deleted file mode 100644 index 2a73d8787b08..000000000000 --- a/autodoc/source/ary/doc/dht_link2unknown.cxx +++ /dev/null @@ -1,91 +0,0 @@ -/************************************************************************* - * - * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * - * Copyright 2008 by Sun Microsystems, Inc. - * - * OpenOffice.org - a multi-platform office productivity suite - * - * $RCSfile: dht_link2unknown.cxx,v $ - * $Revision: 1.3 $ - * - * 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 - * <http://www.openoffice.org/license.html> - * for a copy of the LGPLv3 License. - * - ************************************************************************/ - -#include <precomp.h> -#include <ary/doc/ht/dht_link2unknown.hxx> - - -// NOT FULLY DEFINED SERVICES -#include <ary/doc/ht/dht_component.hxx> -#include <ary/doc/ht/dht_processor.hxx> -#include "dht_helper.hxx" - - -namespace ary -{ -namespace doc -{ -namespace ht -{ - - -const char C_cSeparator = '#'; - - -Link2Unknown::~Link2Unknown() -{ -} - -Component -Link2Unknown::Create_Component_( const String & i_typeText, - const String & i_display ) -{ - static const Link2Unknown - aTheInstance_; - return Create_Component( - aTheInstance_, - i_typeText, - C_cSeparator, - i_display ); -} - -void -Link2Unknown::Resolve_( String & o_typeText, - String & o_display, - const String & i_data) -{ - Resolve_ComponentData( o_typeText, - o_display, - C_cSeparator, - i_data ); -} - -void -Link2Unknown::do_Accept( Processor & io_processor, - const String & i_data ) const -{ - io_processor.Process(*this, i_data); -} - - - -} // namespace ht -} // namespace doc -} // namespace ary diff --git a/autodoc/source/ary/doc/dht_link2url.cxx b/autodoc/source/ary/doc/dht_link2url.cxx deleted file mode 100644 index d82c58005a2f..000000000000 --- a/autodoc/source/ary/doc/dht_link2url.cxx +++ /dev/null @@ -1,91 +0,0 @@ -/************************************************************************* - * - * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * - * Copyright 2008 by Sun Microsystems, Inc. - * - * OpenOffice.org - a multi-platform office productivity suite - * - * $RCSfile: dht_link2url.cxx,v $ - * $Revision: 1.3 $ - * - * 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 - * <http://www.openoffice.org/license.html> - * for a copy of the LGPLv3 License. - * - ************************************************************************/ - -#include <precomp.h> -#include <ary/doc/ht/dht_link2url.hxx> - - -// NOT FULLY DEFINED SERVICES -#include <ary/doc/ht/dht_component.hxx> -#include <ary/doc/ht/dht_processor.hxx> -#include "dht_helper.hxx" - - -namespace ary -{ -namespace doc -{ -namespace ht -{ - - -const char C_cSeparator = ' '; - - -Link2Url::~Link2Url() -{ -} - -Component -Link2Url::Create_Component_( const String & i_url, - const String & i_display ) -{ - static const Link2Url - aTheInstance_; - return Create_Component( - aTheInstance_, - i_url, - C_cSeparator, - i_display ); -} - -void -Link2Url::Resolve_( String & o_url, - String & o_display, - const String & i_data) -{ - Resolve_ComponentData( o_url, - o_display, - C_cSeparator, - i_data ); -} - -void -Link2Url::do_Accept( Processor & io_processor, - const String & i_data ) const -{ - io_processor.Process(*this, i_data); -} - - - -} // namespace ht -} // namespace doc -} // namespace ary diff --git a/autodoc/source/ary/doc/dht_plain.cxx b/autodoc/source/ary/doc/dht_plain.cxx deleted file mode 100644 index 3372a4e1350c..000000000000 --- a/autodoc/source/ary/doc/dht_plain.cxx +++ /dev/null @@ -1,71 +0,0 @@ -/************************************************************************* - * - * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * - * Copyright 2008 by Sun Microsystems, Inc. - * - * OpenOffice.org - a multi-platform office productivity suite - * - * $RCSfile: dht_plain.cxx,v $ - * $Revision: 1.3 $ - * - * 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 - * <http://www.openoffice.org/license.html> - * for a copy of the LGPLv3 License. - * - ************************************************************************/ - -#include <precomp.h> -#include <ary/doc/ht/dht_plain.hxx> - - -// NOT FULLY DEFINED SERVICES -#include <ary/doc/ht/dht_component.hxx> -#include <ary/doc/ht/dht_processor.hxx> - - -namespace ary -{ -namespace doc -{ -namespace ht -{ - - - -PlainText::~PlainText() -{ -} - -Component -PlainText::Create_Component_( const String & i_text ) -{ - static const PlainText aTheInstance_; - return Component(aTheInstance_, i_text); -} - -void -PlainText::do_Accept( Processor & io_processor, - const String & i_data ) const -{ - io_processor.Process(*this, i_data); -} - - - -} // namespace ht -} // namespace doc -} // namespace ary diff --git a/autodoc/source/ary/doc/dht_stream.cxx b/autodoc/source/ary/doc/dht_stream.cxx deleted file mode 100644 index b4a135c2aa65..000000000000 --- a/autodoc/source/ary/doc/dht_stream.cxx +++ /dev/null @@ -1,222 +0,0 @@ -/************************************************************************* - * - * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * - * Copyright 2008 by Sun Microsystems, Inc. - * - * OpenOffice.org - a multi-platform office productivity suite - * - * $RCSfile: dht_stream.cxx,v $ - * $Revision: 1.3 $ - * - * 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 - * <http://www.openoffice.org/license.html> - * for a copy of the LGPLv3 License. - * - ************************************************************************/ - -#include <precomp.h> -#include <ary/doc/ht/dht_stream.hxx> - - -// NOT FULLY DEFINED SERVICES -#include <ary/doc/ht/dht_html.hxx> -#include <ary/doc/ht/dht_link2ce.hxx> -#include <ary/doc/ht/dht_link2param.hxx> -#include <ary/doc/ht/dht_link2url.hxx> -#include <ary/doc/ht/dht_link2unknown.hxx> -#include <ary/doc/ht/dht_plain.hxx> -#include <ary/doc/ht/dht_white.hxx> - - - -namespace ary -{ -namespace doc -{ -namespace ht -{ - - -inline HyperText & -Stream::Out() -{ - return mrOut; -} - - - - -Stream::Stream( HyperText & o_Receiver, - E_TextMode i_initialTextMode ) - : mrOut(o_Receiver), - mfCurTextFlusher( i_initialTextMode == tm_plain - ? &Stream::PlainTextFlusher - : &Stream::HtmlTextFlusher ), - mText(300) -{ -} - -Stream::~Stream() -{ - -} - -Stream & -Stream::operator<<( F_StreamModifier i_modifier ) -{ - (*i_modifier)(*this); - return *this; -} - -Stream & -Stream::operator<<( const char * i_text ) -{ - mText << i_text; - return *this; -} - -Stream & -Stream::operator<<( const String & i_text ) -{ - mText << i_text; - return *this; -} - -void -Stream::Add_Indentation( uintt i_count ) -{ - Flush(); - Out().push_back( - Indentation::Create_Component_(i_count) ); -} - -void -Stream::Add_Link2Ce( const String & i_absolutePath, - const String & i_display ) -{ - Flush(); - Out().push_back( - Link2Ce::Create_Component_(i_absolutePath, i_display) ); -} - -void -Stream::Add_Link2Unknown( const String & i_type, - const String & i_display ) -{ - Flush(); - Out().push_back( - Link2Unknown::Create_Component_(i_type, i_display) ); -} - -void -Stream::Add_Link2Url( const String & i_url, - const String & i_display) -{ - Flush(); - Out().push_back( - Link2Url::Create_Component_(i_url, i_display) ); -} - -void -Stream::Add_Link2Param( const String & i_parameter, - const String & i_display ) -{ - Flush(); - Out().push_back( - Link2Param::Create_Component_(i_parameter, i_display) ); -} - -Stream::E_TextMode -Stream::CurrentMode() const -{ - return mfCurTextFlusher == &Stream::PlainTextFlusher - ? tm_plain - : tm_html; -} - -void -Stream::Flush() -{ - if (mText.size() == 0) - return; - - if ( mText.size() > 1 - OR *mText.c_str() != ' ') - { - (this->*mfCurTextFlusher)(); - } - else - { - Out().push_back(Blank::Create_Component_()); - } - - mText.reset(); -} - -void -Stream::PlainTextFlusher() -{ - Out().push_back( - PlainText::Create_Component_(String(mText.c_str())) ); -} - -void -Stream::HtmlTextFlusher() -{ - Out().push_back( - HtmlText::Create_Component_(String(mText.c_str())) ); -} - - -void -flush(Stream& io_stream) -{ - io_stream.Flush(); -} - -void -newline(Stream& io_stream) -{ - io_stream.Flush(); - io_stream.Out().push_back(NewParagraph::Create_Component_()); -} - -void -blank(Stream& io_stream) -{ - io_stream.mText << ' '; -} - -void -plain(Stream& io_stream) -{ - io_stream.Flush(); - io_stream.mfCurTextFlusher = &Stream::PlainTextFlusher; -} - -void -html(Stream& io_stream) -{ - io_stream.Flush(); - io_stream.mfCurTextFlusher = &Stream::HtmlTextFlusher; -} - - - -} // namespace ht -} // namespace doc -} // namespace ary diff --git a/autodoc/source/ary/doc/dht_white.cxx b/autodoc/source/ary/doc/dht_white.cxx deleted file mode 100644 index ea4544eaaa9c..000000000000 --- a/autodoc/source/ary/doc/dht_white.cxx +++ /dev/null @@ -1,149 +0,0 @@ -/************************************************************************* - * - * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * - * Copyright 2008 by Sun Microsystems, Inc. - * - * OpenOffice.org - a multi-platform office productivity suite - * - * $RCSfile: dht_white.cxx,v $ - * $Revision: 1.3 $ - * - * 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 - * <http://www.openoffice.org/license.html> - * for a copy of the LGPLv3 License. - * - ************************************************************************/ - -#include <precomp.h> -#include <ary/doc/ht/dht_white.hxx> - - -// NOT FULLY DEFINED SERVICES -#include <ary/doc/ht/dht_component.hxx> -#include <ary/doc/ht/dht_processor.hxx> - - -namespace ary -{ -namespace doc -{ -namespace ht -{ - -const String - C_sMore(" (...)"); - -//********************** Blank *********************// - -Blank::~Blank() -{ -} - -Component -Blank::Create_Component_() -{ - static const Blank aTheInstance_; - return Component(aTheInstance_); -} - -void -Blank::do_Accept( Processor & io_processor, - const String & ) const -{ - io_processor.Process(*this); -} - - - - - -//******************** NewParagraph ********************// - -NewParagraph::~NewParagraph() -{ -} - -Component -NewParagraph::Create_Component_() -{ - static const NewParagraph aTheInstance_; - return Component(aTheInstance_); -} - -void -NewParagraph::do_Accept( Processor & io_processor, - const String & ) const -{ - io_processor.Process(*this); -} - - -//************** Indentation ****************// - -Indentation::~Indentation() -{ -} - -Component -Indentation::Create_Component_(uintt i_size) -{ - static const Indentation aTheInstance_; - StreamLock sl(100); - sl() << i_size; - return Component( aTheInstance_, - String(sl().c_str()) ); -} - -void -Indentation::do_Accept( Processor & io_processor, - const String & i_data ) const -{ - io_processor.Process(*this, i_data); -} - - - -//********************** SummarySeparator *********************// - -SummarySeparator::~SummarySeparator() -{ -} - -Component -SummarySeparator::Create_Component_(bool i_interrupted) -{ - static const SummarySeparator aTheInstance_; - return Component( aTheInstance_, - i_interrupted - ? C_sMore - : String::Null_() ); -} - -void -SummarySeparator::do_Accept( Processor & io_processor, - const String & ) const -{ - io_processor.Process(*this); -} - - - - - -} // namespace ht -} // namespace doc -} // namespace ary diff --git a/autodoc/source/ary/doc/makefile.mk b/autodoc/source/ary/doc/makefile.mk index 704631715449..f64ba0785dfe 100644 --- a/autodoc/source/ary/doc/makefile.mk +++ b/autodoc/source/ary/doc/makefile.mk @@ -52,25 +52,9 @@ PRJINC=$(PRJ)$/source OBJFILES= \ $(OBJ)$/d_boolean.obj \ $(OBJ)$/d_docu.obj \ - $(OBJ)$/d_hypertext.obj \ - $(OBJ)$/d_namedlist.obj \ $(OBJ)$/d_node.obj \ $(OBJ)$/d_oldcppdocu.obj \ - $(OBJ)$/d_oldidldocu.obj \ - $(OBJ)$/d_summary.obj \ - $(OBJ)$/d_struct.obj \ - $(OBJ)$/d_unit.obj \ - $(OBJ)$/dht_component.obj \ - $(OBJ)$/dht_helper.obj \ - $(OBJ)$/dht_html.obj \ - $(OBJ)$/dht_link2ce.obj \ - $(OBJ)$/dht_link2param.obj \ - $(OBJ)$/dht_link2unknown.obj \ - $(OBJ)$/dht_link2url.obj \ - $(OBJ)$/dht_plain.obj \ - $(OBJ)$/dht_stream.obj \ - $(OBJ)$/dht_white.obj - + $(OBJ)$/d_oldidldocu.obj # --- Targets ------------------------------------------------------ diff --git a/autodoc/source/ary/idl/i_module.cxx b/autodoc/source/ary/idl/i_module.cxx index 87adac427b4d..e82a874b2242 100644 --- a/autodoc/source/ary/idl/i_module.cxx +++ b/autodoc/source/ary/idl/i_module.cxx @@ -48,7 +48,6 @@ #include <ary/idl/i_sisingleton.hxx> #include <ary/idl/ip_ce.hxx> #include <nametreenode.hxx> -#include "i_strconst.hxx" namespace ary @@ -80,41 +79,6 @@ Module::Add_Name( const String & i_sName, pImpl->Add_Name(i_sName, i_nCodeEntity); } - -//void -//Module::Get_FullName( StringVector & o_rText, -// Ce_idList * o_pRelatedCes, -// const Gate & i_rGate ) const -//{ -// if (pImpl->Depth() < 1) -// return; -// -// if (o_pRelatedCes == 0) -// { -// for ( StringVector::const_iterator it = pImpl->NameChain_Begin(); -// it != pImpl->NameChain_End(); -// ++it ) -// { -// o_rText.push_back(strconst::NamespaceSeparator()); -// o_rText.push_back(*it); -// } -// } -// else -// { -// if (pImpl->Depth() > 1) -// { -// i_rGate.Ces().Find_Module(pImpl->Parent()) -// .Get_FullName( o_rText, -// o_pRelatedCes, -// i_rGate ); -// } -// -// o_rText.push_back(strconst::NamespaceSeparator()); -// o_rText.push_back(pImpl->Name()); -// o_pRelatedCes->push_back(CeId()); -// } -//} - Ce_id Module::Search_Name( const String & i_sName ) const { @@ -127,12 +91,6 @@ Module::Get_Names( Dyn_StdConstIterator<Ce_id> & o_rResult ) const pImpl->Get_Names( o_rResult ); } -intt -Module::Depth() const -{ - return pImpl->Depth(); -} - void Module::do_Accept( csv::ProcessorIfc & io_processor ) const { diff --git a/autodoc/source/ary/idl/i_namelookup.cxx b/autodoc/source/ary/idl/i_namelookup.cxx index 86e8cc58c83f..1a818387610c 100644 --- a/autodoc/source/ary/idl/i_namelookup.cxx +++ b/autodoc/source/ary/idl/i_namelookup.cxx @@ -61,37 +61,5 @@ NameLookup::Add_Name( const String & i_name, i_owner ))); } -bool -NameLookup::Has_Name( const String & i_name, - ClassId i_class, - Ce_id i_owner ) const -{ - IteratorRange<Map_Names::const_iterator> - aResult( aNames.equal_range(i_name) ); - - for ( ; aResult.operator bool(); ++aResult ) - { - if ( (i_class == 0 - OR (*aResult.cur()).second.nClass == i_class) - AND - ((*aResult.cur()).second.nOwner == i_owner - OR NOT i_owner.IsValid()) ) - { - return true; - } - } // end for - return false; -} - -void -NameLookup::Get_Names( Dyn_StdConstIterator<Map_Names::value_type> & o_rResult, - const String & i_name ) const -{ - IteratorRange<Map_Names::const_iterator> - aResult( aNames.equal_range(i_name) ); - o_rResult = new SCI_MultiMap<String, NameProperties>(aResult.cur(), aResult.end()); -} - - } // namespace idl } // namespace ary diff --git a/autodoc/source/ary/idl/i_param.cxx b/autodoc/source/ary/idl/i_param.cxx index d8a7ee543bc5..d46c98e9ff27 100644 --- a/autodoc/source/ary/idl/i_param.cxx +++ b/autodoc/source/ary/idl/i_param.cxx @@ -41,15 +41,6 @@ namespace ary namespace idl { - -Parameter::Parameter() - : sName(), - nType(0), - eDirection(param_in) -{ -} - - Parameter::Parameter( const String & i_sName, Type_id i_nType, E_ParameterDirection i_eDirection ) diff --git a/autodoc/source/ary/idl/i_strconst.cxx b/autodoc/source/ary/idl/i_strconst.cxx deleted file mode 100644 index 35609668066e..000000000000 --- a/autodoc/source/ary/idl/i_strconst.cxx +++ /dev/null @@ -1,72 +0,0 @@ -/************************************************************************* - * - * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * - * Copyright 2008 by Sun Microsystems, Inc. - * - * OpenOffice.org - a multi-platform office productivity suite - * - * $RCSfile: i_strconst.cxx,v $ - * $Revision: 1.6 $ - * - * 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 - * <http://www.openoffice.org/license.html> - * for a copy of the LGPLv3 License. - * - ************************************************************************/ - -#include <precomp.h> -#include "i_strconst.hxx" - -// NOT FULLY DECLARED SERVICES - - - - -namespace ary -{ -namespace idl -{ -namespace strconst -{ - - -const String C_sNamespaceSeparator("::"); -const String C_sSequenceBegin("sequence< "); -const String C_sSequenceEnd(" >"); - - -const String & -NamespaceSeparator() -{ - return C_sNamespaceSeparator; -} - -const String & -SequenceBegin() -{ - return C_sSequenceBegin; -} -const String & -SequenceEnd() -{ - return C_sSequenceEnd; -} - - -} // namespace strconst -} // namespace idl -} // namespace ary diff --git a/autodoc/source/ary/idl/i_strconst.hxx b/autodoc/source/ary/idl/i_strconst.hxx deleted file mode 100644 index 592045fc2659..000000000000 --- a/autodoc/source/ary/idl/i_strconst.hxx +++ /dev/null @@ -1,68 +0,0 @@ -/************************************************************************* - * - * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * - * Copyright 2008 by Sun Microsystems, Inc. - * - * OpenOffice.org - a multi-platform office productivity suite - * - * $RCSfile: i_strconst.hxx,v $ - * $Revision: 1.3 $ - * - * 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 - * <http://www.openoffice.org/license.html> - * for a copy of the LGPLv3 License. - * - ************************************************************************/ - -#ifndef ARY_IDL_I_STRCONST_HXX -#define ARY_IDL_I_STRCONST_HXX - - - -// USED SERVICES - // BASE CLASSES - // COMPONENTS - // PARAMETERS - - - -namespace ary -{ -namespace idl -{ - -namespace strconst -{ - -const String & -NamespaceSeparator(); // "::" -const String & -SequenceBegin(); // "sequence< " -const String & -SequenceEnd(); // " >" - - -} // namespace strconst - - - -} // namespace idl -} // namespace ary - -#endif - - diff --git a/autodoc/source/ary/idl/i_traits.cxx b/autodoc/source/ary/idl/i_traits.cxx index 93ae39bb4e4a..a3169dec585b 100644 --- a/autodoc/source/ary/idl/i_traits.cxx +++ b/autodoc/source/ary/idl/i_traits.cxx @@ -53,17 +53,6 @@ Ce_Traits::EntityOf_(id_type i_id) return Ce_Storage::Instance_()[i_id]; } -Ce_Traits::id_type -Ce_Traits::IdOf_(const entity_base_type & i_entity) -{ - return i_entity.CeId(); -} - - - - - - //******************** Ce_Compare ********************// const Ce_Compare::key_type & Ce_Compare::KeyOf_(const entity_base_type & i_entity) diff --git a/autodoc/source/ary/idl/it_builtin.cxx b/autodoc/source/ary/idl/it_builtin.cxx index 892ea0a0bec3..efc56433270f 100644 --- a/autodoc/source/ary/idl/it_builtin.cxx +++ b/autodoc/source/ary/idl/it_builtin.cxx @@ -34,7 +34,6 @@ // NOT FULLY DEFINED SERVICES #include <cosv/tpl/processor.hxx> -#include "i_strconst.hxx" diff --git a/autodoc/source/ary/idl/it_ce.cxx b/autodoc/source/ary/idl/it_ce.cxx index 650c764c9490..1beff469df0a 100644 --- a/autodoc/source/ary/idl/it_ce.cxx +++ b/autodoc/source/ary/idl/it_ce.cxx @@ -38,7 +38,6 @@ #include <ary/idl/i_gate.hxx> #include <ary/idl/i_module.hxx> #include <ary/idl/ip_ce.hxx> -#include "i_strconst.hxx" diff --git a/autodoc/source/ary/idl/it_explicit.cxx b/autodoc/source/ary/idl/it_explicit.cxx index cc5b2377cd5f..47a5661d7148 100644 --- a/autodoc/source/ary/idl/it_explicit.cxx +++ b/autodoc/source/ary/idl/it_explicit.cxx @@ -38,7 +38,6 @@ #include <ary/idl/i_gate.hxx> #include <ary/idl/ip_ce.hxx> #include <ary/idl/ip_type.hxx> -#include "i_strconst.hxx" #include "it_xnameroom.hxx" diff --git a/autodoc/source/ary/idl/it_sequence.cxx b/autodoc/source/ary/idl/it_sequence.cxx index ff8472879535..f30e6c289377 100644 --- a/autodoc/source/ary/idl/it_sequence.cxx +++ b/autodoc/source/ary/idl/it_sequence.cxx @@ -36,7 +36,6 @@ #include <cosv/tpl/processor.hxx> #include <ary/idl/i_gate.hxx> #include <ary/idl/ip_type.hxx> -#include "i_strconst.hxx" diff --git a/autodoc/source/ary/idl/it_tplparam.cxx b/autodoc/source/ary/idl/it_tplparam.cxx index 8f43456d31bd..d3f37e76b193 100644 --- a/autodoc/source/ary/idl/it_tplparam.cxx +++ b/autodoc/source/ary/idl/it_tplparam.cxx @@ -34,7 +34,6 @@ // NOT FULLY DEFINED SERVICES #include <cosv/tpl/processor.hxx> -#include "i_strconst.hxx" diff --git a/autodoc/source/ary/idl/it_xnameroom.cxx b/autodoc/source/ary/idl/it_xnameroom.cxx index 254f9860de3b..17238d060066 100644 --- a/autodoc/source/ary/idl/it_xnameroom.cxx +++ b/autodoc/source/ary/idl/it_xnameroom.cxx @@ -37,7 +37,6 @@ #include <cosv/tpl/tpltools.hxx> #include <ary/idl/i_gate.hxx> #include <ary/idl/ip_type.hxx> -#include "i_strconst.hxx" diff --git a/autodoc/source/ary/idl/makefile.mk b/autodoc/source/ary/idl/makefile.mk index 488b31712111..a6c206bc0d37 100644 --- a/autodoc/source/ary/idl/makefile.mk +++ b/autodoc/source/ary/idl/makefile.mk @@ -68,7 +68,6 @@ OBJFILES= \ $(OBJ)$/i_singleton.obj \ $(OBJ)$/i_siservice.obj \ $(OBJ)$/i_sisingleton.obj \ - $(OBJ)$/i_strconst.obj \ $(OBJ)$/i_struct.obj \ $(OBJ)$/i_structelem.obj \ $(OBJ)$/i_traits.obj \ diff --git a/autodoc/source/ary/inc/instlist.hxx b/autodoc/source/ary/inc/instlist.hxx deleted file mode 100644 index bb4fcd53a272..000000000000 --- a/autodoc/source/ary/inc/instlist.hxx +++ /dev/null @@ -1,55 +0,0 @@ -/************************************************************************* - * - * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * - * Copyright 2008 by Sun Microsystems, Inc. - * - * OpenOffice.org - a multi-platform office productivity suite - * - * $RCSfile: instlist.hxx,v $ - * $Revision: 1.4 $ - * - * 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 - * <http://www.openoffice.org/license.html> - * for a copy of the LGPLv3 License. - * - ************************************************************************/ - -#ifndef ARY_INSTLIST_HXX -#define ARY_INSTLIST_HXX - -// USED SERVICES -#include <ary/types.hxx> - - - - -namespace ary -{ - - -class InstanceList : public std::vector< ary::Rid > -{ - public: - InstanceList(); - ~InstanceList(); -}; - - - - -} // namespace ary -#endif diff --git a/autodoc/source/ary/inc/nametree.hxx b/autodoc/source/ary/inc/nametree.hxx deleted file mode 100644 index 27ccf3214592..000000000000 --- a/autodoc/source/ary/inc/nametree.hxx +++ /dev/null @@ -1,87 +0,0 @@ -/************************************************************************* - * - * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * - * Copyright 2008 by Sun Microsystems, Inc. - * - * OpenOffice.org - a multi-platform office productivity suite - * - * $RCSfile: nametree.hxx,v $ - * $Revision: 1.5 $ - * - * 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 - * <http://www.openoffice.org/license.html> - * for a copy of the LGPLv3 License. - * - ************************************************************************/ - -#ifndef ARY_NAMETREE_HXX -#define ARY_NAMETREE_HXX - -// USED SERVICES -#include <ary/types.hxx> -#include <ary/namesort.hxx> -#include "instlist.hxx" - - - - -namespace ary -{ - - -class NameTree -{ - public: - typedef std::map< String , - InstanceList, - LesserName > Map_Name2Inst; - - typedef Map_Name2Inst::const_iterator const_iterator; - typedef Map_Name2Inst::iterator iterator; - - - NameTree(); - ~NameTree(); - - const InstanceList & - operator[]( - const String & i_rName ) const; - - void insert( - const String & i_rName, - ary::Rid i_nId ); - - const_iterator find( - const String & i_rName ); - const_iterator lower_bound( - const String & i_rName ) const; - const_iterator begin() const; - const_iterator end() const; - - iterator begin(); - iterator end(); - - private: - // DATA - Map_Name2Inst aNames; -}; - - - - -} // namespace ary -#endif diff --git a/autodoc/source/ary/inc/slots.hxx b/autodoc/source/ary/inc/slots.hxx index 365ed0167cfe..0944024b49d3 100644 --- a/autodoc/source/ary/inc/slots.hxx +++ b/autodoc/source/ary/inc/slots.hxx @@ -63,23 +63,6 @@ class Slot_Null : public Slot Display & o_rDestination ) const; }; - -class Slot_RidSet : public Slot -{ - public: - Slot_RidSet( - const Set_Rid & i_rData ); - virtual ~Slot_RidSet(); - - virtual uintt Size() const; - - private: - virtual void StoreEntries( - Display & o_rDestination ) const; - // DATA - const Set_Rid * pData; -}; - class Slot_MapLocalCe : public Slot { public: @@ -113,22 +96,6 @@ class Slot_MapOperations : public Slot pData; }; -class Slot_RidList : public Slot -{ - public: - Slot_RidList( - const List_Rid & i_rData ); - virtual ~Slot_RidList(); - - virtual uintt Size() const; - - private: - virtual void StoreEntries( - Display & o_rDestination ) const; - // DATA - const List_Rid * pData; -}; - class Slot_ListLocalCe : public Slot { public: diff --git a/autodoc/source/ary/kernel/instlist.cxx b/autodoc/source/ary/kernel/instlist.cxx deleted file mode 100644 index 8e8512cbdd6b..000000000000 --- a/autodoc/source/ary/kernel/instlist.cxx +++ /dev/null @@ -1,52 +0,0 @@ -/************************************************************************* - * - * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * - * Copyright 2008 by Sun Microsystems, Inc. - * - * OpenOffice.org - a multi-platform office productivity suite - * - * $RCSfile: instlist.cxx,v $ - * $Revision: 1.6 $ - * - * 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 - * <http://www.openoffice.org/license.html> - * for a copy of the LGPLv3 License. - * - ************************************************************************/ - -#include <precomp.h> -#include <instlist.hxx> - - -// NOT FULLY DECLARED SERVICES -#include <instlist.hxx> - - - -namespace ary -{ - -InstanceList::InstanceList() -{ -} - -InstanceList::~InstanceList() -{ -} - - -} // namespace ary diff --git a/autodoc/source/ary/kernel/makefile.mk b/autodoc/source/ary/kernel/makefile.mk index 3f71a8bf316e..b3d99c90068b 100644 --- a/autodoc/source/ary/kernel/makefile.mk +++ b/autodoc/source/ary/kernel/makefile.mk @@ -52,14 +52,10 @@ PRJINC=$(PRJ)$/source OBJFILES= \ $(OBJ)$/ary_disp.obj \ $(OBJ)$/cessentl.obj \ - $(OBJ)$/instlist.obj \ $(OBJ)$/namesort.obj \ - $(OBJ)$/nametree.obj \ $(OBJ)$/qualiname.obj \ $(OBJ)$/reposy.obj \ - $(OBJ)$/segmentedname.obj \ - $(OBJ)$/slots.obj \ - $(OBJ)$/x_ary.obj + $(OBJ)$/slots.obj diff --git a/autodoc/source/ary/kernel/nametree.cxx b/autodoc/source/ary/kernel/nametree.cxx deleted file mode 100644 index f806001f1966..000000000000 --- a/autodoc/source/ary/kernel/nametree.cxx +++ /dev/null @@ -1,106 +0,0 @@ -/************************************************************************* - * - * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * - * Copyright 2008 by Sun Microsystems, Inc. - * - * OpenOffice.org - a multi-platform office productivity suite - * - * $RCSfile: nametree.cxx,v $ - * $Revision: 1.7 $ - * - * 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 - * <http://www.openoffice.org/license.html> - * for a copy of the LGPLv3 License. - * - ************************************************************************/ - -#include <precomp.h> -#include <nametree.hxx> - - -// NOT FULLY DECLARED SERVICES - - - -namespace ary -{ - - -NameTree::NameTree() -{ -} - -NameTree::~NameTree() -{ -} - -const InstanceList & -NameTree::operator[]( const String & i_rName ) const -{ - static InstanceList aNull_; - - const_iterator itFound = aNames.find(i_rName); - if ( itFound != aNames.end() ) - return (*itFound).second; - return aNull_; -} - -void -NameTree::insert( const String & i_rName, - ary::Rid i_nId ) -{ - aNames[i_rName].push_back(i_nId); -} - -NameTree::const_iterator -NameTree::find( const String & i_rName ) -{ - return aNames.find( i_rName ); -} - -NameTree::const_iterator -NameTree::lower_bound( const String & i_rName ) const -{ - return aNames.lower_bound(i_rName); -} - -NameTree::const_iterator -NameTree::begin() const -{ - return aNames.begin(); -} - -NameTree::const_iterator -NameTree::end() const -{ - return aNames.end(); -} - -NameTree::iterator -NameTree::begin() -{ - return aNames.begin(); -} - -NameTree::iterator -NameTree::end() -{ - return aNames.end(); -} - - -} // namespace ary diff --git a/autodoc/source/ary/kernel/segmentedname.cxx b/autodoc/source/ary/kernel/segmentedname.cxx deleted file mode 100644 index 8d4cf4503843..000000000000 --- a/autodoc/source/ary/kernel/segmentedname.cxx +++ /dev/null @@ -1,272 +0,0 @@ -/************************************************************************* - * - * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * - * Copyright 2008 by Sun Microsystems, Inc. - * - * OpenOffice.org - a multi-platform office productivity suite - * - * $RCSfile: segmentedname.cxx,v $ - * $Revision: 1.3 $ - * - * 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 - * <http://www.openoffice.org/license.html> - * for a copy of the LGPLv3 License. - * - ************************************************************************/ - -#include <precomp.h> -#include <ary/segmentedname.hxx> - - -// NOT FULLY DEFINED SERVICES - - - -namespace ary -{ -namespace sn // segmented name -{ - - -//********************* NameSegment ******************// - -NameSegment::NameSegment( const char * i_name ) - : sName(i_name), - pTemplateArguments() -{ -} - -NameSegment::NameSegment( const String & i_name ) - : sName(i_name), - pTemplateArguments() -{ -} - -NameSegment::NameSegment( const NameSegment & i_other ) - : sName(i_other.sName), - pTemplateArguments() -{ - if (i_other.TemplateArguments() != 0) - pTemplateArguments = new String(*i_other.TemplateArguments()); -} - -NameSegment::~NameSegment() -{ -} - -NameSegment & -NameSegment::operator=( const NameSegment & i_other ) -{ - sName = i_other.sName; - if (i_other.TemplateArguments() != 0) - pTemplateArguments = new String(*i_other.TemplateArguments()); - return *this; -} - -bool -NameSegment::operator<( const NameSegment & i_other ) const -{ - if (sName < i_other.sName) - return true; - else if (sName == i_other.sName) - { - if (i_other.TemplateArguments() == 0) - return false; - else if (TemplateArguments() == 0) - return true; - else - return *TemplateArguments() < *i_other.TemplateArguments(); - } - - return false; -} - -String & -NameSegment::Make_Template() -{ - return *(pTemplateArguments = new String); -} - -void -NameSegment::Get_Text( StreamStr & o_out ) const -{ - o_out << sName; - if ( pTemplateArguments ) - o_out << '<' << *pTemplateArguments << '>'; -} - - -} // namespace sn - - - - - -//********************* SegmentedName ******************// -SegmentedName::SegmentedName( const char * i_text ) - : aSegments(), - bIsAbsolute(strncmp(i_text,"::",2) == 0) -{ - Interpret_Text(i_text + (bIsAbsolute ? 2 : 0)); -} - -SegmentedName::SegmentedName( const String & i_text ) - : aSegments(), - bIsAbsolute(strncmp(i_text.c_str(),"::",2) == 0) -{ - Interpret_Text(i_text.c_str() + (bIsAbsolute ? 2 : 0)); -} - -SegmentedName::~SegmentedName() -{ -} - -bool -SegmentedName::operator<( const SegmentedName & i_other ) const -{ - if (IsAbsolute() AND NOT i_other.IsAbsolute()) - return true; - if (NOT IsAbsolute() AND i_other.IsAbsolute()) - return false; - return aSegments < i_other.aSegments; -} - -void -SegmentedName::Get_Text( StreamStr & o_out ) const -{ - if ( IsAbsolute() ) - o_out << "::"; - - sn::NameChain::const_iterator - it = aSegments.begin(); - sn::NameChain::const_iterator - itEnd = aSegments.end(); - if (it != itEnd) - (*it).Get_Text(o_out); - for ( ++it; - it != itEnd; - ++it ) - { - o_out << "::"; - (*it).Get_Text(o_out); - } - o_out << '>'; -} - - -void -SegmentedName::Interpret_Text( const char * i_text ) -{ - const int blank = 1; - const int name = 2; - const int delimiter = 3; - const int open_tpl = 4; - - const int - C_aTextInterpreter[128] = - { - 0, 0, 0, 0, 0, 0, 0, 0, - 0, blank, blank, 0, 0, blank, 0, 0, - 0, 0, 0, 0, 0, 0, 0, 0, - 0, 0, 0, 0, 0, 0, 0, 0, - blank, 0, 0, 0, 0, 0, 0, 0, - 0, 0, 0, 0, 0, 0, 0, 0, - name, name, name, name, name, name, name, name, - name, name, delimiter, 0, open_tpl, 0, 0, 0, - - 0, name, name, name, name, name, name, name, - name, name, name, name, name, name, name, name, - name, name, name, name, name, name, name, name, - name, name, name, 0, 0, 0, 0, name, - 0, name, name, name, name, name, name, name, - name, name, name, name, name, name, name, name, - name, name, name, name, name, name, name, name, - name, name, name, 0, 0, 0, 0, 0 - }; - - Dyn<sn::NameSegment> - pNextSegment(0); - const char * pTokenStart = i_text; - - intt nDelimiterStep = 0; // 0 = in-name, - // 1 = first ':' found - uintt nTemplateLevel = 0; - bool bTokenFinished = false; - - const char * iter = i_text; - for ( ; *iter != 0; ++iter) - { - if (nTemplateLevel == 0) - { - switch (C_aTextInterpreter[int(*iter)]) - { - case name: - if (bTokenFinished) - { - aSegments.push_back(*pNextSegment.Release()); - pTokenStart = iter; - nDelimiterStep = 0; - bTokenFinished = false; - } - break; - case delimiter: - if (nDelimiterStep == 0) - { - pNextSegment = new sn::NameSegment(String(pTokenStart,iter)); - bTokenFinished = true; - } - ++nDelimiterStep; - break; - case open_tpl: - pNextSegment = new sn::NameSegment(String(pTokenStart,iter)); - bTokenFinished = true; - break; - default: - csv_assert(false); - } // end switch - } - else // nTemplateLevel > 0 - { - if (bTokenFinished) - { - pTokenStart = iter; - bTokenFinished = false; - } - if (*iter == '<') - ++nTemplateLevel; - else if (*iter == '>') - { - --nTemplateLevel; - if (nTemplateLevel == 0) - { - csv_assert(pNextSegment); - pNextSegment->Make_Template() = String(pTokenStart, iter); - bTokenFinished = true; - } - } - } // end if (nTemplateLevel == 0) - } // end for - - if (NOT bTokenFinished AND pTokenStart != iter) - { - pNextSegment = new sn::NameSegment(String(pTokenStart,iter)); - aSegments.push_back(*pNextSegment.Release()); - } -} - - -} // namespace ary diff --git a/autodoc/source/ary/kernel/slots.cxx b/autodoc/source/ary/kernel/slots.cxx index f4b7fee2a7f5..78c0c8f89ba5 100644 --- a/autodoc/source/ary/kernel/slots.cxx +++ b/autodoc/source/ary/kernel/slots.cxx @@ -77,38 +77,6 @@ Slot_Null::StoreEntries( Display & ) const // Does nothing } - -//*********************** Slot_RidSet ********************// - -Slot_RidSet::Slot_RidSet( const Set_Rid & i_rData ) - : pData(&i_rData) -{ -} - -Slot_RidSet::~Slot_RidSet() -{ -} - -uintt -Slot_RidSet::Size() const -{ - return pData->size();; -} - -void -Slot_RidSet::StoreEntries( Display & o_rDestination ) const -{ - for ( Set_Rid::const_iterator it = pData->begin(); - it != pData->end(); - ++it ) - { - o_rDestination.DisplaySlot_Rid( *it ); - } -} - - - - //*********************** Slot_MapLocalCe ********************// Slot_MapLocalCe::Slot_MapLocalCe( const cpp::Map_LocalCe & i_rData ) @@ -167,37 +135,6 @@ Slot_MapOperations::StoreEntries( Display & o_rDestination ) const } } - -//*********************** Slot_RidList ********************// - -Slot_RidList::Slot_RidList( const List_Rid & i_rData ) - : pData(&i_rData) -{ -} - -Slot_RidList::~Slot_RidList() -{ -} - -uintt -Slot_RidList::Size() const -{ - return pData->size();; -} - -void -Slot_RidList::StoreEntries( Display & o_rDestination ) const -{ - for ( List_Rid::const_iterator it = pData->begin(); - it != pData->end(); - ++it ) - { - o_rDestination.DisplaySlot_Rid( *it ); - } -} - - - //*********************** Slot_ListLocalCe ********************// Slot_ListLocalCe::Slot_ListLocalCe( const cpp::List_LocalCe & i_rData ) diff --git a/autodoc/source/ary/kernel/x_ary.cxx b/autodoc/source/ary/kernel/x_ary.cxx deleted file mode 100644 index 360a12023f51..000000000000 --- a/autodoc/source/ary/kernel/x_ary.cxx +++ /dev/null @@ -1,77 +0,0 @@ -/************************************************************************* - * - * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * - * Copyright 2008 by Sun Microsystems, Inc. - * - * OpenOffice.org - a multi-platform office productivity suite - * - * $RCSfile: x_ary.cxx,v $ - * $Revision: 1.6 $ - * - * 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 - * <http://www.openoffice.org/license.html> - * for a copy of the LGPLv3 License. - * - ************************************************************************/ - -#include <precomp.h> -#include <ary/x_ary.hxx> - - -// NOT FULLY DECLARED SERVICES - - - -namespace ary -{ - - -X_Ary::X_Ary( E_Event i_eEvent ) - : eEvent(i_eEvent) -{ -} - -void -X_Ary::GetInfo( std::ostream & o_rOutputMedium ) const -{ - switch (eEvent) - { - case x_MultipleRepository: - o_rOutputMedium << "Tried to create a repository instance, though there exists one already."; - break; - case x_MissingRepository: - o_rOutputMedium << "Tried to access the repository, though there exists none."; - break; - case x_EntityNotFound: - o_rOutputMedium << "Code entity not found in repository."; - break; - case x_ConflictingNames: - o_rOutputMedium << "Name of code entity occurs double in different versions."; - break; - case x_UnexpectedTypeOfObject: - o_rOutputMedium << "Name- or id-mismatch: Code entity had other type than expected."; - break; - case x_Any: - default: - o_rOutputMedium << "Unspecified exception in repository."; - } // end switch - o_rOutputMedium << Endl(); -} - - -} // namespace ary - diff --git a/autodoc/source/ary/loc/loc_dir.cxx b/autodoc/source/ary/loc/loc_dir.cxx index a172cb9ecd76..855c08e48643 100644 --- a/autodoc/source/ary/loc/loc_dir.cxx +++ b/autodoc/source/ary/loc/loc_dir.cxx @@ -97,16 +97,6 @@ Directory::Add_File(const File & i_file) } Le_id -Directory::Search_Child(const String & i_name) const -{ - Le_id - ret = Search_Dir(i_name); - if (ret.IsValid()) - return ret; - return Search_File(i_name); -} - -Le_id Directory::Search_Dir(const String & i_name) const { return pChildren->aSubDirectories.Search(i_name); diff --git a/autodoc/source/ary/loc/loc_filebase.cxx b/autodoc/source/ary/loc/loc_filebase.cxx index f1afeeaf27c2..9e762f098386 100644 --- a/autodoc/source/ary/loc/loc_filebase.cxx +++ b/autodoc/source/ary/loc/loc_filebase.cxx @@ -41,18 +41,6 @@ namespace ary namespace loc { - -String -FileBase::Extension() const -{ - const char * - extension = strrchr(sLocalName.c_str(), '.'); - if (extension != 0) - return String(extension + 1); - return String::Null_(); -} - - FileBase::FileBase( const String & i_localName, Le_id i_parentDirectory ) : sLocalName(i_localName), diff --git a/autodoc/source/ary/loc/loc_traits.cxx b/autodoc/source/ary/loc/loc_traits.cxx index ca98cfe4e5a3..3b8e0340e8c7 100644 --- a/autodoc/source/ary/loc/loc_traits.cxx +++ b/autodoc/source/ary/loc/loc_traits.cxx @@ -53,15 +53,6 @@ Le_Traits::EntityOf_(id_type i_id) return Le_Storage::Instance_()[i_id]; } -Le_Traits::id_type -Le_Traits::IdOf_(const entity_base_type & i_entity) -{ - return i_entity.LeId(); -} - - - - //******************** LeNode_Traits ************************// symtree::Node<LeNode_Traits> * LeNode_Traits::NodeOf_(entity_base_type & io_entity) @@ -71,12 +62,6 @@ LeNode_Traits::NodeOf_(entity_base_type & io_entity) return 0; } -const String & -LeNode_Traits::LocalNameOf_(const entity_base_type & i_entity) -{ - return i_entity.LocalName(); -} - Le_Traits::entity_base_type * LeNode_Traits::ParentOf_(const entity_base_type & i_entity) { @@ -87,19 +72,6 @@ LeNode_Traits::ParentOf_(const entity_base_type & i_entity) return 0; } -template <class KEY> -Le_Traits::id_type -LeNode_Traits::Search_( const entity_base_type & i_entity, - const KEY & i_localKey ) -{ - if (is_type<Directory>(i_entity)) - return ary_cast<Directory>(i_entity).Search_Child(i_localKey); - return id_type(0); -} - - - - //******************** Le_Compare ************************// const Le_Compare::key_type & Le_Compare::KeyOf_(const entity_base_type & i_entity) 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); diff --git a/autodoc/source/exes/adc_uni/cmd_run.cxx b/autodoc/source/exes/adc_uni/cmd_run.cxx index 4ba9d42dde95..a346d0df7336 100644 --- a/autodoc/source/exes/adc_uni/cmd_run.cxx +++ b/autodoc/source/exes/adc_uni/cmd_run.cxx @@ -50,20 +50,6 @@ #include "adc_cmd_parse.hxx" #include "adc_cmds.hxx" - -namespace -{ -ary::idl::Gate * G_pGate = 0; - -ary::idl::Gate & -GetAryGate() -{ - csv_assert(G_pGate != 0); - return *G_pGate; -} -} // anonymous namespace - - namespace autodoc { namespace command diff --git a/autodoc/source/inc/tools/tkpchars.hxx b/autodoc/source/inc/tools/tkpchars.hxx index f6741eedd714..03cc774c4dbe 100644 --- a/autodoc/source/inc/tools/tkpchars.hxx +++ b/autodoc/source/inc/tools/tkpchars.hxx @@ -76,12 +76,6 @@ class CharacterSource **/ void LoadText( csv::bstream & io_rSource); - /** Loads the complete contents of in_rSource into the classes private memory. - If in_rSource is a file, it has to be open of course. - After loading the text, the CurChar() is set on the begin of the text. - **/ - void LoadText( - const char * i_sSourceText ); void InsertTextAtCurPos( const char * i_sText2Insert ); diff --git a/autodoc/source/parser/cpp/c_rcode.cxx b/autodoc/source/parser/cpp/c_rcode.cxx index 8b507b1f5690..e8f688168d3f 100644 --- a/autodoc/source/parser/cpp/c_rcode.cxx +++ b/autodoc/source/parser/cpp/c_rcode.cxx @@ -153,13 +153,6 @@ CodeExplorer::AcknowledgeResult() } // end switch(CurResult().eStackAction) } -ary::loc::Le_id -CodeExplorer::CurFile() const -{ - // KORR_FUTURE - return ary::loc::Le_id(0); -} - const Token & CodeExplorer::CurToken() const { diff --git a/autodoc/source/parser/cpp/c_rcode.hxx b/autodoc/source/parser/cpp/c_rcode.hxx index f180e83bf191..28a2785de917 100644 --- a/autodoc/source/parser/cpp/c_rcode.hxx +++ b/autodoc/source/parser/cpp/c_rcode.hxx @@ -73,8 +73,6 @@ class CodeExplorer : private TokenProcessing_Types void StartNewFile(); void Process_Token( DYN cpp::Token & let_drToken ); - ary::loc::Le_id CurFile() const; - // ACCESS FileScope_EventHandler & FileEventHandler() { return aGlobalParseContext; } diff --git a/autodoc/source/parser/cpp/cpp_pe.cxx b/autodoc/source/parser/cpp/cpp_pe.cxx index 49a8ce7d465c..858bea64612e 100644 --- a/autodoc/source/parser/cpp/cpp_pe.cxx +++ b/autodoc/source/parser/cpp/cpp_pe.cxx @@ -67,8 +67,6 @@ Cpp_PE::Cpp_PE( EnvData & i_rEnv ) void Cpp_PE::StdHandlingOfSyntaxError( const char * ) { -// GlobalHandlingOfSyntaxError(i_sText, Env().CurFileName(), Env().LineCount()); - SetTokenResult(not_done, pop_failure); } diff --git a/autodoc/source/parser/cpp/cx_c_sub.cxx b/autodoc/source/parser/cpp/cx_c_sub.cxx index 87b7a4139cc7..e45f121efb66 100644 --- a/autodoc/source/parser/cpp/cx_c_sub.cxx +++ b/autodoc/source/parser/cpp/cx_c_sub.cxx @@ -139,7 +139,7 @@ Context_ConstNumeric::ReadCharChain(CharacterSource & io_rText) do { do { cNext = static_cast<char>( tolower(io_rText.MoveOn()) ); - } while (cNext != 'e' AND isalnum(cNext) OR cNext == '.'); + } while ( (cNext != 'e' AND isalnum(cNext)) OR cNext == '.'); if (cNext == 'e') { cNext = io_rText.MoveOn(); diff --git a/autodoc/source/parser/cpp/pe_file.cxx b/autodoc/source/parser/cpp/pe_file.cxx index 32bd888e4487..af2924d8adeb 100644 --- a/autodoc/source/parser/cpp/pe_file.cxx +++ b/autodoc/source/parser/cpp/pe_file.cxx @@ -100,12 +100,6 @@ PE_File::Handle_ChildFailure() return &pSpuIgnoreFailure->Child(); } -ary::cpp::Gate & -PE_File::AryGate() const -{ - return const_cast< PE_File& >(*this).access_Env().AryGate(); -} - void PE_File::Setup_StatusFunctions() { diff --git a/autodoc/source/parser/cpp/pe_file.hxx b/autodoc/source/parser/cpp/pe_file.hxx index 120a1f49dce8..b24c2ee292cf 100644 --- a/autodoc/source/parser/cpp/pe_file.hxx +++ b/autodoc/source/parser/cpp/pe_file.hxx @@ -79,8 +79,6 @@ class PE_File : public Cpp_PE const cpp::Token & i_rTok ); virtual Cpp_PE * Handle_ChildFailure(); - ary::cpp::Gate & AryGate() const; - private: typedef SubPe< PE_File, PE_Namespace> SP_Namespace; typedef SubPe< PE_File, PE_Typedef> SP_Typedef; diff --git a/autodoc/source/parser/cpp/pe_param.cxx b/autodoc/source/parser/cpp/pe_param.cxx index 16eb50e4e078..9a5d88c2fa06 100644 --- a/autodoc/source/parser/cpp/pe_param.cxx +++ b/autodoc/source/parser/cpp/pe_param.cxx @@ -235,12 +235,6 @@ PE_Parameter::On_expectName_Comma(const char * i_sText) } void -PE_Parameter::On_expectName_Assign(const char * i_sText) -{ - On_afterName_Assign(i_sText); -} - -void PE_Parameter::On_afterName_ArrayBracket_Left(const char *) { pSpuVariable->Push(not_done); diff --git a/autodoc/source/parser/cpp/pe_param.hxx b/autodoc/source/parser/cpp/pe_param.hxx index 0deb16f84d1f..40a4bf85f714 100644 --- a/autodoc/source/parser/cpp/pe_param.hxx +++ b/autodoc/source/parser/cpp/pe_param.hxx @@ -97,7 +97,6 @@ class PE_Parameter : public Cpp_PE void On_expectName_ArrayBracket_Left(const char * i_sText); void On_expectName_Bracket_Right(const char * i_sText); void On_expectName_Comma(const char * i_sText); - void On_expectName_Assign(const char * i_sText); void On_afterName_ArrayBracket_Left(const char * i_sText); void On_afterName_Bracket_Right(const char * i_sText); diff --git a/autodoc/source/parser/inc/semantic/parseenv.hxx b/autodoc/source/parser/inc/semantic/parseenv.hxx index 4981ffce6d8e..a001a6f1f80c 100644 --- a/autodoc/source/parser/inc/semantic/parseenv.hxx +++ b/autodoc/source/parser/inc/semantic/parseenv.hxx @@ -74,11 +74,6 @@ class ParseEnvironment : protected TokenProcessing_Types ParseEnvironment( ParseEnvironment * i_pParent ); const SubPeUseIfc * CurSubPeUse() const; - void GlobalHandlingOfSyntaxError( - const char * i_sTokenText, - const char * i_sFileName, - uintt i_nLineCount ); - private: virtual void InitData() = 0; virtual void TransferData() = 0; diff --git a/autodoc/source/parser/inc/tokens/stmstarr.hxx b/autodoc/source/parser/inc/tokens/stmstarr.hxx index b70b131d1f7d..cf6586729e82 100644 --- a/autodoc/source/parser/inc/tokens/stmstarr.hxx +++ b/autodoc/source/parser/inc/tokens/stmstarr.hxx @@ -62,10 +62,6 @@ class StmArrayStatus : public StmStatus // ACCESS virtual StmArrayStatus * AsArray(); - void SetBranches( - intt in_nStartBranchIx, - StmStatus::Branch * in_aBranchValues, - intt in_nNrofValues ); bool SetBranch( intt in_nBranchIx, StmStatus::Branch in_nBranch ); diff --git a/autodoc/source/parser/inc/tokens/tkpstama.hxx b/autodoc/source/parser/inc/tokens/tkpstama.hxx index f1c2560a2062..79391154ff72 100644 --- a/autodoc/source/parser/inc/tokens/tkpstama.hxx +++ b/autodoc/source/parser/inc/tokens/tkpstama.hxx @@ -76,9 +76,6 @@ class StateMachine ~StateMachine(); - // FOR TESTS ONLY: - void PrintOut(); - // OPERATIONS StmBoundsStatus & GetCharChain( diff --git a/autodoc/source/parser/semantic/parseenv.cxx b/autodoc/source/parser/semantic/parseenv.cxx index 0407af29d822..5ba364086944 100644 --- a/autodoc/source/parser/semantic/parseenv.cxx +++ b/autodoc/source/parser/semantic/parseenv.cxx @@ -87,17 +87,3 @@ ParseEnvironment::ParseEnvironment( ParseEnvironment * i_pParent ) pCurSubPe(0) { } - -void -ParseEnvironment::GlobalHandlingOfSyntaxError( const char * i_sTokenText, - const char * i_sFileName, - uintt i_nLineCount ) -{ - throw X_Parser( X_Parser::x_UnexpectedToken, - i_sTokenText, - i_sFileName, - i_nLineCount ); -} - - - diff --git a/autodoc/source/parser/tokens/stmstarr.cxx b/autodoc/source/parser/tokens/stmstarr.cxx index 372c49f2f1e7..fe9444375e70 100644 --- a/autodoc/source/parser/tokens/stmstarr.cxx +++ b/autodoc/source/parser/tokens/stmstarr.cxx @@ -63,21 +63,6 @@ StmArrayStatus::~StmArrayStatus() delete [] dpBranches; } -void -StmArrayStatus::SetBranches( intt in_nStartBranchIx, - StmStatus::Branch * in_aBranchValues, - intt in_nNrofValues ) -{ - csv_assert(in_nStartBranchIx >= 0); - csv_assert(in_aBranchValues != 0); - csv_assert( in_nNrofValues > 0 - AND in_nStartBranchIx + in_nNrofValues <= nNrOfBranches ); - - memcpy(&dpBranches[in_nStartBranchIx],in_aBranchValues,in_nNrofValues); -} - - - bool StmArrayStatus::SetBranch( intt in_nBranchIx, StmStatus::Branch in_nBranch ) diff --git a/autodoc/source/parser/tokens/tkpstama.cxx b/autodoc/source/parser/tokens/tkpstama.cxx index 6410f7c28e10..8a141a16eb3f 100644 --- a/autodoc/source/parser/tokens/tkpstama.cxx +++ b/autodoc/source/parser/tokens/tkpstama.cxx @@ -178,34 +178,3 @@ StateMachine::Peek(intt in_nBranch) StmArrayStatus & rSt = CurrentStatus(); nPeekedStatus = rSt.NextBy(in_nBranch); } - -void -StateMachine::PrintOut() -{ - const intt anzahl = nNrofStati; - for (int i = 0; i < anzahl; i++) - { - Cout() << i << ':'; - StmArrayStatus * pArrSt = pStati[i]->AsArray(); - if (pArrSt != 0) - { - Cout() << Endl(); - for (int b = 0; b < 128; b++) - { - Cout().width(4); - Cout() << pArrSt->NextBy(b); - if (b%16 == 15) - Cout() << Endl(); - } - } - else if (pStati[i]->AsBounds() != 0) - { - Cout() << "Bounds "; - } - else - Cout() << "Error! "; - Cout() << (pStati[i]->IsADefault() ? "DEF" : "---") - << Endl(); - } // for -} - diff --git a/autodoc/source/parser_i/inc/tokens/stmstar2.hxx b/autodoc/source/parser_i/inc/tokens/stmstar2.hxx index 45dc87b55e46..a28d2cb37f28 100644 --- a/autodoc/source/parser_i/inc/tokens/stmstar2.hxx +++ b/autodoc/source/parser_i/inc/tokens/stmstar2.hxx @@ -59,11 +59,6 @@ class StmArrayStatu2 : public StmStatu2 // ACCESS virtual StmArrayStatu2 * AsArray(); - void SetBranches( - intt in_nStartBranchIx, - StmStatu2::Branch * - in_aBranchValues, - intt in_nNrofValues ); bool SetBranch( intt in_nBranchIx, StmStatu2::Branch diff --git a/autodoc/source/parser_i/inc/tokens/tkpstam2.hxx b/autodoc/source/parser_i/inc/tokens/tkpstam2.hxx index 639cc4888a59..293097edab7f 100644 --- a/autodoc/source/parser_i/inc/tokens/tkpstam2.hxx +++ b/autodoc/source/parser_i/inc/tokens/tkpstam2.hxx @@ -75,10 +75,6 @@ class StateMachin2 INT16 in_nBoundsStatus ); ~StateMachin2(); - - // FOR TESTS ONLY: - void PrintOut(); - // OPERATIONS StmBoundsStatu2 & GetCharChain( diff --git a/autodoc/source/parser_i/tokens/stmstar2.cxx b/autodoc/source/parser_i/tokens/stmstar2.cxx index ed3278670855..8d0fb2cb0460 100644 --- a/autodoc/source/parser_i/tokens/stmstar2.cxx +++ b/autodoc/source/parser_i/tokens/stmstar2.cxx @@ -66,21 +66,6 @@ StmArrayStatu2::~StmArrayStatu2() delete [] dpBranches; } -void -StmArrayStatu2::SetBranches( intt in_nStartBranchIx, - StmStatu2::Branch * in_aBranchValues, - intt in_nNrofValues ) -{ - csv_assert(in_nStartBranchIx >= 0); - csv_assert(in_aBranchValues != 0); - csv_assert( in_nNrofValues > 0 - AND in_nStartBranchIx + in_nNrofValues <= nNrOfBranches ); - - memcpy(&dpBranches[in_nStartBranchIx],in_aBranchValues,in_nNrofValues); -} - - - bool StmArrayStatu2::SetBranch( intt in_nBranchIx, StmStatu2::Branch in_nBranch ) diff --git a/autodoc/source/parser_i/tokens/tkpstam2.cxx b/autodoc/source/parser_i/tokens/tkpstam2.cxx index 1d979d586089..6a6d4a03b9c6 100644 --- a/autodoc/source/parser_i/tokens/tkpstam2.cxx +++ b/autodoc/source/parser_i/tokens/tkpstam2.cxx @@ -175,34 +175,3 @@ StateMachin2::Peek(intt in_nBranch) StmArrayStatu2 & rSt = CurrentStatus(); nPeekedStatus = rSt.NextBy(in_nBranch); } - -void -StateMachin2::PrintOut() -{ - const intt anzahl = nNrofStati; - for (int i = 0; i < anzahl; i++) - { - Cout() << i << ':'; - StmArrayStatu2 * pArrSt = pStati[i]->AsArray(); - if (pArrSt != 0) - { - Cout() << Endl(); - for (int b = 0; b < 128; b++) - { - Cout().width(4); - Cout() << pArrSt->NextBy(b); - if (b%16 == 15) - Cout() << Endl(); - } - } - else if (pStati[i]->AsBounds() != 0) - { - Cout() << "Bounds "; - } - else - Cout() << "Error! "; - Cout() << (pStati[i]->IsADefault() ? "DEF" : "---") - << Endl(); - } // for -} - diff --git a/autodoc/source/tools/tkpchars.cxx b/autodoc/source/tools/tkpchars.cxx index f014aab3fa27..eb820e2d75b6 100644 --- a/autodoc/source/tools/tkpchars.cxx +++ b/autodoc/source/tools/tkpchars.cxx @@ -75,20 +75,6 @@ CharacterSource::LoadText(csv::bstream & io_rSource) BeginSource(); } -void -CharacterSource::LoadText( const char * i_sSourceText ) -{ - if (dpSource != 0) - delete [] dpSource; - - nSourceSize = strlen(i_sSourceText); - - dpSource = new char[nSourceSize+1]; - strcpy( dpSource, i_sSourceText); // SAFE STRCPY (#100211# - checked) - - BeginSource(); -} - /// KORR_FUTURE: So far, this works only when tokens do not cross inserted text boundaries. void CharacterSource::InsertTextAtCurPos( const char * i_sText2Insert ) |