INTEGRATION: CWS adc18 (1.5.56); FILE MERGED

2007/10/18 15:23:22 np 1.5.56.1: #i81775#

4 files changed, 23 insertions, 25 deletions

diff --git a/autodoc/source/parser_i/inc/s2_luidl/distrib.hxx b/autodoc/source/parser_i/inc/s2_luidl/distrib.hxx
index 5a81ff859270..aee04a3abd8c 100644
--- a/autodoc/source/parser_i/inc/s2_luidl/distrib.hxx
+++ b/autodoc/source/parser_i/inc/s2_luidl/distrib.hxx
@@ -4,9 +4,9 @@
  *
  *  $RCSfile: distrib.hxx,v $
  *
- *  $Revision: 1.5 $
+ *  $Revision: 1.6 $
  *
- *  last change: $Author: rt $ $Date: 2005-09-07 18:59:20 $
+ *  last change: $Author: hr $ $Date: 2007-11-02 17:13:35 $
  *
  *  The Contents of this file are made available subject to
  *  the terms of GNU Lesser General Public License Version 2.1.
@@ -51,14 +51,12 @@ class ParserInfo;
 
 namespace ary
 {
-    namespace n22
-    {
-        class Repository;
-    }
-    namespace info
-    {
-        class CodeInformation;
-    }   // namespace info
+    class Repository;
+
+namespace doc
+{
+    class OldIdlDocu;
+}   // namespace inf
 }   // namespace ary)
 
 
@@ -90,7 +88,7 @@ class TokenDistributor : private TokenProcessing_Types
 {
   public:
                         TokenDistributor(
-                            ary::n22::Repository &  io_rRepository,
+                            ary::Repository &   io_rRepository,
                             ParserInfo &            io_rParserInfo );
     void                SetTokenProvider(
                             TokenParser_Uidl &  io_rTokenSource );
@@ -114,7 +112,7 @@ class TokenDistributor : private TokenProcessing_Types
     /** Used from PE_File, if there is a docu to get without
         an environment to push (this is the case for modules).
     */
-    DYN ary::info::CodeInformation *
+    DYN ary::doc::OldIdlDocu *
                         ReleaseLastParsedDocu()
                             { return aDocumentation.ReleaseLastParsedDocu(); }
 
@@ -136,7 +134,7 @@ class TokenDistributor : private TokenProcessing_Types
     {
       public:
                             ProcessingData(
-                                ary::n22::Repository &  io_rRepository,
+                                ary::Repository &   io_rRepository,
                                 Documentation &         i_rDocuProcessor,
                                 ParserInfo &            io_rParserInfo );
                             ~ProcessingData();
@@ -180,7 +178,7 @@ class TokenDistributor : private TokenProcessing_Types
                             aCurResult;
         uintt               nTryCount;
         bool                bFinished;
-        ary::n22::Repository &
+        ary::Repository &
                             rRepository;
         ParserInfo &        rParserInfo;
         Documentation *     pDocuProcessor;
@@ -200,14 +198,14 @@ class TokenDistributor : private TokenProcessing_Types
                                 DYN csi::dsapi::Token &
                                                 let_drToken );
         virtual void        Increment_CurLine();
-        DYN ary::info::CodeInformation *
+        DYN ary::doc::OldIdlDocu *
                             ReleaseLastParsedDocu()
                                                 { return pMostRecentDocu.Release(); }
       private:
         Dyn<csi::dsapi::SapiDocu_PE>
                             pDocuParseEnv;
         ParserInfo &        rParserInfo;
-        Dyn<ary::info::CodeInformation>
+        Dyn<ary::doc::OldIdlDocu>
                             pMostRecentDocu;
         bool                bIsPassedFirstDocu;
     };
diff --git a/autodoc/source/parser_i/inc/s2_luidl/pe_attri.hxx b/autodoc/source/parser_i/inc/s2_luidl/pe_attri.hxx
index ae733c8c1825..6c2de8b5c6cc 100644
--- a/autodoc/source/parser_i/inc/s2_luidl/pe_attri.hxx
+++ b/autodoc/source/parser_i/inc/s2_luidl/pe_attri.hxx
@@ -4,9 +4,9 @@
  *
  *  $RCSfile: pe_attri.hxx,v $
  *
- *  $Revision: 1.5 $
+ *  $Revision: 1.6 $
  *
- *  last change: $Author: rt $ $Date: 2005-09-07 18:59:55 $
+ *  last change: $Author: hr $ $Date: 2007-11-02 17:14:08 $
  *
  *  The Contents of this file are made available subject to
  *  the terms of GNU Lesser General Public License Version 2.1.
@@ -78,7 +78,7 @@ class PE_Attribute : public UnoIDL_PE,
 
     virtual void        EstablishContacts(
                             UnoIDL_PE *         io_pParentPE,
-                            ary::n22::Repository &
+                            ary::Repository &
                                                 io_rRepository,
                             TokenProcessing_Result &
                                                 o_rResult );
diff --git a/autodoc/source/parser_i/inc/s2_luidl/pe_file2.hxx b/autodoc/source/parser_i/inc/s2_luidl/pe_file2.hxx
index aea3f4255fc7..b3c4302215df 100644
--- a/autodoc/source/parser_i/inc/s2_luidl/pe_file2.hxx
+++ b/autodoc/source/parser_i/inc/s2_luidl/pe_file2.hxx
@@ -4,9 +4,9 @@
  *
  *  $RCSfile: pe_file2.hxx,v $
  *
- *  $Revision: 1.5 $
+ *  $Revision: 1.6 $
  *
- *  last change: $Author: rt $ $Date: 2005-09-07 19:01:17 $
+ *  last change: $Author: hr $ $Date: 2007-11-02 17:15:45 $
  *
  *  The Contents of this file are made available subject to
  *  the terms of GNU Lesser General Public License Version 2.1.
@@ -80,7 +80,7 @@ class PE_File : public UnoIDL_PE,
                             const ParserInfo &  i_parseInfo );
     virtual void        EstablishContacts(
                             UnoIDL_PE *         io_pParentPE,
-                            ary::n22::Repository &  io_rRepository,
+                            ary::Repository &   io_rRepository,
                             TokenProcessing_Result &
                                                 o_rResult );
                         ~PE_File();
diff --git a/autodoc/source/parser_i/inc/s2_luidl/pe_struc.hxx b/autodoc/source/parser_i/inc/s2_luidl/pe_struc.hxx
index bfe5e21f17fb..86e64501e97b 100644
--- a/autodoc/source/parser_i/inc/s2_luidl/pe_struc.hxx
+++ b/autodoc/source/parser_i/inc/s2_luidl/pe_struc.hxx
@@ -4,9 +4,9 @@
  *
  *  $RCSfile: pe_struc.hxx,v $
  *
- *  $Revision: 1.5 $
+ *  $Revision: 1.6 $
  *
- *  last change: $Author: rt $ $Date: 2005-09-07 19:03:32 $
+ *  last change: $Author: hr $ $Date: 2007-11-02 17:17:43 $
  *
  *  The Contents of this file are made available subject to
  *  the terms of GNU Lesser General Public License Version 2.1.
@@ -77,7 +77,7 @@ class PE_Struct : public UnoIDL_PE
                         PE_Struct();
     virtual void        EstablishContacts(
                             UnoIDL_PE *         io_pParentPE,
-                            ary::n22::Repository &  io_rRepository,
+                            ary::Repository &   io_rRepository,
                             TokenProcessing_Result &
                                                 o_rResult );
                         ~PE_Struct();