INTEGRATION: CWS libwpdupgrade (1.2.2); FILE MERGED

2005/02/08 18:55:20 rene 1.2.2.2: fix namespace problems on Solaris/SPARC

again from fridrich_strba@
2005/02/02 20:44:41 rene 1.2.2.1: upgrade writerperfect to new libwpd API and implement --with-system-libwpd.
Remove old libwpd/ stuff, tarball will come when the actual release happened :-)

1 files changed, 15 insertions, 25 deletions

diff --git a/writerperfect/source/filter/DocumentElement.hxx b/writerperfect/source/filter/DocumentElement.hxx
index e322683bc9fc..fab8a98f5369 100644
--- a/writerperfect/source/filter/DocumentElement.hxx
+++ b/writerperfect/source/filter/DocumentElement.hxx
@@ -28,27 +28,17 @@
 #ifndef _DOCUMENTELEMENT_H
 #define _DOCUMENTELEMENT_H
 #include <libwpd/libwpd.h>
-#include <libwpd/libwpd_support.h>
+#include <libwpd/WPXProperty.h>
+#include <libwpd/WPXString.h>
 #include <vector>
 
-using namespace std;
-
-#include "WordPerfectCollector.hxx"
-#include "TextRunStyle.hxx"
-#include "SectionStyle.hxx"
-#include "TableStyle.hxx"
-
-#ifndef _COM_SUN_STAR_XML_SAX_XDOCUMENTHANDLER_HPP_
-#include <com/sun/star/xml/sax/XDocumentHandler.hpp>
-#endif
-
-#include <xmloff/attrlist.hxx>
+#include "DocumentHandler.hxx"
 
 class DocumentElement
 {
 public:
     virtual ~DocumentElement() {}
-    virtual void write(Reference < XDocumentHandler > &xHandler) const = 0;
+    virtual void write(DocumentHandler &xHandler) const = 0;
     virtual void print() const {}
 };
 
@@ -56,10 +46,10 @@ class TagElement : public DocumentElement
 {
 public:
     TagElement(const char *szTagName) : msTagName(szTagName) {}
-    const UTF8String & getTagName() const { return msTagName; }
+    const WPXString & getTagName() const { return msTagName; }
     virtual void print() const;
 private:
-    UTF8String msTagName;
+    WPXString msTagName;
 };
 
 class TagOpenElement : public TagElement
@@ -67,37 +57,37 @@ class TagOpenElement : public TagElement
 public:
     TagOpenElement(const char *szTagName) : TagElement(szTagName) {}
     ~TagOpenElement() {}
-    void addAttribute(const char *szAttributeName, const char *szAttributeValue);
-    virtual void write(Reference < XDocumentHandler > &xHandler) const;
+    void addAttribute(const char *szAttributeName, const WPXString &sAttributeValue);
+    virtual void write(DocumentHandler &xHandler) const;
     virtual void print () const;
 private:
-    SvXMLAttributeList maAttrList;
+    WPXPropertyList maAttrList;
 };
 
 class TagCloseElement : public TagElement
 {
 public:
     TagCloseElement(const char *szTagName) : TagElement(szTagName) {}
-    virtual void write(Reference < XDocumentHandler > &xHandler) const;
+    virtual void write(DocumentHandler &xHandler) const;
 };
 
 class CharDataElement : public DocumentElement
 {
 public:
     CharDataElement(const char *sData) : DocumentElement(), msData(sData) {}
-    virtual void write(Reference < XDocumentHandler > &xHandler) const;
+    virtual void write(DocumentHandler &xHandler) const;
 private:
-    UTF8String msData;
+    WPXString msData;
 };
 
 class TextElement : public DocumentElement
 {
 public:
-    TextElement(const UCSString & sTextBuf);
-    virtual void write(Reference < XDocumentHandler > &xHandler) const;
+    TextElement(const WPXString & sTextBuf);
+    virtual void write(DocumentHandler &xHandler) const;
 
 private:
-    UCSString msTextBuf;
+    WPXString msTextBuf;
 };
 
 #endif