diff options
| author | Jens-Heiner Rechtien <hr@openoffice.org> | 2007-11-02 16:12:26 +0000 |
|---|---|---|
| committer | Jens-Heiner Rechtien <hr@openoffice.org> | 2007-11-02 16:12:26 +0000 |
| commit | 2a603f288faf72ffaab266aebcbb356cf47cefc9 (patch) | |
| tree | f27fea2091988b10cb9bac6c85250e01c1d19771 /autodoc | |
| parent | 81071b3715c6eeebb31a848e5e8ca00e203248a0 (diff) | |
INTEGRATION: CWS adc18 (1.7.2); FILE MERGED
2007/10/18 15:23:21 np 1.7.2.1: #i81775#
Diffstat (limited to 'autodoc')
| -rw-r--r-- | autodoc/source/parser_i/idl/semnode.cxx | 6 | ||||
| -rw-r--r-- | autodoc/source/parser_i/inc/s2_dsapi/docu_pe2.hxx | 42 |
2 files changed, 26 insertions, 22 deletions
diff --git a/autodoc/source/parser_i/idl/semnode.cxx b/autodoc/source/parser_i/idl/semnode.cxx index bf2447411242..941564861de9 100644 --- a/autodoc/source/parser_i/idl/semnode.cxx +++ b/autodoc/source/parser_i/idl/semnode.cxx @@ -4,9 +4,9 @@ * * $RCSfile: semnode.cxx,v $ * - * $Revision: 1.7 $ + * $Revision: 1.8 $ * - * last change: $Author: vg $ $Date: 2007-09-18 14:23:22 $ + * last change: $Author: hr $ $Date: 2007-11-02 17:10:35 $ * * The Contents of this file are made available subject to * the terms of GNU Lesser General Public License Version 2.1. @@ -41,7 +41,7 @@ #include <ary/ary.hxx> #include <ary/idl/i_gate.hxx> #include <ary/idl/i_module.hxx> -#include <ary_i/codeinf2.hxx> +#include <ary/doc/d_oldidldocu.hxx> #include <s2_luidl/parsenv2.hxx> diff --git a/autodoc/source/parser_i/inc/s2_dsapi/docu_pe2.hxx b/autodoc/source/parser_i/inc/s2_dsapi/docu_pe2.hxx index f8db5e9a5eb6..a0781dd41f1f 100644 --- a/autodoc/source/parser_i/inc/s2_dsapi/docu_pe2.hxx +++ b/autodoc/source/parser_i/inc/s2_dsapi/docu_pe2.hxx @@ -4,9 +4,9 @@ * * $RCSfile: docu_pe2.hxx,v $ * - * $Revision: 1.7 $ + * $Revision: 1.8 $ * - * last change: $Author: vg $ $Date: 2007-09-18 14:26:32 $ + * last change: $Author: hr $ $Date: 2007-11-02 17:12:26 $ * * The Contents of this file are made available subject to * the terms of GNU Lesser General Public License Version 2.1. @@ -48,10 +48,14 @@ class ParserInfo; namespace ary { -namespace info +namespace doc { -class CodeInformation; -class DocuToken; + class OldIdlDocu; +} + +namespace inf +{ + class DocuToken; } // namespace info } // namespace ary @@ -104,7 +108,7 @@ class SapiDocu_PE : public TokenInterpreter virtual void Process_White(); - DYN ary::info::CodeInformation * + DYN ary::doc::OldIdlDocu * ReleaseJustParsedDocu(); bool IsComplete() const; @@ -119,44 +123,44 @@ class SapiDocu_PE : public TokenInterpreter st_complete }; - typedef void ( SapiDocu_PE::*F_TokenAdder )( DYN ary::info::DocuToken & let_drNewToken ); + typedef void ( SapiDocu_PE::*F_TokenAdder )( DYN ary::inf::DocuToken & let_drNewToken ); void AddDocuToken2Void( - DYN ary::info::DocuToken & + DYN ary::inf::DocuToken & let_drNewToken ); void AddDocuToken2Short( - DYN ary::info::DocuToken & + DYN ary::inf::DocuToken & let_drNewToken ); void AddDocuToken2Description( - DYN ary::info::DocuToken & + DYN ary::inf::DocuToken & let_drNewToken ); void AddDocuToken2Deprecated( - DYN ary::info::DocuToken & + DYN ary::inf::DocuToken & let_drNewToken ); void AddDocuToken2CurAtTag( - DYN ary::info::DocuToken & + DYN ary::inf::DocuToken & let_drNewToken ); void SetCurParameterAtTagName( - DYN ary::info::DocuToken & + DYN ary::inf::DocuToken & let_drNewToken ); void SetCurSeeAlsoAtTagLinkText( - DYN ary::info::DocuToken & + DYN ary::inf::DocuToken & let_drNewToken ); void SetCurSeeAlsoAtTagLinkText_2( - DYN ary::info::DocuToken & + DYN ary::inf::DocuToken & let_drNewToken ); void SetCurSeeAlsoAtTagLinkText_3( - DYN ary::info::DocuToken & + DYN ary::inf::DocuToken & let_drNewToken ); void SetCurSinceAtTagVersion( - DYN ary::info::DocuToken & + DYN ary::inf::DocuToken & let_drNewToken ); void AddDocuToken2SinceAtTag( - DYN ary::info::DocuToken & + DYN ary::inf::DocuToken & let_drNewToken ); // DATA - Dyn<ary::info::CodeInformation> + Dyn<ary::doc::OldIdlDocu> pDocu; E_State eState; ParserInfo * pPositionInfo; |