diff options
| author | Jens-Heiner Rechtien <hr@openoffice.org> | 2007-11-02 16:05:26 +0000 |
|---|---|---|
| committer | Jens-Heiner Rechtien <hr@openoffice.org> | 2007-11-02 16:05:26 +0000 |
| commit | 9fc84c0867d8868357348af698b0d0577fab1f5b (patch) | |
| tree | 6cd90aeef7e850ccc4aaa322333d0c327759b3fd /autodoc | |
| parent | 2e1af391f9fe3e184eddb790fd7aca79b5f4f4ce (diff) | |
INTEGRATION: CWS adc18 (1.12.2); FILE MERGED
2007/10/19 13:03:22 np 1.12.2.3: #i81775#
2007/10/19 11:50:49 np 1.12.2.2: #i81775#
2007/10/18 15:23:20 np 1.12.2.1: #i81775#
Diffstat (limited to 'autodoc')
| -rw-r--r-- | autodoc/source/parser_i/idl/parsenv2.cxx | 23 |
1 files changed, 13 insertions, 10 deletions
diff --git a/autodoc/source/parser_i/idl/parsenv2.cxx b/autodoc/source/parser_i/idl/parsenv2.cxx index e222e86b8cba..c052ca6503a5 100644 --- a/autodoc/source/parser_i/idl/parsenv2.cxx +++ b/autodoc/source/parser_i/idl/parsenv2.cxx @@ -4,9 +4,9 @@ * * $RCSfile: parsenv2.cxx,v $ * - * $Revision: 1.12 $ + * $Revision: 1.13 $ * - * last change: $Author: vg $ $Date: 2007-09-18 14:19:04 $ + * last change: $Author: hr $ $Date: 2007-11-02 17:05:26 $ * * The Contents of this file are made available subject to * the terms of GNU Lesser General Public License Version 2.1. @@ -39,11 +39,14 @@ // NOT FULLY DEFINED SERVICES #include <ary/ary.hxx> +#include <ary/getncast.hxx> #include <ary/qualiname.hxx> -#include <ary_i/codeinf2.hxx> +#include <ary/doc/d_oldidldocu.hxx> #include <ary/idl/i_gate.hxx> #include <ary/idl/i_ce.hxx> +#include <ary/idl/i_enum.hxx> #include <ary/idl/i_enumvalue.hxx> +#include <ary/idl/i_module.hxx> #include <ary/idl/ip_ce.hxx> #include <parser/parserinfo.hxx> #include <adc_msg.hxx> @@ -65,7 +68,7 @@ UnoIDL_PE::~UnoIDL_PE() void UnoIDL_PE::EstablishContacts( UnoIDL_PE * io_pParentPE, - ary::n22::Repository & io_rRepository, + ary::Repository & io_rRepository, TokenProcessing_Result & o_rResult ) { pRepository = &io_rRepository; @@ -124,7 +127,7 @@ UnoIDL_PE::Leave( E_EnvStackAction i_eWayOfLeaving ) } void -UnoIDL_PE::SetDocu( DYN ary::info::CodeInformation * let_dpDocu ) +UnoIDL_PE::SetDocu( DYN ary::doc::OldIdlDocu * let_dpDocu ) { pDocu = let_dpDocu; } @@ -134,7 +137,7 @@ UnoIDL_PE::SetPublished() { if (NOT pDocu) { - pDocu = new ary::info::CodeInformation; + pDocu = new ary::doc::OldIdlDocu; } pDocu->SetPublished(); } @@ -144,7 +147,7 @@ UnoIDL_PE::SetOptional() { if (NOT pDocu) { - pDocu = new ary::info::CodeInformation; + pDocu = new ary::doc::OldIdlDocu; } pDocu->SetOptional(); } @@ -154,13 +157,13 @@ UnoIDL_PE::PassDocuAt( ary::idl::CodeEntity & io_rCe ) { if (pDocu) { - io_rCe.Set_Docu(pDocu.Release()); + io_rCe.Set_Docu(*pDocu.Release()); } else if // KORR_FUTURE // Re-enable doc-warning for Enum Values, as soon as there is a // @option -no-doc-for-enumvalues. - ( io_rCe.ClassId() != ary::idl::Module::class_id - AND io_rCe.ClassId() != ary::idl::EnumValue::class_id ) + ( NOT ary::is_type<ary::idl::Module>(io_rCe) + AND NOT ary::is_type<ary::idl::Enum>(io_rCe) ) { TheMessages().Out_MissingDoc( io_rCe.LocalName(), |