diff options
author | Jens-Heiner Rechtien <hr@openoffice.org> | 2007-11-02 14:10:19 +0000 |
---|---|---|
committer | Jens-Heiner Rechtien <hr@openoffice.org> | 2007-11-02 14:10:19 +0000 |
commit | 2e9c59953338d4f87c1799bd82916301ca471a3a (patch) | |
tree | a22b28b242c1bfc3503ddd4500e0696581481c93 | |
parent | 478e935351781384c1aae286892c09ebbf4e4c01 (diff) |
INTEGRATION: CWS adc18 (1.2.56); FILE MERGED
2007/10/18 13:06:36 np 1.2.56.1: #i81775#
-rw-r--r-- | autodoc/inc/ary/idl/i_ce.hxx | 59 | ||||
-rw-r--r-- | autodoc/inc/ary/idl/i_constgroup.hxx | 41 | ||||
-rw-r--r-- | autodoc/inc/ary/idl/i_enum.hxx | 41 | ||||
-rw-r--r-- | autodoc/inc/ary/idl/i_exception.hxx | 39 | ||||
-rw-r--r-- | autodoc/inc/ary/idl/i_module.hxx | 51 | ||||
-rw-r--r-- | autodoc/inc/ary/idl/i_param.hxx | 25 | ||||
-rw-r--r-- | autodoc/inc/ary/idl/i_singleton.hxx | 37 |
7 files changed, 119 insertions, 174 deletions
diff --git a/autodoc/inc/ary/idl/i_ce.hxx b/autodoc/inc/ary/idl/i_ce.hxx index 89fe3f415f0e..96fb37c3a04b 100644 --- a/autodoc/inc/ary/idl/i_ce.hxx +++ b/autodoc/inc/ary/idl/i_ce.hxx @@ -4,9 +4,9 @@ * * $RCSfile: i_ce.hxx,v $ * - * $Revision: 1.2 $ + * $Revision: 1.3 $ * - * last change: $Author: rt $ $Date: 2005-09-07 16:06:16 $ + * last change: $Author: hr $ $Date: 2007-11-02 15:05:28 $ * * The Contents of this file are made available subject to * the terms of GNU Lesser General Public License Version 2.1. @@ -36,29 +36,23 @@ #ifndef ARY_IDL_I_CE_HXX #define ARY_IDL_I_CE_HXX - +// BASE CLASSES +#include <ary/entity.hxx> // USED SERVICES - // BASE CLASSES -#include <ary/re.hxx> - // COMPONENTS +#include <ary/doc/d_docu.hxx> #include <ary/idl/i_ce2s.hxx> - // PARAMETERS -#include <ary/idl/i_language.hxx> +#include <ary/idl/i_types4idl.hxx> + -namespace ary -{ -namespace info -{ - class CodeInformation; -} + +namespace ary +{ namespace idl { -class CeHost; - /** @resp Base class for all IDL code entities. @@ -69,7 +63,7 @@ class CeHost; This is a storage base class, where more special classes are derived from. */ -class CodeEntity : public n22::RepositoryEntity +class CodeEntity : public ary::Entity { public: // LIFECYCLE @@ -84,7 +78,7 @@ class CodeEntity : public n22::RepositoryEntity Ce_id Owner() const; E_SightLevel SightLevel() const; - const ary::info::CodeInformation * + const ary::doc::Documentation & Docu() const; const Ce_2s & Secondaries() const; @@ -92,32 +86,29 @@ class CodeEntity : public n22::RepositoryEntity Null_(); // ACCESS void Set_Docu( - DYN ary::info::CodeInformation * - pass_dpDocu ); + DYN ary::doc::Node & + pass_data ); Ce_2s & Secondaries(); protected: CodeEntity(); private: - // Interface RepositoryEntity: - virtual void do_Visit(::ary::Host & o_rHost) const; - // Locals - virtual void do_Visit_CeHost(CeHost & o_rHost) const = 0; virtual const String & inq_LocalName() const = 0; virtual Ce_id inq_NameRoom() const = 0; virtual Ce_id inq_Owner() const = 0; virtual E_SightLevel inq_SightLevel() const = 0; // DATA - Dyn<ary::info::CodeInformation> - pDocu; + ary::doc::Documentation + aDocu; Dyn<Ce_2s> p2s; }; -// IMPLEMENTATION + +// IMPLEMENTATION inline const String & CodeEntity::LocalName() const { return inq_LocalName(); } @@ -134,13 +125,19 @@ inline E_SightLevel CodeEntity::SightLevel() const { return inq_SightLevel(); } -inline const ary::info::CodeInformation * +inline const ary::doc::Documentation & CodeEntity::Docu() const - { return pDocu ? pDocu.Ptr() : 0; } + { return aDocu; } + +inline void +CodeEntity::Set_Docu(DYN ary::doc::Node & pass_data) +{ + aDocu.Set_Data(pass_data); +} -} // namespace idl -} // namespace ary +} // namespace idl +} // namespace ary #endif diff --git a/autodoc/inc/ary/idl/i_constgroup.hxx b/autodoc/inc/ary/idl/i_constgroup.hxx index 026c33066b94..923457683fe2 100644 --- a/autodoc/inc/ary/idl/i_constgroup.hxx +++ b/autodoc/inc/ary/idl/i_constgroup.hxx @@ -4,9 +4,9 @@ * * $RCSfile: i_constgroup.hxx,v $ * - * $Revision: 1.2 $ + * $Revision: 1.3 $ * - * last change: $Author: rt $ $Date: 2005-09-07 16:07:31 $ + * last change: $Author: hr $ $Date: 2007-11-02 15:06:38 $ * * The Contents of this file are made available subject to * the terms of GNU Lesser General Public License Version 2.1. @@ -36,32 +36,23 @@ #ifndef ARY_IDL_I_CONSTGROUP_HXX #define ARY_IDL_I_CONSTGROUP_HXX +// BASE CLASSES +#include <ary/idl/i_ce.hxx> -// USED SERVICES - // BASE CLASSES -#include <ary/idl/i_ce.hxx> - // COMPONENTS - // PARAMETERS namespace ary { namespace idl { - namespace ifc_constgroup { struct attr; } - -/* OPEN? -*/ - -/** @resp - Represents an IDL constants group. +/** Represents an IDL constants group. */ class ConstantsGroup : public CodeEntity { @@ -73,18 +64,17 @@ class ConstantsGroup : public CodeEntity const String & i_sName, Ce_id i_nModule ); ~ConstantsGroup(); - // OPERATIONS - // ACCESS void Add_Constant( Ce_id i_nConstant ); - private: - // Interface ary::RepositoryEntity - virtual RCid inq_ClassId() const; + // Interface csv::ConstProcessorClient: + virtual void do_Accept( + csv::ProcessorIfc & io_processor ) const; + // Interface ary::Object + virtual ClassId get_AryClass() const; // Interface CodeEntity - virtual void do_Visit_CeHost(CeHost & o_rHost) const; virtual const String & inq_LocalName() const; virtual Ce_id inq_NameRoom() const; virtual Ce_id inq_Owner() const; @@ -103,16 +93,17 @@ class ConstantsGroup : public CodeEntity -// IMPLEMENTATION +// IMPLEMENTATION inline void ConstantsGroup::Add_Constant( Ce_id i_nConstant ) - { aConstants.push_back(i_nConstant); } +{ + aConstants.push_back(i_nConstant); +} -} // namespace idl -} // namespace ary +} // namespace idl +} // namespace ary #endif - diff --git a/autodoc/inc/ary/idl/i_enum.hxx b/autodoc/inc/ary/idl/i_enum.hxx index a0870a0d80c4..6b4dad5d26e3 100644 --- a/autodoc/inc/ary/idl/i_enum.hxx +++ b/autodoc/inc/ary/idl/i_enum.hxx @@ -4,9 +4,9 @@ * * $RCSfile: i_enum.hxx,v $ * - * $Revision: 1.2 $ + * $Revision: 1.3 $ * - * last change: $Author: rt $ $Date: 2005-09-07 16:07:47 $ + * last change: $Author: hr $ $Date: 2007-11-02 15:06:53 $ * * The Contents of this file are made available subject to * the terms of GNU Lesser General Public License Version 2.1. @@ -36,34 +36,23 @@ #ifndef ARY_IDL_I_ENUM_HXX #define ARY_IDL_I_ENUM_HXX +// BASE CLASSES +#include <ary/idl/i_ce.hxx> -// USED SERVICES - // BASE CLASSES -#include <ary/idl/i_ce.hxx> - // COMPONENTS - // PARAMETERS - namespace ary { namespace idl { - - namespace ifc_enum { struct attr; } - -/* OPEN? -*/ - -/** @resp - Represents an IDL enum. +/** Represents an IDL enum. */ class Enum : public CodeEntity { @@ -78,11 +67,13 @@ class Enum : public CodeEntity void Add_Value( Ce_id i_nValue ); private: - // Interface ary::RepositoryEntity - virtual RCid inq_ClassId() const; + // Interface csv::ConstProcessorClient: + virtual void do_Accept( + csv::ProcessorIfc & io_processor ) const; + // Interface ary::Object + virtual ClassId get_AryClass() const; // Interface CodeEntity - virtual void do_Visit_CeHost(CeHost & o_rHost) const; virtual const String & inq_LocalName() const; virtual Ce_id inq_NameRoom() const; virtual Ce_id inq_Owner() const; @@ -101,17 +92,17 @@ class Enum : public CodeEntity -// IMPLEMENTATION - +// IMPLEMENTATION inline void Enum::Add_Value( Ce_id i_nValue ) - { aValues.push_back(i_nValue); } +{ + aValues.push_back(i_nValue); +} -} // namespace idl -} // namespace ary +} // namespace idl +} // namespace ary #endif - diff --git a/autodoc/inc/ary/idl/i_exception.hxx b/autodoc/inc/ary/idl/i_exception.hxx index 2031c7933a10..4caeefe3e9c2 100644 --- a/autodoc/inc/ary/idl/i_exception.hxx +++ b/autodoc/inc/ary/idl/i_exception.hxx @@ -4,9 +4,9 @@ * * $RCSfile: i_exception.hxx,v $ * - * $Revision: 1.2 $ + * $Revision: 1.3 $ * - * last change: $Author: rt $ $Date: 2005-09-07 16:08:29 $ + * last change: $Author: hr $ $Date: 2007-11-02 15:07:22 $ * * The Contents of this file are made available subject to * the terms of GNU Lesser General Public License Version 2.1. @@ -36,31 +36,23 @@ #ifndef ARY_IDL_I_EXCEPTION_HXX #define ARY_IDL_I_EXCEPTION_HXX +// BASE CLASSES +#include <ary/idl/i_ce.hxx> -// USED SERVICES - // BASE CLASSES -#include <ary/idl/i_ce.hxx> - // COMPONENTS - // PARAMETERS namespace ary { namespace idl { - namespace ifc_exception { struct attr; } -/* OPEN? -*/ - -/** @resp - Represents an IDL exception. +/** Represents an IDL exception. */ class Exception : public CodeEntity { @@ -81,11 +73,13 @@ class Exception : public CodeEntity Ce_id i_nMember ); private: - // Interface ary::RepositoryEntity - virtual RCid inq_ClassId() const; + // Interface csv::ConstProcessorClient: + virtual void do_Accept( + csv::ProcessorIfc & io_processor ) const; + // Interface ary::Object: + virtual ClassId get_AryClass() const; // Interface CodeEntity - virtual void do_Visit_CeHost(CeHost & o_rHost) const; virtual const String & inq_LocalName() const; virtual Ce_id inq_NameRoom() const; virtual Ce_id inq_Owner() const; @@ -105,18 +99,17 @@ class Exception : public CodeEntity -// IMPLEMENTATION - +// IMPLEMENTATION inline void Exception::Add_Member( Ce_id i_nMember ) - { aElements.push_back(i_nMember); } +{ + aElements.push_back(i_nMember); +} -} // namespace idl -} // namespace ary +} // namespace idl +} // namespace ary #endif - - diff --git a/autodoc/inc/ary/idl/i_module.hxx b/autodoc/inc/ary/idl/i_module.hxx index fa325e4eed1b..117fe67acf5f 100644 --- a/autodoc/inc/ary/idl/i_module.hxx +++ b/autodoc/inc/ary/idl/i_module.hxx @@ -4,9 +4,9 @@ * * $RCSfile: i_module.hxx,v $ * - * $Revision: 1.2 $ + * $Revision: 1.3 $ * - * last change: $Author: rt $ $Date: 2005-09-07 16:10:01 $ + * last change: $Author: hr $ $Date: 2007-11-02 15:08:46 $ * * The Contents of this file are made available subject to * the terms of GNU Lesser General Public License Version 2.1. @@ -36,39 +36,29 @@ #ifndef ARY_IDL_I_MODULE_HXX #define ARY_IDL_I_MODULE_HXX +// BASE CLASSES +#include <ary/idl/i_ce.hxx> // USED SERVICES - // BASE CLASSES -#include <ary/idl/i_ce.hxx> - // COMPONENTS - // PARAMETERS #include <ary/stdconstiter.hxx> -namespace ary -{ -template <class> class NameTreeNode; +namespace ary +{ + template <class> class NameTreeNode; namespace idl { - namespace ifc_module { struct attr; } + class Gate; -class Gate; - - -/* OPEN? -*/ - -/** @resp - Represents an IDL module. - @descr +/** Represents an IDL module. "Name" in methods means all code entities which belong into this namespace (not in a subnamespace of this one), but not @@ -92,23 +82,21 @@ 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; -// void Get_FullName( -// StringVector & o_rText, -// Ce_idList * o_pRelatedCes, -// const Gate & i_rGate ) const; - Ce_id Search_Name( const String & i_sName ) const; void Get_Names( Dyn_StdConstIterator<Ce_id> & o_rResult ) const; private: - // Interface ary::RepositoryEntity - virtual RCid inq_ClassId() const; + // Interface csv::ConstProcessorClient: + virtual void do_Accept( + csv::ProcessorIfc & io_processor ) const; + // Interface ary::Object: + virtual ClassId get_AryClass() const; // Interface CodeEntity - virtual void do_Visit_CeHost(CeHost & o_rHost) const; virtual const String & inq_LocalName() const; virtual Ce_id inq_NameRoom() const; virtual Ce_id inq_Owner() const; @@ -121,17 +109,16 @@ class Module : public CodeEntity pImpl; }; + inline bool is_Module( const CodeEntity & i_rCe ) - { return i_rCe.ClassId() == Module::class_id; } +{ + return i_rCe.AryClass() == Module::class_id; +} -// IMPLEMENTATION } // namespace idl } // namespace ary - - #endif - diff --git a/autodoc/inc/ary/idl/i_param.hxx b/autodoc/inc/ary/idl/i_param.hxx index 2d3d1b804c87..cb9ba10d5163 100644 --- a/autodoc/inc/ary/idl/i_param.hxx +++ b/autodoc/inc/ary/idl/i_param.hxx @@ -4,9 +4,9 @@ * * $RCSfile: i_param.hxx,v $ * - * $Revision: 1.2 $ + * $Revision: 1.3 $ * - * last change: $Author: rt $ $Date: 2005-09-07 16:10:44 $ + * last change: $Author: hr $ $Date: 2007-11-02 15:09:21 $ * * The Contents of this file are made available subject to * the terms of GNU Lesser General Public License Version 2.1. @@ -36,11 +36,9 @@ #ifndef ARY_IDL_I_PARAM_HXX #define ARY_IDL_I_PARAM_HXX -// USED SERVICES - // BASE CLASSES -#include <ary/idl/i_language.hxx> - // COMPONENTS - // PARAMETERS +// BASE CLASSES +#include <ary/idl/i_types4idl.hxx> + @@ -50,12 +48,7 @@ namespace idl { - -/* OPEN? -*/ - -/** @resp - Represents an IDL module. +/** Represents a parameter in an IDL function. */ class Parameter { @@ -85,13 +78,7 @@ class Parameter -// IMPLEMENTATION - } // namespace idl } // namespace ary - - - #endif - diff --git a/autodoc/inc/ary/idl/i_singleton.hxx b/autodoc/inc/ary/idl/i_singleton.hxx index db434183bae5..1f4e52950b02 100644 --- a/autodoc/inc/ary/idl/i_singleton.hxx +++ b/autodoc/inc/ary/idl/i_singleton.hxx @@ -4,9 +4,9 @@ * * $RCSfile: i_singleton.hxx,v $ * - * $Revision: 1.2 $ + * $Revision: 1.3 $ * - * last change: $Author: rt $ $Date: 2005-09-07 16:11:33 $ + * last change: $Author: hr $ $Date: 2007-11-02 15:10:19 $ * * The Contents of this file are made available subject to * the terms of GNU Lesser General Public License Version 2.1. @@ -36,13 +36,11 @@ #ifndef ARY_IDL_I_SINGLETON_HXX #define ARY_IDL_I_SINGLETON_HXX +// BASE CLASSES +#include <ary/idl/i_ce.hxx> + -// USED SERVICES - // BASE CLASSES -#include <ary/idl/i_ce.hxx> - // COMPONENTS - // PARAMETERS namespace ary { @@ -54,11 +52,7 @@ namespace ifc_singleton } -/* OPEN? -*/ - -/** @resp - Represents an IDL singleton. +/** Represents an IDL singleton. */ class Singleton : public CodeEntity { @@ -78,11 +72,13 @@ class Singleton : public CodeEntity void Set_Service( Type_id i_nService ); private: - // Interface ary::RepositoryEntity - virtual RCid inq_ClassId() const; + // Interface csv::ConstProcessorClient: + virtual void do_Accept( + csv::ProcessorIfc & io_processor ) const; + // Interface ary::Object: + virtual ClassId get_AryClass() const; // Interface CodeEntity - virtual void do_Visit_CeHost(CeHost & o_rHost) const; virtual const String & inq_LocalName() const; virtual Ce_id inq_NameRoom() const; virtual Ce_id inq_Owner() const; @@ -100,15 +96,18 @@ class Singleton : public CodeEntity -// IMPLEMENTATION +// IMPLEMENTATION inline void Singleton::Set_Service( Type_id i_nService ) - { nService = i_nService; } +{ + nService = i_nService; +} -} // namespace idl -} // namespace ary + +} // namespace idl +} // namespace ary #endif |