INTEGRATION: CWS fs08 (1.2.38); FILE MERGED

2006/12/19 10:09:06 fridrich_strba 1.2.38.1: removing memory leaks and warnings with GNU/Linux gcc 3.4.5

3 files changed, 7 insertions, 12 deletions

diff --git a/writerperfect/source/filter/PageSpan.hxx b/writerperfect/source/filter/PageSpan.hxx
index 0693e9addc70..dee598d846a5 100644
--- a/writerperfect/source/filter/PageSpan.hxx
+++ b/writerperfect/source/filter/PageSpan.hxx
@@ -37,14 +37,9 @@ class PageSpan
 public:
     PageSpan(const WPXPropertyList &xPropList);
     virtual ~PageSpan();
-    void writePageMaster(const int iNum, DocumentHandler &xHandler) const;
-    void writeMasterPages(const int iStartingNum, const int iPageMasterNum, const bool bLastPageSpan, DocumentHandler &xHandler) const;
+    void writePageMaster(const int iNum, DocumentHandler *pHandler) const;
+    void writeMasterPages(const int iStartingNum, const int iPageMasterNum, const bool bLastPageSpan, DocumentHandler *pHandler) const;
     int getSpan() const;
-#if 0
-    float getFormLength() { return mfFormLength; }
-    float getFormWidth() { return mfFormWidth; }
-    WPXFormOrientation getFormOrientation() { return mfFormOrientation; }
-#endif
     float getMarginLeft() const;
     float getMarginRight() const;
 
@@ -55,7 +50,7 @@ public:
     void setFooterLeftContent(std::vector<DocumentElement *> * pFooterContent) { mpFooterLeftContent = pFooterContent; }
 protected:
     void _writeHeaderFooter(const char *headerFooterTagName, const std::vector<DocumentElement *> & headerFooterContent,
-                DocumentHandler &xHandler) const;
+                DocumentHandler *pHandler) const;
 private:
         WPXPropertyList mxPropList;
     std::vector<DocumentElement *> * mpHeaderContent;
diff --git a/writerperfect/source/filter/SectionStyle.hxx b/writerperfect/source/filter/SectionStyle.hxx
index e0deb4fbfc81..612087152cc4 100644
--- a/writerperfect/source/filter/SectionStyle.hxx
+++ b/writerperfect/source/filter/SectionStyle.hxx
@@ -37,7 +37,7 @@ class SectionStyle : public Style
 {
 public:
     SectionStyle(const WPXPropertyList &xPropList, const WPXPropertyListVector &xColumns, const char *psName);
-    virtual void write(DocumentHandler &xHandler) const;
+    virtual void write(DocumentHandler *pHandler) const;
 
 private:
         WPXPropertyList mPropList;
diff --git a/writerperfect/source/filter/TableStyle.hxx b/writerperfect/source/filter/TableStyle.hxx
index 678c592272e8..66f12f8bc9ce 100644
--- a/writerperfect/source/filter/TableStyle.hxx
+++ b/writerperfect/source/filter/TableStyle.hxx
@@ -40,7 +40,7 @@ class TableCellStyle : public Style
 {
 public:
     TableCellStyle(const WPXPropertyList &xPropList, const char *psName);
-    virtual void write(DocumentHandler &xHandler) const;
+    virtual void write(DocumentHandler *pHandler) const;
 private:
         WPXPropertyList mPropList;
 };
@@ -49,7 +49,7 @@ class TableRowStyle : public Style
 {
 public:
     TableRowStyle(const WPXPropertyList &propList, const char *psName);
-    virtual void write(DocumentHandler &xHandler) const;
+    virtual void write(DocumentHandler *pHandler) const;
 private:
         WPXPropertyList mPropList;
 };
@@ -59,7 +59,7 @@ class TableStyle : public Style, public TopLevelElementStyle
 public:
     TableStyle(const WPXPropertyList &xPropList, const WPXPropertyListVector &columns, const char *psName);
     ~TableStyle();
-    virtual void write(DocumentHandler &xHandler) const;
+    virtual void write(DocumentHandler *pHandler) const;
     const int getNumColumns() const { return mColumns.count(); }
     void addTableCellStyle(TableCellStyle *pTableCellStyle) { mTableCellStyles.push_back(pTableCellStyle); }
     int getNumTableCellStyles() { return mTableCellStyles.size(); }