INTEGRATION: CWS adc18 (1.7.2); FILE MERGED

2007/10/18 15:23:20 np 1.7.2.1: #i81775#

4 files changed, 17 insertions, 17 deletions

diff --git a/autodoc/source/parser/tokens/tkpstama.cxx b/autodoc/source/parser/tokens/tkpstama.cxx
index 5efe81ce4838..f4e5c213ba2b 100644
--- a/autodoc/source/parser/tokens/tkpstama.cxx
+++ b/autodoc/source/parser/tokens/tkpstama.cxx
@@ -4,9 +4,9 @@
  *
  *  $RCSfile: tkpstama.cxx,v $
  *
- *  $Revision: 1.7 $
+ *  $Revision: 1.8 $
  *
- *  last change: $Author: vg $ $Date: 2007-09-18 14:17:57 $
+ *  last change: $Author: hr $ $Date: 2007-11-02 17:04:41 $
  *
  *  The Contents of this file are made available subject to
  *  the terms of GNU Lesser General Public License Version 2.1.
@@ -55,8 +55,8 @@ StateMachine::StateMachine( intt            in_nStatusSize,
         nNrofStati(0),
         nStatiSpace(in_nInitial_StatusListSize)
 {
-    precond(in_nStatusSize > 0);
-    precond(in_nInitial_StatusListSize > 0);
+    csv_assert(in_nStatusSize > 0);
+    csv_assert(in_nInitial_StatusListSize > 0);
 
     memset(pStati, 0, sizeof(StmStatus*) * nStatiSpace);
 }
diff --git a/autodoc/source/parser_i/idl/distrib.cxx b/autodoc/source/parser_i/idl/distrib.cxx
index 4b31fdf6822c..6e443af73327 100644
--- a/autodoc/source/parser_i/idl/distrib.cxx
+++ b/autodoc/source/parser_i/idl/distrib.cxx
@@ -4,9 +4,9 @@
  *
  *  $RCSfile: distrib.cxx,v $
  *
- *  $Revision: 1.7 $
+ *  $Revision: 1.8 $
  *
- *  last change: $Author: vg $ $Date: 2007-09-18 14:18:51 $
+ *  last change: $Author: hr $ $Date: 2007-11-02 17:05:11 $
  *
  *  The Contents of this file are made available subject to
  *  the terms of GNU Lesser General Public License Version 2.1.
@@ -38,7 +38,7 @@
 
 
 // NOT FULLY DECLARED SERVICES
-#include <ary_i/codeinf2.hxx>
+#include <ary/doc/d_oldidldocu.hxx>
 #include <parser/parserinfo.hxx>
 #include <s2_luidl/tkp_uidl.hxx>
 #include <s2_luidl/parsenv2.hxx>
@@ -57,7 +57,7 @@ namespace csi
 namespace uidl
 {
 
-TokenDistributor::TokenDistributor( ary::n22::Repository & io_rRepository,
+TokenDistributor::TokenDistributor( ary::Repository & io_rRepository,
                                     ParserInfo &           io_rParserInfo )
     :   pTokenSource(0),
         aProcessingData( io_rRepository, aDocumentation, io_rParserInfo ),
@@ -82,7 +82,7 @@ TokenDistributor::TradeToken()
 }
 
 TokenDistributor::ProcessingData::ProcessingData(
-                                        ary::n22::Repository &  io_rRepository,
+                                        ary::Repository &   io_rRepository,
                                         Documentation &         i_rDocuProcessor,
                                         ParserInfo &            io_rParserInfo )
     :   // aEnvironments
diff --git a/autodoc/source/parser_i/idl/pe_selem.cxx b/autodoc/source/parser_i/idl/pe_selem.cxx
index 76a8c2b1c3bb..598a36f5de5e 100644
--- a/autodoc/source/parser_i/idl/pe_selem.cxx
+++ b/autodoc/source/parser_i/idl/pe_selem.cxx
@@ -4,9 +4,9 @@
  *
  *  $RCSfile: pe_selem.cxx,v $
  *
- *  $Revision: 1.7 $
+ *  $Revision: 1.8 $
  *
- *  last change: $Author: vg $ $Date: 2007-09-18 14:21:29 $
+ *  last change: $Author: hr $ $Date: 2007-11-02 17:08:18 $
  *
  *  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/idl/i_struct.hxx>
 #include <ary/idl/i_structelem.hxx>
 #include <ary/idl/ip_ce.hxx>
-#include <ary_i/codeinf2.hxx>
+#include <ary/doc/d_oldidldocu.hxx>
 #include <s2_luidl/pe_type2.hxx>
 #include <s2_luidl/tk_ident.hxx>
 #include <s2_luidl/tk_punct.hxx>
@@ -88,7 +88,7 @@ PE_StructElement::PE_StructElement( RStructElement &    o_rResult,
 
 void
 PE_StructElement::EstablishContacts( UnoIDL_PE *                io_pParentPE,
-                                     ary::n22::Repository &     io_rRepository,
+                                     ary::Repository &      io_rRepository,
                                      TokenProcessing_Result &   o_rResult )
 {
     UnoIDL_PE::EstablishContacts(io_pParentPE,io_rRepository,o_rResult);
diff --git a/autodoc/source/parser_i/idl/pe_struc.cxx b/autodoc/source/parser_i/idl/pe_struc.cxx
index dca3329917aa..7f1172ffc36f 100644
--- a/autodoc/source/parser_i/idl/pe_struc.cxx
+++ b/autodoc/source/parser_i/idl/pe_struc.cxx
@@ -4,9 +4,9 @@
  *
  *  $RCSfile: pe_struc.cxx,v $
  *
- *  $Revision: 1.7 $
+ *  $Revision: 1.8 $
  *
- *  last change: $Author: vg $ $Date: 2007-09-18 14:22:15 $
+ *  last change: $Author: hr $ $Date: 2007-11-02 17:09:09 $
  *
  *  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/idl/i_gate.hxx>
 #include <ary/idl/i_struct.hxx>
 #include <ary/idl/ip_ce.hxx>
-#include <ary_i/codeinf2.hxx>
+#include <ary/doc/d_oldidldocu.hxx>
 #include <s2_luidl/tk_ident.hxx>
 #include <s2_luidl/tk_punct.hxx>
 #include <s2_luidl/tk_keyw.hxx>
@@ -65,7 +65,7 @@ PE_Struct::PE_Struct()
 
 void
 PE_Struct::EstablishContacts( UnoIDL_PE *               io_pParentPE,
-                              ary::n22::Repository &            io_rRepository,
+                              ary::Repository &         io_rRepository,
                               TokenProcessing_Result &  o_rResult )
 {
     UnoIDL_PE::EstablishContacts(io_pParentPE,io_rRepository,o_rResult);