INTEGRATION: CWS libwpdupgrade (1.1.2); FILE MERGED

2005/02/08 18:55:21 rene 1.1.2.2: fix namespace problems on Solaris/SPARC

again from fridrich_strba@
2005/02/02 20:44:44 rene 1.1.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, 23 insertions, 29 deletions

diff --git a/writerperfect/source/filter/PageSpan.hxx b/writerperfect/source/filter/PageSpan.hxx
index ea4b4c606464..0693e9addc70 100644
--- a/writerperfect/source/filter/PageSpan.hxx
+++ b/writerperfect/source/filter/PageSpan.hxx
@@ -1,7 +1,7 @@
 /* PageSpan: Stores (and writes) page-based information (e.g.: margins,
  * headers/footers)
  *
- * Copyright (C) 2002-2003 William Lachance (william.lachance@sympatico.ca)
+ * Copyright (C) 2002-2004 William Lachance (william.lachance@sympatico.ca)
  *
  * This program is free software; you can redistribute it and/or
  * modify it under the terms of the GNU Lesser General Public
@@ -27,46 +27,40 @@
 #ifndef _PAGESPAN_H
 #define _PAGESPAN_H
 #include <libwpd/libwpd.h>
-
-#ifndef _COM_SUN_STAR_XML_SAX_XDOCUMENTHANDLER_HPP_
-#include <com/sun/star/xml/sax/XDocumentHandler.hpp>
-#endif
-
-using com::sun::star::uno::Reference;
-using com::sun::star::xml::sax::XDocumentHandler;
+#include <vector>
 
 class DocumentElement;
+class DocumentHandler;
 
 class PageSpan
 {
 public:
-    PageSpan(const int iSpan, const float fFormLength, const float fFormWidth, const WPXFormOrientation fFormOrientation,
-             const float fLeftMargin, const float fRightMargin, const float fTopMargin, const float fBottomMargin);
+    PageSpan(const WPXPropertyList &xPropList);
     virtual ~PageSpan();
-    void writePageMaster(const int iNum, Reference < XDocumentHandler > &xHandler) const;
-    void writeMasterPages(const int iStartingNum, const int iPageMasterNum, const bool bLastPageSpan, Reference < XDocumentHandler > &xHandler) const;
-    const int getSpan() const { return miSpan; }
+    void writePageMaster(const int iNum, DocumentHandler &xHandler) const;
+    void writeMasterPages(const int iStartingNum, const int iPageMasterNum, const bool bLastPageSpan, DocumentHandler &xHandler) const;
+    int getSpan() const;
+#if 0
     float getFormLength() { return mfFormLength; }
     float getFormWidth() { return mfFormWidth; }
     WPXFormOrientation getFormOrientation() { return mfFormOrientation; }
-    float getMarginLeft() { return mfMarginLeft; }
-    float getMarginRight() { return mfMarginRight; }
+#endif
+    float getMarginLeft() const;
+    float getMarginRight() const;
 
-    const vector<DocumentElement *> * getHeaderContent() const { return mpHeaderContent; }
-    void setHeaderContent(vector<DocumentElement *> * pHeaderContent) { mpHeaderContent = pHeaderContent; }
-    void setFooterContent(vector<DocumentElement *> * pFooterContent) { mpFooterContent = pFooterContent; }
-    void setHeaderLeftContent(vector<DocumentElement *> * pHeaderContent) { mpHeaderLeftContent = pHeaderContent; }
-    void setFooterLeftContent(vector<DocumentElement *> * pFooterContent) { mpFooterLeftContent = pFooterContent; }
+    const std::vector<DocumentElement *> * getHeaderContent() const { return mpHeaderContent; }
+    void setHeaderContent(std::vector<DocumentElement *> * pHeaderContent) { mpHeaderContent = pHeaderContent; }
+    void setFooterContent(std::vector<DocumentElement *> * pFooterContent) { mpFooterContent = pFooterContent; }
+    void setHeaderLeftContent(std::vector<DocumentElement *> * pHeaderContent) { mpHeaderLeftContent = pHeaderContent; }
+    void setFooterLeftContent(std::vector<DocumentElement *> * pFooterContent) { mpFooterLeftContent = pFooterContent; }
 protected:
-    void _writeHeaderFooter(const char *headerFooterTagName, const vector<DocumentElement *> & headerFooterContent,
-                Reference < XDocumentHandler > &xHandler) const;
+    void _writeHeaderFooter(const char *headerFooterTagName, const std::vector<DocumentElement *> & headerFooterContent,
+                DocumentHandler &xHandler) const;
 private:
-    int miSpan;
-    float mfFormLength, mfFormWidth, mfMarginLeft, mfMarginRight, mfMarginTop, mfMarginBottom;
-    WPXFormOrientation mfFormOrientation;
-    vector<DocumentElement *> * mpHeaderContent;
-    vector<DocumentElement *> * mpFooterContent;
-    vector<DocumentElement *> * mpHeaderLeftContent;
-    vector<DocumentElement *> * mpFooterLeftContent;
+        WPXPropertyList mxPropList;
+    std::vector<DocumentElement *> * mpHeaderContent;
+    std::vector<DocumentElement *> * mpFooterContent;
+    std::vector<DocumentElement *> * mpHeaderLeftContent;
+    std::vector<DocumentElement *> * mpFooterLeftContent;
 };
 #endif