diff options
| author | Jens-Heiner Rechtien <hr@openoffice.org> | 2007-11-02 14:36:09 +0000 |
|---|---|---|
| committer | Jens-Heiner Rechtien <hr@openoffice.org> | 2007-11-02 14:36:09 +0000 |
| commit | 4a18ccbce45bddc711594ef1edab9b25967ef18a (patch) | |
| tree | 4757ff89971be7cbac0c00698aa3045be85fe119 /autodoc/source/ary/cpp | |
| parent | 165506b66cc148e8da549cfc7c0ee5ea6ae3ef79 (diff) | |
INTEGRATION: CWS adc18 (1.2.56); FILE MERGED
2007/10/18 13:27:01 np 1.2.56.1: #i81775#
Diffstat (limited to 'autodoc/source/ary/cpp')
| -rw-r--r-- | autodoc/source/ary/cpp/makefile.mk | 51 | ||||
| -rw-r--r-- | autodoc/source/ary/cpp/tplparam.hxx | 31 |
2 files changed, 39 insertions, 43 deletions
diff --git a/autodoc/source/ary/cpp/makefile.mk b/autodoc/source/ary/cpp/makefile.mk index 5922e5f9f3c7..a08230ad6963 100644 --- a/autodoc/source/ary/cpp/makefile.mk +++ b/autodoc/source/ary/cpp/makefile.mk @@ -4,9 +4,9 @@ # # $RCSfile: makefile.mk,v $ # -# $Revision: 1.2 $ +# $Revision: 1.3 $ # -# last change: $Author: rt $ $Date: 2005-09-07 16:37:08 $ +# last change: $Author: hr $ $Date: 2007-11-02 15:33:52 $ # # The Contents of this file are made available subject to # the terms of GNU Lesser General Public License Version 2.1. @@ -53,34 +53,33 @@ PRJINC=$(PRJ)$/source OBJFILES= \ - $(OBJ)$/c_class.obj \ - $(OBJ)$/c_define.obj \ - $(OBJ)$/c_enum.obj \ - $(OBJ)$/c_enuval.obj \ - $(OBJ)$/c_funct.obj \ - $(OBJ)$/c_gate.obj \ - $(OBJ)$/c_macro.obj \ - $(OBJ)$/c_namesp.obj \ - $(OBJ)$/c_osigna.obj \ - $(OBJ)$/c_slots.obj \ - $(OBJ)$/c_tydef.obj \ - $(OBJ)$/c_vari.obj \ - $(OBJ)$/ca_type.obj \ - $(OBJ)$/cdf_gate.obj \ - $(OBJ)$/cg_file.obj \ - $(OBJ)$/cg_gate.obj \ - $(OBJ)$/cg_proj.obj \ - $(OBJ)$/cpp_defs.obj \ - $(OBJ)$/cpp_disp.obj \ - $(OBJ)$/namechai.obj \ - $(OBJ)$/predecla.obj \ - $(OBJ)$/prpr.obj \ - $(OBJ)$/tplparam.obj \ + $(OBJ)$/c_builtintype.obj \ + $(OBJ)$/c_class.obj \ + $(OBJ)$/c_de.obj \ + $(OBJ)$/c_define.obj \ + $(OBJ)$/c_enum.obj \ + $(OBJ)$/c_enuval.obj \ + $(OBJ)$/c_funct.obj \ + $(OBJ)$/c_macro.obj \ + $(OBJ)$/c_namesp.obj \ + $(OBJ)$/c_osigna.obj \ + $(OBJ)$/c_reposypart.obj \ + $(OBJ)$/c_slots.obj \ + $(OBJ)$/c_traits.obj \ + $(OBJ)$/c_tydef.obj \ + $(OBJ)$/c_vari.obj \ + $(OBJ)$/ca_ce.obj \ + $(OBJ)$/ca_def.obj \ + $(OBJ)$/ca_type.obj \ + $(OBJ)$/cs_ce.obj \ + $(OBJ)$/cs_def.obj \ + $(OBJ)$/cs_type.obj \ + $(OBJ)$/namechain.obj \ + $(OBJ)$/tplparam.obj \ $(OBJ)$/usedtype.obj - # --- Targets ------------------------------------------------------ .INCLUDE : target.mk diff --git a/autodoc/source/ary/cpp/tplparam.hxx b/autodoc/source/ary/cpp/tplparam.hxx index 30c7f019d512..47cfae2cef2b 100644 --- a/autodoc/source/ary/cpp/tplparam.hxx +++ b/autodoc/source/ary/cpp/tplparam.hxx @@ -4,9 +4,9 @@ * * $RCSfile: tplparam.hxx,v $ * - * $Revision: 1.2 $ + * $Revision: 1.3 $ * - * last change: $Author: rt $ $Date: 2005-09-07 16:39:18 $ + * last change: $Author: hr $ $Date: 2007-11-02 15:36:09 $ * * The Contents of this file are made available subject to * the terms of GNU Lesser General Public License Version 2.1. @@ -36,12 +36,9 @@ #ifndef ARY_CPP_TPLPARAM_HXX #define ARY_CPP_TPLPARAM_HXX - // USED SERVICES - // BASE CLASSES - // COMPONENTS - // PARAMETERS -#include <ary/ids.hxx> +#include <ary/cpp/c_types4cpp.hxx> + @@ -50,11 +47,12 @@ namespace ary namespace cpp { class UsedType; - class DisplayGate; + class Gate; namespace ut { + class TemplateParameter { public: @@ -65,7 +63,7 @@ class TemplateParameter i_rOther ) const = 0; virtual void Get_Text( StreamStr & o_rOut, - const ary::cpp::DisplayGate & + const ary::cpp::Gate & i_rGate ) const = 0; }; @@ -82,7 +80,7 @@ class TplParameter_Type : public TemplateParameter i_rOther ) const; virtual void Get_Text( StreamStr & o_rOut, - const ary::cpp::DisplayGate & + const ary::cpp::Gate & i_rGate ) const; private: Tid nType; @@ -92,7 +90,7 @@ class TplParameter_Const : public TemplateParameter { public: TplParameter_Const( - const udmstri & i_sConst ); + const String & i_sConst ); ~TplParameter_Const(); virtual intt Compare( @@ -100,17 +98,16 @@ class TplParameter_Const : public TemplateParameter i_rOther ) const; virtual void Get_Text( StreamStr & o_rOut, - const ary::cpp::DisplayGate & + const ary::cpp::Gate & i_rGate ) const; private: - udmstri sConstant; + String sConstant; }; -} // namespace ut -} // namespace cpp -} // namespace ary +} // namespace ut +} // namespace cpp +} // namespace ary #endif - |