#98964#, New layout for Autodoc-IDL-docu

5 files changed, 95 insertions, 103 deletions

diff --git a/udm/inc/udm/html/htmlitem.hxx b/udm/inc/udm/html/htmlitem.hxx
index 30cfab2e3e45..1db63e4382f0 100644
--- a/udm/inc/udm/html/htmlitem.hxx
+++ b/udm/inc/udm/html/htmlitem.hxx
@@ -2,9 +2,9 @@
  *
  *  $RCSfile: htmlitem.hxx,v $
  *
- *  $Revision: 1.1.1.1 $
+ *  $Revision: 1.2 $
  *
- *  last change: $Author: np $ $Date: 2002-03-08 14:32:37 $
+ *  last change: $Author: np $ $Date: 2002-05-14 08:29:35 $
  *
  *  The Contents of this file are made available subject to the terms of
  *  either of the following licenses
@@ -120,11 +120,11 @@ class Image : public csi::xml::AnEmptyElement
 {
   public:
                         Image(
-                            const csv::String & i_sSrc,
-                            const csv::String & i_sWidth,
-                            const csv::String & i_sHeight,
-                            const csv::String & i_sAlign,
-                            const csv::String & i_sBorder );
+                            const ::csv::String & i_sSrc,
+                            const ::csv::String & i_sWidth,
+                            const ::csv::String & i_sHeight,
+                            const ::csv::String & i_sAlign,
+                            const ::csv::String & i_sBorder );
 };
 
 /** <A name="">
@@ -133,7 +133,7 @@ class Label : public csi::xml::AnElement
 {
   public:
                         Label(
-                            const csv::String & i_sLabel )
+                            const ::csv::String & i_sLabel )
                                 :   csi::xml::AnElement("a")
                                 { *this << new csi::xml::AnAttribute("name", i_sLabel); }
   private:
@@ -240,7 +240,7 @@ class Link : public csi::xml::AnElement
 {
   public:
                         Link(
-                            const csv::String &i_sDestinaton )
+                            const ::csv::String &i_sDestinaton )
                                 :   csi::xml::AnElement("a")
                                 { *this << new csi::xml::AnAttribute("href", i_sDestinaton); }
 };
@@ -274,10 +274,10 @@ class Table : public csi::xml::AnElement
                         Table()
                                 :   csi::xml::AnElement("table") {}
                         Table(
-                            const csv::String & i_sBorder,
-                            const csv::String & i_sWidth,
-                            const csv::String & i_sCellPadding,
-                            const csv::String & i_sCellSpacing  );
+                            const ::csv::String & i_sBorder,
+                            const ::csv::String & i_sWidth,
+                            const ::csv::String & i_sCellPadding,
+                            const ::csv::String & i_sCellSpacing  );
     TableRow &          AddRow();
   private:
     virtual bool        FinishEmptyTag_XmlStyle() const;
@@ -363,7 +363,7 @@ class ClassAttr : public csi::xml::AnAttribute
 {
   public:
                         ClassAttr(
-                            const csv::String & i_sValue )
+                            const ::csv::String & i_sValue )
                             :   csi::xml::AnAttribute( "class", i_sValue ) {}
 };
 
@@ -371,7 +371,7 @@ class StyleAttr : public csi::xml::AnAttribute
 {
   public:
                         StyleAttr(
-                            const csv::String & i_sValue )
+                            const ::csv::String & i_sValue )
                             :   csi::xml::AnAttribute( "style", i_sValue ) {}
 };
 
@@ -379,7 +379,7 @@ class SizeAttr : public csi::xml::AnAttribute
 {
   public:
                         SizeAttr(
-                            const csv::String & i_sValue )
+                            const ::csv::String & i_sValue )
                             :   csi::xml::AnAttribute( "size", i_sValue ) {}
 };
 
@@ -387,7 +387,7 @@ class ColorAttr : public csi::xml::AnAttribute
 {
   public:
                         ColorAttr(
-                            const csv::String & i_sValue )
+                            const ::csv::String & i_sValue )
                             :   csi::xml::AnAttribute( "color", i_sValue ) {}
 };
 
@@ -395,7 +395,7 @@ class BgColorAttr : public csi::xml::AnAttribute
 {
   public:
                         BgColorAttr(
-                            const csv::String & i_sValue )
+                            const ::csv::String & i_sValue )
                             :   csi::xml::AnAttribute( "bgcolor", i_sValue ) {}
 };
 
@@ -403,7 +403,7 @@ class AlignAttr : public csi::xml::AnAttribute
 {
   public:
                         AlignAttr(
-                            const csv::String & i_sValue )
+                            const ::csv::String & i_sValue )
                             :   csi::xml::AnAttribute( "align", i_sValue ) {}
 };
 
@@ -411,7 +411,7 @@ class WidthAttr : public csi::xml::AnAttribute
 {
   public:
                         WidthAttr(
-                            const csv::String & i_sValue )
+                            const ::csv::String & i_sValue )
                             :   csi::xml::AnAttribute( "width", i_sValue ) {}
 };
 
diff --git a/udm/inc/udm/xml/xmlitem.hxx b/udm/inc/udm/xml/xmlitem.hxx
index 2d78016f41ed..e80939881288 100644
--- a/udm/inc/udm/xml/xmlitem.hxx
+++ b/udm/inc/udm/xml/xmlitem.hxx
@@ -2,9 +2,9 @@
  *
  *  $RCSfile: xmlitem.hxx,v $
  *
- *  $Revision: 1.1.1.1 $
+ *  $Revision: 1.2 $
  *
- *  last change: $Author: np $ $Date: 2002-03-08 14:32:37 $
+ *  last change: $Author: np $ $Date: 2002-05-14 08:29:35 $
  *
  *  The Contents of this file are made available subject to the terms of
  *  either of the following licenses
@@ -71,7 +71,7 @@
 
 namespace csv
 {
-    class AnyWrite;
+    class bostream;
 }
 
 
@@ -106,13 +106,13 @@ class Attribute
     void                WriteOut(
                             csv::bostream &     io_aFile ) const;
 
-    const csv::String& Name() const;
-    const csv::String& Value() const;
+    const ::csv::String& Name() const;
+    const ::csv::String& Value() const;
 
   private:
-    virtual const csv::String &
+    virtual const ::csv::String &
                         inq_Name() const = 0;
-    virtual const csv::String &
+    virtual const ::csv::String &
                         inq_Value() const = 0;
 };
 
@@ -125,7 +125,7 @@ class Element : public Item
     Element &           operator<<(             /// For multiple content items.
                             DYN Item *          let_dpItem );
     Element &           operator<<(             /// For multiple content items.
-                            const csv::String& let_drText );
+                            const ::csv::String& let_drText );
     Element &           operator<<(             /// For multiple content items.
                             const char *        let_dpText );
     Element &           operator<<(
@@ -150,7 +150,7 @@ class Element : public Item
     virtual void        do_SetContent(
                             DYN Item *          let_dpItem ) = 0;
     // Helpers
-    virtual const csv::String &
+    virtual const ::csv::String &
                         inq_TagName() const = 0;
     virtual const Item *
                         inq_Content() const = 0;
@@ -238,7 +238,7 @@ class AnElement : public Element
 {
   public:
                         AnElement(
-                            const csv::String& i_sTagName );
+                            const ::csv::String& i_sTagName );
                         ~AnElement();
   private:
     // Interface Element
@@ -248,14 +248,14 @@ class AnElement : public Element
                             DYN Attribute *     let_dpAttr );
     virtual void        do_SetContent(
                             DYN Item *          let_dpItem );
-    virtual const csv::String &
+    virtual const ::csv::String &
                         inq_TagName() const;
     virtual const Item *
                         inq_Content() const;
     virtual const AttrList *
                         inq_Attrs() const;
     // DATA
-    csv::String        sTagName;
+    ::csv::String        sTagName;
     Dyn< Item >         pContent;
     AttrList            aAttrs;
 };
@@ -265,17 +265,17 @@ class AnEmptyElement : public EmptyElement
 {
   public:
                         AnEmptyElement(
-                            const csv::String & i_sTagName );
+                            const ::csv::String & i_sTagName );
                         ~AnEmptyElement();
   private:
     // Interface Element:
-    virtual const csv::String &
+    virtual const ::csv::String &
                         inq_TagName() const;
     // Interface EmptyElement:
     virtual AttrList &  inq_RefAttrs();
 
     // DATA
-    csv::String     sTagName;
+    ::csv::String       sTagName;
     AttrList            aAttrs;
 };
 
@@ -283,17 +283,17 @@ class APureElement : public PureElement
 {
   public:
                         APureElement(
-                            const csv::String & i_sTagName );
+                            const ::csv::String &   i_sTagName );
                         ~APureElement();
   private:
     // Interface Element:
-    virtual const csv::String &
+    virtual const ::csv::String &
                         inq_TagName() const;
     // Interface PureElement:
     virtual Dyn< Item > &
                         inq_RefContent();
     // DATA
-    csv::String         sTagName;
+    ::csv::String         sTagName;
     Dyn< Item >         pContent;
 };
 
@@ -301,14 +301,14 @@ class ASglTag : public SglTag
 {
   public:
                         ASglTag(
-                            const csv::String & i_sTagName );
+                            const ::csv::String & i_sTagName );
                         ~ASglTag();
   private:
     // Interface Element:
-    virtual const csv::String &
+    virtual const ::csv::String &
                         inq_TagName() const;
     // DATA
-    csv::String         sTagName;
+    ::csv::String         sTagName;
 };
 
 
@@ -318,18 +318,18 @@ class AnAttribute : public Attribute
 {
   public:
                         AnAttribute(
-                            const csv::String & i_sName,
-                            const csv::String & i_sValue );
+                            const ::csv::String & i_sName,
+                            const ::csv::String & i_sValue );
                         ~AnAttribute();
   private:
     // Interface Attribute:
-    virtual const csv::String &
+    virtual const ::csv::String &
                         inq_Name() const;
-    virtual const csv::String &
+    virtual const ::csv::String &
                         inq_Value() const;
     // DATA
-    csv::String         sName;
-    csv::String         sValue;
+    ::csv::String         sName;
+    ::csv::String         sValue;
 };
 
 
@@ -344,7 +344,7 @@ class Text : public TextContent
 {
   public:
                         Text(
-                            const csv::String & i_sText );
+                            const ::csv::String & i_sText );
                         Text(
                             const char *        i_sText );
                         ~Text();
@@ -352,7 +352,7 @@ class Text : public TextContent
     virtual void        do_WriteOut(
                             csv::bostream &     io_aFile ) const;
     // DATA
-    csv::String         sText;
+    ::csv::String         sText;
 };
 
 
@@ -360,13 +360,13 @@ class XmlCode : public TextContent
 {
   public:
                         XmlCode(
-                            const csv::String & i_sText );
+                            const ::csv::String & i_sText );
                         ~XmlCode();
   private:
     virtual void        do_WriteOut(
                             csv::bostream &     io_aFile ) const;
     // DATA
-    csv::String         sText;
+    ::csv::String         sText;
 };
 
 
@@ -377,10 +377,10 @@ inline void
 Item::WriteOut( csv::bostream & io_aFile ) const
     { do_WriteOut(io_aFile); }
 
-inline const csv::String &
+inline const ::csv::String &
 Attribute::Name() const
     { return inq_Name(); }
-inline const csv::String &
+inline const ::csv::String &
 Attribute::Value() const
     { return inq_Value(); }
 
@@ -388,7 +388,7 @@ inline Element &
 Element::operator<<( DYN Item * let_dpItem )
     { op_streamout(let_dpItem); return *this; }
 inline Element &
-Element::operator<<( const csv::String & let_drText )
+Element::operator<<( const ::csv::String & let_drText )
     { op_streamout( new Text(let_drText) ); return *this; }
 inline Element &
 Element::operator<<( const char * let_drText )
diff --git a/udm/source/html/htmlitem.cxx b/udm/source/html/htmlitem.cxx
index 751eea39cc9b..de654aff20d0 100644
--- a/udm/source/html/htmlitem.cxx
+++ b/udm/source/html/htmlitem.cxx
@@ -2,9 +2,9 @@
  *
  *  $RCSfile: htmlitem.cxx,v $
  *
- *  $Revision: 1.1.1.1 $
+ *  $Revision: 1.2 $
  *
- *  last change: $Author: np $ $Date: 2002-03-08 14:32:37 $
+ *  last change: $Author: np $ $Date: 2002-05-14 08:29:36 $
  *
  *  The Contents of this file are made available subject to the terms of
  *  either of the following licenses
@@ -100,11 +100,11 @@ HorizontalLine::LineBreakAfterBeginTag() const
 #endif
 
 
-Image::Image( const csv::String &   i_sSrc,
-              const csv::String &   i_sWidth,
-              const csv::String &   i_sHeight,
-              const csv::String &   i_sAlign,
-              const csv::String &   i_sBorder )
+Image::Image( const String &   i_sSrc,
+              const String &   i_sWidth,
+              const String &   i_sHeight,
+              const String &   i_sAlign,
+              const String &   i_sBorder )
     :   AnEmptyElement( "img" )
 {
     *this << new AnAttribute("src",i_sSrc)
@@ -165,10 +165,10 @@ TableRow::LineBreakAfterBeginTag() const
 }
 
 
-Table::Table( const csv::String &   i_sBorder,
-              const csv::String &   i_sWidth,
-              const csv::String &   i_sCellPadding,
-              const csv::String &   i_sCellSpacing  )
+Table::Table( const String &   i_sBorder,
+              const String &   i_sWidth,
+              const String &   i_sCellPadding,
+              const String &   i_sCellSpacing  )
     :   csi::xml::AnElement("table")
 {
     if ( i_sBorder.length() > 0 )
diff --git a/udm/source/inc/precomp.h b/udm/source/inc/precomp.h
index 85f027abe4bb..04181206a38c 100644
--- a/udm/source/inc/precomp.h
+++ b/udm/source/inc/precomp.h
@@ -2,9 +2,9 @@
  *
  *  $RCSfile: precomp.h,v $
  *
- *  $Revision: 1.1.1.1 $
+ *  $Revision: 1.2 $
  *
- *  last change: $Author: np $ $Date: 2002-03-08 14:32:37 $
+ *  last change: $Author: np $ $Date: 2002-05-14 08:29:36 $
  *
  *  The Contents of this file are made available subject to the terms of
  *  either of the following licenses
@@ -65,6 +65,8 @@
 // For en/disabling csv_assertions:
 #ifndef DEBUG
 #define CSV_NO_ASSERTIONS
+#else
+#define CSV_USE_CSV_ASSERTIONS
 #endif
 
 #ifdef NP_LOCALBUILD
@@ -79,8 +81,8 @@
 
 
 // Shortcuts to access csv::-types:
-// using csv::String;
-// using csv::StringVector;
+using csv::String;
+using csv::StringVector;
 using csv::StreamStr;
 using csv::ios;
 using csv::ostream;
@@ -89,19 +91,9 @@ typedef csv::StreamStrLock  StreamLock;
 
 
 
-/** @attention
-    Has to be changed to returning csv::Cout(),if
-        1)  iostreams are not used ( #ifdef CSV_NO_IOSTREAM )
-        2)  used for an GUI-application.
-*/
 inline ostream &
 Cout() { return csv::Cout(); }
 
-/** @attention
-    Has to be changed to returning csv::Cerr(),if
-        1)  iostreams are not used ( #ifdef CSV_NO_IOSTREAM )
-        2)  used for an GUI-application.
-*/
 inline ostream &
 Cerr() { return csv::Cerr(); }
 
diff --git a/udm/source/xml/xmlitem.cxx b/udm/source/xml/xmlitem.cxx
index c9ea5b76fa32..99d4284c20c1 100644
--- a/udm/source/xml/xmlitem.cxx
+++ b/udm/source/xml/xmlitem.cxx
@@ -2,9 +2,9 @@
  *
  *  $RCSfile: xmlitem.cxx,v $
  *
- *  $Revision: 1.1.1.1 $
+ *  $Revision: 1.2 $
  *
- *  last change: $Author: np $ $Date: 2002-03-08 14:32:38 $
+ *  last change: $Author: np $ $Date: 2002-05-14 08:29:37 $
  *
  *  The Contents of this file are made available subject to the terms of
  *  either of the following licenses
@@ -149,8 +149,8 @@ Impl_SetContent( Dyn< Item >  &         o_rContent,
 
 //*********************     Attribute       ****************************//
 
-const csv::String   attrValueBegin("=\"");
-const csv::String   attrValueEnd("\"");
+const String   attrValueBegin("=\"");
+const String   attrValueEnd("\"");
 
 void
 Attribute::WriteOut( csv::bostream & io_aFile ) const
@@ -168,12 +168,12 @@ Attribute::WriteOut( csv::bostream & io_aFile ) const
 
 //************************      Element     ****************************//
 
-const csv::String    newline("\n");
-const csv::String    space(" ");
-const csv::String    beginTagBegin("<");
-const csv::String    endTagBegin("</");
-const csv::String    tagEnd(">");
-const csv::String    emptyTagEnd("/>");
+const String    newline("\n");
+const String    space(" ");
+const String    beginTagBegin("<");
+const String    endTagBegin("</");
+const String    tagEnd(">");
+const String    emptyTagEnd("/>");
 
 void
 Element::do_WriteOut( csv::bostream & io_aFile ) const
@@ -342,7 +342,7 @@ SglTag::inq_Attrs() const
 
 //***************************       AnElement       **************************//
 
-AnElement::AnElement( const csv::String &   i_sTagName )
+AnElement::AnElement( const String &   i_sTagName )
     :   sTagName( i_sTagName )
         // pContent,
         // aAttrs
@@ -371,7 +371,7 @@ AnElement::do_SetContent( DYN Item * let_dpItem )
     Impl_SetContent( pContent, let_dpItem );
 }
 
-const csv::String &
+const String &
 AnElement::inq_TagName() const
 {
     return sTagName;
@@ -392,7 +392,7 @@ AnElement::inq_Attrs() const
 
 //***************************     AnEmptyElement    **************************//
 
-AnEmptyElement::AnEmptyElement( const csv::String &   i_sTagName )
+AnEmptyElement::AnEmptyElement( const String &   i_sTagName )
     :   sTagName( i_sTagName )
         // aAttrs
 {
@@ -403,7 +403,7 @@ AnEmptyElement::~AnEmptyElement()
 
 }
 
-const csv::String &
+const String &
 AnEmptyElement::inq_TagName() const
 {
     return sTagName;
@@ -418,7 +418,7 @@ AnEmptyElement::inq_RefAttrs()
 
 //***************************     APureElement      **************************//
 
-APureElement::APureElement( const csv::String &   i_sTagName )
+APureElement::APureElement( const String &   i_sTagName )
     :   sTagName( i_sTagName )
         // pContent
 {
@@ -428,7 +428,7 @@ APureElement::~APureElement()
 {
 }
 
-const csv::String &
+const String &
 APureElement::inq_TagName() const
 {
     return sTagName;
@@ -444,7 +444,7 @@ APureElement::inq_RefContent()
 
 //***************************     ASglTag           **************************//
 
-ASglTag::ASglTag( const csv::String &   i_sTagName )
+ASglTag::ASglTag( const String &   i_sTagName )
     :   sTagName( i_sTagName )
 {
 }
@@ -453,7 +453,7 @@ ASglTag::~ASglTag()
 {
 }
 
-const csv::String &
+const String &
 ASglTag::inq_TagName() const
 {
     return sTagName;
@@ -461,8 +461,8 @@ ASglTag::inq_TagName() const
 
 
 //***************************       AnAttribute     **************************//
-AnAttribute::AnAttribute( const csv::String &   i_sName,
-                          const csv::String &   i_sValue )
+AnAttribute::AnAttribute( const String &   i_sName,
+                          const String &   i_sValue )
     :   sName(i_sName),
         sValue(i_sValue)
 {
@@ -472,13 +472,13 @@ AnAttribute::~AnAttribute()
 {
 }
 
-const csv::String &
+const String &
 AnAttribute::inq_Name() const
 {
     return sName;
 }
 
-const csv::String &
+const String &
 AnAttribute::inq_Value() const
 {
     return sValue;
@@ -488,7 +488,7 @@ AnAttribute::inq_Value() const
 
 //***************************       Text        **************************//
 
-Text::Text( const csv::String &   i_sText )
+Text::Text( const String &   i_sText )
     :   sText(i_sText)
 {
 }
@@ -539,7 +539,7 @@ Text::do_WriteOut( csv::bostream & io_aFile ) const
 
 //***************************       XmlCode     **************************//
 
-XmlCode::XmlCode( const csv::String &   i_sText )
+XmlCode::XmlCode( const String &   i_sText )
     :   sText(i_sText)
 {
 }