diff options
author | Bjoern Michaelsen <bjoern.michaelsen@canonical.com> | 2011-08-23 15:20:20 +0200 |
---|---|---|
committer | Bjoern Michaelsen <bjoern.michaelsen@canonical.com> | 2011-08-23 15:20:20 +0200 |
commit | 4dc9c2aaf6a6b07c7afbc3620e2f34085a838294 (patch) | |
tree | c9977bbeaa286c1c906376b3f836d05eb43adea3 /udm | |
parent | c7eab7eed6263bdc62f91a2336cc60fdc3d69a49 (diff) |
recreated tag libreoffice-3.3.3.1 which had these commits:
commit 1d0f0ac667d24a5e2584e81a20cf8aa52e784aa7 (tag: refs/tags/libreoffice-3.3.3.1)
Author: Petr Mladek <pmladek@suse.cz>
Date: Tue May 31 17:39:08 2011 +0200
Version 3.3.3.1, tag libreoffice-3.3.3.1 (3.3.3-rc1)
Notes
Notes:
split repo tag: sdk_libreoffice-3.3.3.1
split repo tag: sdk_libreoffice-3.3.4.1
Diffstat (limited to 'udm')
-rw-r--r-- | udm/inc/udm/html/htmlitem.hxx | 128 | ||||
-rw-r--r-- | udm/inc/udm/xml/xmlitem.hxx | 162 | ||||
-rw-r--r-- | udm/source/html/htmlitem.cxx | 12 | ||||
-rw-r--r-- | udm/source/inc/precomp.h | 2 | ||||
-rw-r--r-- | udm/source/unittest/test.cxx | 2 | ||||
-rw-r--r-- | udm/source/xml/xmlitem.cxx | 174 |
6 files changed, 240 insertions, 240 deletions
diff --git a/udm/inc/udm/html/htmlitem.hxx b/udm/inc/udm/html/htmlitem.hxx index ae158964c238..932e11ef5e93 100644 --- a/udm/inc/udm/html/htmlitem.hxx +++ b/udm/inc/udm/html/htmlitem.hxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -45,43 +45,43 @@ namespace html -/** <BODY> +/** <BODY> */ class Body : public csi::xml::AnElement { public: Body() - : csi::xml::AnElement( "body" ) {} + : csi::xml::AnElement( "body" ) {} private: - virtual bool LineBreakAfterBeginTag() const; + virtual bool LineBreakAfterBeginTag() const; }; #ifdef COMPATIBLE_NETSCAPE_47 -/** <BR> +/** <BR> */ class HorizontalLine : public xml::XmlCode { public: HorizontalLine() - : xml::XmlCode("<hr>\n") {} + : xml::XmlCode("<hr>\n") {} }; #else -/** <HR> +/** <HR> */ class HorizontalLine : public csi::xml::AnEmptyElement { public: HorizontalLine() - : csi::xml::AnEmptyElement("hr") {} + : csi::xml::AnEmptyElement("hr") {} private: - virtual bool LineBreakAfterBeginTag() const; + virtual bool LineBreakAfterBeginTag() const; }; #endif -/** <IMG .... > +/** <IMG .... > */ class Image : public csi::xml::AnEmptyElement { @@ -94,119 +94,119 @@ class Image : public csi::xml::AnEmptyElement const ::csv::String & i_sBorder ); }; -/** <A name=""> +/** <A name=""> */ class Label : public csi::xml::AnElement { public: Label( const ::csv::String & i_sLabel ) - : csi::xml::AnElement("a") + : csi::xml::AnElement("a") { *this << new csi::xml::AnAttribute(String("name"), i_sLabel); } }; -/** <p> +/** <p> */ class Paragraph : public csi::xml::AnElement { public: Paragraph() - : csi::xml::AnElement("p") {} + : csi::xml::AnElement("p") {} private: - virtual bool LineBreakAfterEndTag() const; + virtual bool LineBreakAfterEndTag() const; }; -/** <H1-6> +/** <H1-6> */ class Headline : public csi::xml::APureElement { public: Headline( int i_nNr ) - : csi::xml::APureElement(sTags[i_nNr-1]) { csv_assert(1 <= i_nNr AND i_nNr < 7); } + : csi::xml::APureElement(sTags[i_nNr-1]) { csv_assert(1 <= i_nNr AND i_nNr < 7); } private: static const char * sTags[6]; - virtual bool LineBreakAfterEndTag() const; + virtual bool LineBreakAfterEndTag() const; }; #ifdef COMPATIBLE_NETSCAPE_47 -/** <BR> +/** <BR> */ class LineBreak : public xml::XmlCode { public: LineBreak() - : xml::XmlCode("<br>\n") {} + : xml::XmlCode("<br>\n") {} }; #else -/** <BR> +/** <BR> */ class LineBreak : public csi::xml::ASglTag { public: LineBreak() - : csi::xml::ASglTag("br") {} + : csi::xml::ASglTag("br") {} private: - virtual bool LineBreakAfterBeginTag() const; + virtual bool LineBreakAfterBeginTag() const; }; #endif -/** <b> +/** <b> */ class Bold : public csi::xml::APureElement { public: Bold() - : csi::xml::APureElement("b") {} + : csi::xml::APureElement("b") {} }; -/** <i> +/** <i> */ class Italic : public csi::xml::APureElement { public: Italic() - : csi::xml::APureElement("i") {} + : csi::xml::APureElement("i") {} }; -/** <strong> +/** <strong> */ class Strong : public csi::xml::APureElement { public: Strong() - : csi::xml::APureElement("strong") {} + : csi::xml::APureElement("strong") {} }; -/** <em> +/** <em> */ class Emphasized : public csi::xml::APureElement { public: Emphasized() - : csi::xml::APureElement("em") {} + : csi::xml::APureElement("em") {} }; -/** <font> +/** <font> */ class Font : public csi::xml::AnElement { public: Font() - : csi::xml::AnElement("font") {} + : csi::xml::AnElement("font") {} }; -/** <A href=""> +/** <A href=""> */ class Link : public csi::xml::AnElement { public: Link( const ::csv::String &i_sDestinaton ) - : csi::xml::AnElement("a") + : csi::xml::AnElement("a") { *this << new csi::xml::AnAttribute(String("href"), i_sDestinaton); } }; @@ -214,39 +214,39 @@ class TableCell : public csi::xml::AnElement { public: TableCell() - : csi::xml::AnElement("td") {} + : csi::xml::AnElement("td") {} private: - virtual bool LineBreakAfterEndTag() const; + virtual bool LineBreakAfterEndTag() const; }; class TableRow : public csi::xml::AnElement { public: TableRow() - : csi::xml::AnElement("tr") {} + : csi::xml::AnElement("tr") {} - TableCell & AddCell( + TableCell & AddCell( DYN csi::xml::Item* let_dpItem = 0 ); private: - virtual bool LineBreakAfterBeginTag() const; + virtual bool LineBreakAfterBeginTag() const; }; -/** <table ....> +/** <table ....> */ class Table : public csi::xml::AnElement { public: Table() - : 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 ); - TableRow & AddRow(); + TableRow & AddRow(); private: - virtual bool FinishEmptyTag_XmlStyle() const; - virtual bool LineBreakAfterBeginTag() const; + virtual bool FinishEmptyTag_XmlStyle() const; + virtual bool LineBreakAfterBeginTag() const; }; @@ -255,35 +255,35 @@ class DefListTerm : public csi::xml::AnElement { public: DefListTerm() - : csi::xml::AnElement("dt") {} + : csi::xml::AnElement("dt") {} private: - virtual bool LineBreakAfterEndTag() const; + virtual bool LineBreakAfterEndTag() const; }; class DefListDefinition : public csi::xml::AnElement { public: DefListDefinition() - : csi::xml::AnElement("dd") {} + : csi::xml::AnElement("dd") {} private: - virtual bool LineBreakAfterEndTag() const; + virtual bool LineBreakAfterEndTag() const; }; -/** <DL> +/** <DL> */ class DefList : public csi::xml::AnElement { public: DefList() - : csi::xml::AnElement("dl") {} + : csi::xml::AnElement("dl") {} - DefListTerm & AddTerm( + DefListTerm & AddTerm( DYN csi::xml::Item* let_dpItem = 0 ); - DefListDefinition & AddDefinition( + DefListDefinition & AddDefinition( DYN csi::xml::Item* let_dpItem = 0 ); private: - virtual bool LineBreakAfterBeginTag() const; - virtual bool FinishEmptyTag_XmlStyle() const; + virtual bool LineBreakAfterBeginTag() const; + virtual bool FinishEmptyTag_XmlStyle() const; }; @@ -291,9 +291,9 @@ class ListItem : public csi::xml::AnElement { public: ListItem() - : csi::xml::AnElement("li") {} + : csi::xml::AnElement("li") {} private: - virtual bool LineBreakAfterEndTag() const; + virtual bool LineBreakAfterEndTag() const; }; /** <OL> @@ -302,26 +302,26 @@ class NumeratedList : public csi::xml::AnElement { public: NumeratedList() - : csi::xml::AnElement("ol") {} + : csi::xml::AnElement("ol") {} - ListItem & AddItem( + ListItem & AddItem( DYN csi::xml::Item* let_dpItem = 0 ); private: - virtual bool LineBreakAfterBeginTag() const; + virtual bool LineBreakAfterBeginTag() const; }; -/** <UL> +/** <UL> */ class SimpleList : public csi::xml::AnElement { public: SimpleList() - : csi::xml::AnElement("ul") {} + : csi::xml::AnElement("ul") {} - ListItem & AddItem( + ListItem & AddItem( DYN csi::xml::Item* let_dpItem = 0 ); private: - virtual bool LineBreakAfterBeginTag() const; + virtual bool LineBreakAfterBeginTag() const; }; diff --git a/udm/inc/udm/xml/xmlitem.hxx b/udm/inc/udm/xml/xmlitem.hxx index 292a66910037..fbb76189da93 100644 --- a/udm/inc/udm/xml/xmlitem.hxx +++ b/udm/inc/udm/xml/xmlitem.hxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -48,30 +48,30 @@ namespace xml { -/* Basics: +/* Basics: Item, Attribute, Element, TextContext */ class Item { public: - virtual ~Item() {} - void WriteOut( - csv::bostream & io_aFile ) const; + virtual ~Item() {} + void WriteOut( + csv::bostream & io_aFile ) const; private: - virtual void do_WriteOut( - csv::bostream & io_aFile ) const = 0; + virtual void do_WriteOut( + csv::bostream & io_aFile ) const = 0; }; -typedef csv::SweList_dyn< Item > ItemList; +typedef csv::SweList_dyn< Item > ItemList; class Attribute { public: - virtual ~Attribute() {} + virtual ~Attribute() {} - void WriteOut( - csv::bostream & io_aFile ) const; + void WriteOut( + csv::bostream & io_aFile ) const; const ::csv::String& Name() const; const ::csv::String& Value() const; @@ -83,39 +83,39 @@ class Attribute inq_Value() const = 0; }; -typedef csv::SweList_dyn< Attribute > AttrList; +typedef csv::SweList_dyn< Attribute > AttrList; class Element : public Item { public: - Element & operator<<( /// For multiple content items. - DYN Item * let_dpItem ); - Element & operator<<( /// For multiple content items. + Element & operator<<( /// For multiple content items. + DYN Item * let_dpItem ); + Element & operator<<( /// For multiple content items. const ::csv::String& let_drText ); - Element & operator<<( /// For multiple content items. - const char * let_dpText ); - Element & operator<<( - DYN Attribute * let_dpAttr ); + Element & operator<<( /// For multiple content items. + const char * let_dpText ); + Element & operator<<( + DYN Attribute * let_dpAttr ); - Element & operator>>( /// For multiple content items. @return the child Element. - DYN Element & let_drElement ); + Element & operator>>( /// For multiple content items. @return the child Element. + DYN Element & let_drElement ); - Item * SetContent( /// For only one content item. - DYN Item * let_dpItem ); /// Replaces previous content. May be 0, then all content is deleted. + Item * SetContent( /// For only one content item. + DYN Item * let_dpItem ); /// Replaces previous content. May be 0, then all content is deleted. private: // Interface Item: - virtual void do_WriteOut( - csv::bostream & io_aFile ) const; + virtual void do_WriteOut( + csv::bostream & io_aFile ) const; // Local - virtual void op_streamout( - DYN Item * let_dpItem ) = 0; - virtual void op_streamout( - DYN Attribute * let_dpAttr ) = 0; + virtual void op_streamout( + DYN Item * let_dpItem ) = 0; + virtual void op_streamout( + DYN Attribute * let_dpAttr ) = 0; - virtual void do_SetContent( - DYN Item * let_dpItem ) = 0; + virtual void do_SetContent( + DYN Item * let_dpItem ) = 0; // Helpers virtual const ::csv::String & inq_TagName() const = 0; @@ -124,10 +124,10 @@ class Element : public Item virtual const AttrList * inq_Attrs() const = 0; - virtual bool FinishEmptyTag_XmlStyle() const; /// Defaulted to: true + virtual bool FinishEmptyTag_XmlStyle() const; /// Defaulted to: true - virtual bool LineBreakAfterBeginTag() const; /// Defaulted to: false - virtual bool LineBreakAfterEndTag() const; /// Defaulted to: true, if LineBreakAfterBeginTag() + virtual bool LineBreakAfterBeginTag() const; /// Defaulted to: false + virtual bool LineBreakAfterEndTag() const; /// Defaulted to: true, if LineBreakAfterBeginTag() }; class TextContent : public Item @@ -135,7 +135,7 @@ class TextContent : public Item }; -/* Implementation simplifiers: +/* Implementation simplifiers: EmptyElement, PureElement, SglTag */ @@ -143,31 +143,31 @@ class EmptyElement : public Element { private: // Interface Element: - virtual void op_streamout( /// does nothing - DYN Item * let_dpItem ); - virtual void op_streamout( - DYN Attribute * let_dpAttr ); - virtual void do_SetContent( /// does nothing - DYN Item * let_dpItem ); + virtual void op_streamout( /// does nothing + DYN Item * let_dpItem ); + virtual void op_streamout( + DYN Attribute * let_dpAttr ); + virtual void do_SetContent( /// does nothing + DYN Item * let_dpItem ); virtual const Item * - inq_Content() const; /// @return 0 + inq_Content() const; /// @return 0 virtual const AttrList * inq_Attrs() const; // Local - virtual AttrList & inq_RefAttrs() = 0; + virtual AttrList & inq_RefAttrs() = 0; }; class PureElement : public Element { private: // Interface Element: - virtual void op_streamout( - DYN Item * let_dpItem ); - virtual void op_streamout( /// does nothing - DYN Attribute * let_dpAttr ); - virtual void do_SetContent( - DYN Item * let_dpItem ); + virtual void op_streamout( + DYN Item * let_dpItem ); + virtual void op_streamout( /// does nothing + DYN Attribute * let_dpAttr ); + virtual void do_SetContent( + DYN Item * let_dpItem ); virtual const Item * inq_Content() const; virtual const AttrList * @@ -181,21 +181,21 @@ class SglTag : public Element { private: // Interface Element: - virtual void op_streamout( /// does nothing - DYN Item * let_dpItem ); - virtual void op_streamout( /// does nothing - DYN Attribute * let_dpAttr ); - virtual void do_SetContent( /// does nothing - DYN Item * let_dpItem ); + virtual void op_streamout( /// does nothing + DYN Item * let_dpItem ); + virtual void op_streamout( /// does nothing + DYN Attribute * let_dpAttr ); + virtual void do_SetContent( /// does nothing + DYN Item * let_dpItem ); virtual const Item * - inq_Content() const; /// @return 0 + inq_Content() const; /// @return 0 virtual const AttrList * inq_Attrs() const; /// @return 0 }; -/* Standard Element implementations, if there are not any +/* Standard Element implementations, if there are not any specialized ones. */ @@ -209,12 +209,12 @@ class AnElement : public Element ~AnElement(); private: // Interface Element - virtual void op_streamout( - DYN Item * let_dpItem ); - virtual void op_streamout( - DYN Attribute * let_dpAttr ); - virtual void do_SetContent( - DYN Item * let_dpItem ); + virtual void op_streamout( + DYN Item * let_dpItem ); + virtual void op_streamout( + DYN Attribute * let_dpAttr ); + virtual void do_SetContent( + DYN Item * let_dpItem ); virtual const ::csv::String & inq_TagName() const; virtual const Item * @@ -223,8 +223,8 @@ class AnElement : public Element inq_Attrs() const; // DATA ::csv::String sTagName; - Dyn< Item > pContent; - AttrList aAttrs; + Dyn< Item > pContent; + AttrList aAttrs; }; @@ -241,18 +241,18 @@ class AnEmptyElement : public EmptyElement virtual const ::csv::String & inq_TagName() const; // Interface EmptyElement: - virtual AttrList & inq_RefAttrs(); + virtual AttrList & inq_RefAttrs(); // DATA - ::csv::String sTagName; - AttrList aAttrs; + ::csv::String sTagName; + AttrList aAttrs; }; class APureElement : public PureElement { public: APureElement( - const ::csv::String & i_sTagName ); + const ::csv::String & i_sTagName ); APureElement( const char * i_sTagName ); ~APureElement(); @@ -265,7 +265,7 @@ class APureElement : public PureElement inq_RefContent(); // DATA ::csv::String sTagName; - Dyn< Item > pContent; + Dyn< Item > pContent; }; class ASglTag : public SglTag @@ -310,10 +310,10 @@ class AnAttribute : public Attribute -/* Implementations of TextContent: +/* Implementations of TextContent: - Text ( reserved characters will be replaced and appear unchanged ) - XmlCode ( reserved characters stay and are interpreted + Text ( reserved characters will be replaced and appear unchanged ) + XmlCode ( reserved characters stay and are interpreted by the XML-viewer ) */ class Text : public TextContent @@ -322,11 +322,11 @@ class Text : public TextContent Text( const ::csv::String & i_sText ); Text( - const char * i_sText ); + const char * i_sText ); ~Text(); private: - virtual void do_WriteOut( - csv::bostream & io_aFile ) const; + virtual void do_WriteOut( + csv::bostream & io_aFile ) const; // DATA ::csv::String sText; }; @@ -341,8 +341,8 @@ class XmlCode : public TextContent const char * i_sText ); ~XmlCode(); private: - virtual void do_WriteOut( - csv::bostream & io_aFile ) const; + virtual void do_WriteOut( + csv::bostream & io_aFile ) const; // DATA ::csv::String sText; }; @@ -352,7 +352,7 @@ class XmlCode : public TextContent // IMPLEMENTATION inline void -Item::WriteOut( csv::bostream & io_aFile ) const +Item::WriteOut( csv::bostream & io_aFile ) const { do_WriteOut(io_aFile); } inline const ::csv::String & @@ -363,7 +363,7 @@ Attribute::Value() const { return inq_Value(); } inline Element & -Element::operator<<( DYN Item * let_dpItem ) +Element::operator<<( DYN Item * let_dpItem ) { op_streamout(let_dpItem); return *this; } inline Element & Element::operator<<( const ::csv::String & let_drText ) @@ -378,7 +378,7 @@ inline Element & Element::operator>>( DYN Element & let_drElement ) { op_streamout(&let_drElement); return let_drElement; } inline Item * -Element::SetContent( DYN Item * let_dpItem ) +Element::SetContent( DYN Item * let_dpItem ) { do_SetContent(let_dpItem); return let_dpItem; } diff --git a/udm/source/html/htmlitem.cxx b/udm/source/html/htmlitem.cxx index bf34cc3b4d69..057b50f90b1b 100644 --- a/udm/source/html/htmlitem.cxx +++ b/udm/source/html/htmlitem.cxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -41,9 +41,9 @@ using namespace csi::xml; template <class ELEM> inline ELEM & -PushElem( Element & i_rMain, - DYN ELEM * let_dpSub, - DYN Item * let_dpItem ) +PushElem( Element & i_rMain, + DYN ELEM * let_dpSub, + DYN Item * let_dpItem ) { i_rMain << let_dpSub; if ( let_dpItem != 0 ) @@ -72,7 +72,7 @@ Image::Image( const String & i_sSrc, const String & i_sHeight, const String & i_sAlign, const String & i_sBorder ) - : AnEmptyElement( "img" ) + : AnEmptyElement( "img" ) { *this << new AnAttribute(String("src"),i_sSrc) << new AnAttribute(String("width"),i_sWidth) @@ -130,7 +130,7 @@ Table::Table( const String & i_sBorder, const String & i_sWidth, const String & i_sCellPadding, const String & i_sCellSpacing ) - : csi::xml::AnElement("table") + : csi::xml::AnElement("table") { if ( i_sBorder.length() > 0 ) *this << new AnAttribute(String("border"),i_sBorder); diff --git a/udm/source/inc/precomp.h b/udm/source/inc/precomp.h index 707e06869084..98288a7180e7 100644 --- a/udm/source/inc/precomp.h +++ b/udm/source/inc/precomp.h @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite diff --git a/udm/source/unittest/test.cxx b/udm/source/unittest/test.cxx index adfcbeeecae2..fb1aa09cbb66 100644 --- a/udm/source/unittest/test.cxx +++ b/udm/source/unittest/test.cxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite diff --git a/udm/source/xml/xmlitem.cxx b/udm/source/xml/xmlitem.cxx index fd63f99a5e17..78143a79f3ed 100644 --- a/udm/source/xml/xmlitem.cxx +++ b/udm/source/xml/xmlitem.cxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -40,37 +40,37 @@ namespace xml char cReplacable[256] = { - 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, // 0 - 49 - 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, - 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, - 0, 0, 0, 0, 1, 0, 0, 0, 1, 0, // ", & - 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, - - 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, // 50 - 99 - 1, 0, 1, 0, 0, 0, 0, 0, 0, 0, // <, > - 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, - 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, - 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, - - 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, // 100 - 149 - 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, - 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, - 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, - 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, - - 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, - 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, - 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, - 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, - 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, - - 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, - 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, - 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, - 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, - 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, - - 0, 0, 0, 0, 0, 1 // + 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, // 0 - 49 + 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, + 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, + 0, 0, 0, 0, 1, 0, 0, 0, 1, 0, // ", & + 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, + + 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, // 50 - 99 + 1, 0, 1, 0, 0, 0, 0, 0, 0, 0, // <, > + 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, + 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, + 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, + + 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, // 100 - 149 + 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, + 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, + 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, + 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, + + 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, + 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, + 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, + 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, + 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, + + 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, + 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, + 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, + 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, + 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, + + 0, 0, 0, 0, 0, 1 // }; @@ -80,26 +80,26 @@ class MultiItem : public Item MultiItem(); ~MultiItem(); - void Add( - DYN Item * let_dpDatum ) + void Add( + DYN Item * let_dpDatum ) { csv_assert( let_dpDatum != 0 ); aItems.push_back(let_dpDatum); } - void Erase() { aItems.erase_all(); } + void Erase() { aItems.erase_all(); } private: - virtual void do_WriteOut( - csv::bostream & io_aFile ) const; + virtual void do_WriteOut( + csv::bostream & io_aFile ) const; // DATA - ItemList aItems; + ItemList aItems; }; -void StreamOut( - Dyn< Item > & o_rContent, - DYN Item * let_dpItem ); +void StreamOut( + Dyn< Item > & o_rContent, + DYN Item * let_dpItem ); inline void -StreamOut( AttrList & o_rAttrs, - DYN Attribute * let_dpAttr ) +StreamOut( AttrList & o_rAttrs, + DYN Attribute * let_dpAttr ) { csv_assert( let_dpAttr != 0 ); o_rAttrs.push_back( let_dpAttr ); @@ -107,14 +107,14 @@ StreamOut( AttrList & o_rAttrs, inline void -Impl_SetContent( Dyn< Item > & o_rContent, - DYN Item * let_dpItem ) +Impl_SetContent( Dyn< Item > & o_rContent, + DYN Item * let_dpItem ) { o_rContent = let_dpItem; } -//********************* Attribute ****************************// +//********************* Attribute ****************************// const String attrValueBegin("=\""); const String attrValueEnd("\""); @@ -133,7 +133,7 @@ Attribute::WriteOut( csv::bostream & io_aFile ) const -//************************ Element ****************************// +//************************ Element ****************************// const String newline("\n"); const String space(" "); @@ -208,10 +208,10 @@ Element::LineBreakAfterEndTag() const } -//************************ EmptyElement ****************************// +//************************ EmptyElement ****************************// void -EmptyElement::op_streamout( DYN Item * ) +EmptyElement::op_streamout( DYN Item * ) { // Does nothing. } @@ -223,7 +223,7 @@ EmptyElement::op_streamout( DYN Attribute * let_dpAttr ) } void -EmptyElement::do_SetContent( DYN Item * ) +EmptyElement::do_SetContent( DYN Item * ) { // Does nothing. } @@ -241,7 +241,7 @@ EmptyElement::inq_Attrs() const } -//************************ PureElement ****************************// +//************************ PureElement ****************************// void PureElement::op_streamout( DYN Item * let_dpItem ) @@ -256,7 +256,7 @@ PureElement::op_streamout( DYN Attribute * ) } void -PureElement::do_SetContent( DYN Item * let_dpItem ) +PureElement::do_SetContent( DYN Item * let_dpItem ) { Impl_SetContent( inq_RefContent(), let_dpItem ); } @@ -274,7 +274,7 @@ PureElement::inq_Attrs() const } -//*************************** SglTag **************************// +//*************************** SglTag **************************// void SglTag::op_streamout( DYN Item * ) @@ -307,17 +307,17 @@ SglTag::inq_Attrs() const } -//*************************** AnElement **************************// +//*************************** AnElement **************************// AnElement::AnElement( const String & i_sTagName ) - : sTagName( i_sTagName ) + : sTagName( i_sTagName ) // pContent, // aAttrs { } AnElement::AnElement( const char * i_sTagName ) - : sTagName( i_sTagName ) + : sTagName( i_sTagName ) // pContent, // aAttrs { @@ -328,7 +328,7 @@ AnElement::~AnElement() } void -AnElement::op_streamout( DYN Item * let_dpItem ) +AnElement::op_streamout( DYN Item * let_dpItem ) { StreamOut( pContent, let_dpItem ); } @@ -364,16 +364,16 @@ AnElement::inq_Attrs() const } -//*************************** AnEmptyElement **************************// +//*************************** AnEmptyElement **************************// AnEmptyElement::AnEmptyElement( const String & i_sTagName ) - : sTagName( i_sTagName ) + : sTagName( i_sTagName ) // aAttrs { } AnEmptyElement::AnEmptyElement( const char * i_sTagName ) - : sTagName( i_sTagName ) + : sTagName( i_sTagName ) // aAttrs { } @@ -396,16 +396,16 @@ AnEmptyElement::inq_RefAttrs() } -//*************************** APureElement **************************// +//*************************** APureElement **************************// APureElement::APureElement( const String & i_sTagName ) - : sTagName( i_sTagName ) + : sTagName( i_sTagName ) // pContent { } APureElement::APureElement( const char * i_sTagName ) - : sTagName( i_sTagName ) + : sTagName( i_sTagName ) // pContent { } @@ -428,15 +428,15 @@ APureElement::inq_RefContent() -//*************************** ASglTag **************************// +//*************************** ASglTag **************************// ASglTag::ASglTag( const String & i_sTagName ) - : sTagName( i_sTagName ) + : sTagName( i_sTagName ) { } ASglTag::ASglTag( const char * i_sTagName ) - : sTagName( i_sTagName ) + : sTagName( i_sTagName ) { } @@ -451,17 +451,17 @@ ASglTag::inq_TagName() const } -//*************************** AnAttribute **************************// +//*************************** AnAttribute **************************// AnAttribute::AnAttribute( const String & i_sName, const String & i_sValue ) - : sName(i_sName), + : sName(i_sName), sValue(i_sValue) { } AnAttribute::AnAttribute( const char * i_sName, const char * i_sValue ) - : sName(i_sName), + : sName(i_sName), sValue(i_sValue) { } @@ -484,15 +484,15 @@ AnAttribute::inq_Value() const -//*************************** Text **************************// +//*************************** Text **************************// Text::Text( const String & i_sText ) - : sText(i_sText) + : sText(i_sText) { } Text::Text( const char * i_sText ) - : sText(i_sText) + : sText(i_sText) { } @@ -519,16 +519,16 @@ Text::do_WriteOut( csv::bostream & io_aFile ) const switch (*pOut) { - case '<': io_aFile.write("<"); break; - case '>': io_aFile.write(">"); break; - case '"': io_aFile.write("""); break; - case '&': io_aFile.write("&"); break; - case 255: io_aFile.write(" "); break; + case '<': io_aFile.write("<"); break; + case '>': io_aFile.write(">"); break; + case '"': io_aFile.write("""); break; + case '&': io_aFile.write("&"); break; + case 255: io_aFile.write(" "); break; } pStart = pOut+1; - } // endif (cReplacable[*pOut]) - } // end for + } // endif (cReplacable[*pOut]) + } // end for if ( pOut != pStart ) { @@ -537,15 +537,15 @@ Text::do_WriteOut( csv::bostream & io_aFile ) const } -//*************************** XmlCode **************************// +//*************************** XmlCode **************************// XmlCode::XmlCode( const String & i_sText ) - : sText(i_sText) + : sText(i_sText) { } XmlCode::XmlCode( const char * i_sText ) - : sText(i_sText) + : sText(i_sText) { } @@ -560,7 +560,7 @@ XmlCode::do_WriteOut( csv::bostream & io_aFile ) const } -//*************************** MultiItem **************************// +//*************************** MultiItem **************************// MultiItem::MultiItem() { @@ -571,7 +571,7 @@ MultiItem::~MultiItem() } void -MultiItem::do_WriteOut( csv::bostream & io_aFile ) const +MultiItem::do_WriteOut( csv::bostream & io_aFile ) const { ItemList::iterator itEnd = aItems.end(); @@ -586,11 +586,11 @@ MultiItem::do_WriteOut( csv::bostream & io_aFile ) const -//*************************** Helpers **************************// +//*************************** Helpers **************************// void -StreamOut( Dyn< Item > & o_rContent, - DYN Item * let_dpItem ) +StreamOut( Dyn< Item > & o_rContent, + DYN Item * let_dpItem ) { MultiItem * pContent = 0; if ( bool(o_rContent) ) |