INTEGRATION: CWS fs08 (1.2.38); FILE MERGED

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

4 files changed, 80 insertions, 52 deletions

diff --git a/writerperfect/source/filter/FilterInternal.hxx b/writerperfect/source/filter/FilterInternal.hxx
index dba9e6c43eca..adc993c6d9d3 100644
--- a/writerperfect/source/filter/FilterInternal.hxx
+++ b/writerperfect/source/filter/FilterInternal.hxx
@@ -26,10 +26,6 @@
 #define WRITER_DEBUG_MSG(M)
 #endif
 
-#if 0
-#include <rtl/string.hxx>
-inline rtl::OString utf8_itoa(int i)
-{
-    return rtl::OString::valueOf( (sal_Int32) i );
-}
-#endif
+const float fDefaultSideMargin = 1.0f; // inches
+const float fDefaultPageWidth = 8.5f; // inches (OOo required default: we will handle this later)
+const float fDefaultPageHeight = 11.0f; // inches
diff --git a/writerperfect/source/filter/FontStyle.cxx b/writerperfect/source/filter/FontStyle.cxx
index fffd35bbdd2b..de7cc47002dc 100644
--- a/writerperfect/source/filter/FontStyle.cxx
+++ b/writerperfect/source/filter/FontStyle.cxx
@@ -38,13 +38,13 @@ FontStyle::~FontStyle()
 {
 }
 
-void FontStyle::write(DocumentHandler &xHandler) const
+void FontStyle::write(DocumentHandler *pHandler) const
 {
     TagOpenElement styleOpen("style:font-decl");
     styleOpen.addAttribute("style:name", getName());
     styleOpen.addAttribute("fo:font-family", msFontFamily);
     styleOpen.addAttribute("style:font-pitch", msFontPitch);
-    styleOpen.write(xHandler);
+    styleOpen.write(pHandler);
     TagCloseElement styleClose("style:font-decl");
-    styleClose.write(xHandler);
+    styleClose.write(pHandler);
 }
diff --git a/writerperfect/source/filter/FontStyle.hxx b/writerperfect/source/filter/FontStyle.hxx
index 7b8cb62854a9..0643fc2d01ba 100644
--- a/writerperfect/source/filter/FontStyle.hxx
+++ b/writerperfect/source/filter/FontStyle.hxx
@@ -36,7 +36,7 @@ class FontStyle : public Style
 public:
     FontStyle(const char *psName, const char *psFontFamily);
     ~FontStyle();
-    virtual void write(DocumentHandler &xHandler) const;
+    virtual void write(DocumentHandler *pHandler) const;
     const WPXString &getFontFamily() const { return msFontFamily; }
 
 private:
diff --git a/writerperfect/source/filter/PageSpan.cxx b/writerperfect/source/filter/PageSpan.cxx
index e407ffebd50e..e71687e444ae 100644
--- a/writerperfect/source/filter/PageSpan.cxx
+++ b/writerperfect/source/filter/PageSpan.cxx
@@ -29,22 +29,7 @@
 #include "PageSpan.hxx"
 #include "DocumentElement.hxx"
 
-const float fDefaultPageWidth = 8.5f; // inches (OOo required default: we will handle this later)
-const float fDefaultPageHeight = 11.0f; // inches
-
 PageSpan::PageSpan(const WPXPropertyList &xPropList) :
-#if 0
-const int iSpan, const float fFormLength, const float fFormWidth, const WPXFormOrientation fFormOrientation,
-                   const float fLeftMargin, const float fRightMargin, const float fTopMargin, const float fBottomMargin):
-    miSpan(iSpan),
-    mfFormLength(fFormLength),
-    mfFormWidth(fFormWidth),
-    mfFormOrientation(fFormOrientation),
-    mfMarginLeft(fLeftMargin),
-    mfMarginRight(fRightMargin),
-    mfMarginTop(fTopMargin),
-    mfMarginBottom(fBottomMargin),
-#endif
         mxPropList(xPropList),
     mpHeaderContent(NULL),
     mpFooterContent(NULL),
@@ -55,10 +40,43 @@ const int iSpan, const float fFormLength, const float fFormWidth, const WPXFormO
 
 PageSpan::~PageSpan()
 {
-    delete mpHeaderContent;
-    delete mpHeaderLeftContent;
-    delete mpFooterContent;
-    delete mpFooterLeftContent;
+    typedef std::vector<DocumentElement *>::iterator DEVIter;
+
+    if (mpHeaderContent)
+    {
+        for (DEVIter iterHeaderContent = mpHeaderContent->begin();
+            iterHeaderContent != mpHeaderContent->end();
+            iterHeaderContent++)
+                delete(*iterHeaderContent);
+        delete mpHeaderContent;
+    }
+
+    if (mpHeaderLeftContent)
+    {
+        for (DEVIter iterHeaderLeftContent = mpHeaderLeftContent->begin();
+            iterHeaderLeftContent != mpHeaderLeftContent->end();
+            iterHeaderLeftContent++)
+                delete(*iterHeaderLeftContent);
+        delete mpHeaderLeftContent;
+    }
+
+    if (mpFooterContent)
+    {
+        for (DEVIter iterFooterContent = mpFooterContent->begin();
+            iterFooterContent != mpFooterContent->end();
+            iterFooterContent++)
+                delete(*iterFooterContent);
+        delete mpFooterContent;
+    }
+
+    if (mpFooterLeftContent)
+    {
+        for (DEVIter iterFooterLeftContent = mpFooterLeftContent->begin();
+            iterFooterLeftContent != mpFooterLeftContent->end();
+            iterFooterLeftContent++)
+                delete(*iterFooterLeftContent);
+        delete mpFooterLeftContent;
+    }
 }
 
 int PageSpan::getSpan() const
@@ -85,27 +103,40 @@ float PageSpan::getMarginRight() const
          return 0.0f;
 }
 
-void PageSpan::writePageMaster(const int iNum, DocumentHandler &xHandler) const
+void PageSpan::writePageMaster(const int iNum, DocumentHandler *pHandler) const
 {
         WPXPropertyList propList;
 
     WPXString sPageMasterName;
-        sPageMasterName.sprintf("PM%i", iNum);
+        sPageMasterName.sprintf("PM%i", iNum /* +2 */);
         propList.insert("style:name", sPageMasterName);
-    propList.insert("style:name", sPageMasterName);
-    xHandler.startElement("style:page-master", propList);
-
-        xHandler.startElement("style:properties", mxPropList);
 
-        xHandler.endElement("style:properties");
-        xHandler.endElement("style:page-master");
+    pHandler->startElement("style:page-master", propList);
+
+    WPXPropertyList tempPropList = mxPropList;
+    if (!tempPropList["style:writing-mode"])
+        tempPropList.insert("style:writing-mode", WPXString("lr-tb"));
+    if (!tempPropList["style:footnote-max-height"])
+        tempPropList.insert("style:footnote-max-height", WPXString("0inch"));
+        pHandler->startElement("style:properties", tempPropList);
+
+    WPXPropertyList footnoteSepPropList;
+    footnoteSepPropList.insert("style:width", WPXString("0.0071inch"));
+    footnoteSepPropList.insert("style:distance-before-sep", WPXString("0.0398inch"));
+    footnoteSepPropList.insert("style:distance-after-sep", WPXString("0.0398inch"));
+    footnoteSepPropList.insert("style:adjustment", WPXString("left"));
+    footnoteSepPropList.insert("style:rel-width", WPXString("25%"));
+    footnoteSepPropList.insert("style:color", WPXString("#000000"));
+    pHandler->startElement("style:footnote-sep", footnoteSepPropList);
+
+    pHandler->endElement("style:footnote-sep");
+        pHandler->endElement("style:properties");
+        pHandler->endElement("style:page-master");
 }
 
 void PageSpan::writeMasterPages(const int iStartingNum, const int iPageMasterNum, const bool bLastPageSpan,
-                                DocumentHandler &xHandler) const
+                                DocumentHandler *pHandler) const
 {
-        WPXPropertyList propList; // scratch space
-
     int iSpan = 0;
     (bLastPageSpan) ? iSpan = 1 : iSpan = getSpan();
 
@@ -115,7 +146,8 @@ void PageSpan::writeMasterPages(const int iStartingNum, const int iPageMasterNum
         WPXString sMasterPageName;
         sMasterPageName.sprintf("Page Style %i", i);
         WPXString sPageMasterName;
-        sPageMasterName.sprintf("PM%i", iPageMasterNum);
+        sPageMasterName.sprintf("PM%i", iPageMasterNum /* +2 */);
+        WPXPropertyList propList;
                 propList.insert("style:name", sMasterPageName);
         propList.insert("style:page-master-name", sPageMasterName);
         if (!bLastPageSpan)
@@ -124,34 +156,34 @@ void PageSpan::writeMasterPages(const int iStartingNum, const int iPageMasterNum
             sNextMasterPageName.sprintf("Page Style %i", (i+1));
                         propList.insert("style:next-style-name", sNextMasterPageName);
         }
-                xHandler.startElement("style:master-page", propList);
+                pHandler->startElement("style:master-page", propList);
 
         if (mpHeaderContent)
-            _writeHeaderFooter("style:header", *mpHeaderContent, xHandler);
+            _writeHeaderFooter("style:header", *mpHeaderContent, pHandler);
         if (mpHeaderLeftContent)
-            _writeHeaderFooter("style:header-left", *mpHeaderLeftContent, xHandler);
+            _writeHeaderFooter("style:header-left", *mpHeaderLeftContent, pHandler);
         if (mpFooterContent)
-            _writeHeaderFooter("style:footer", *mpFooterContent, xHandler);
+            _writeHeaderFooter("style:footer", *mpFooterContent, pHandler);
         if (mpFooterLeftContent)
-            _writeHeaderFooter("style:footer-left", *mpFooterLeftContent, xHandler);
+            _writeHeaderFooter("style:footer-left", *mpFooterLeftContent, pHandler);
 
-                xHandler.endElement("style:master-page");
+                pHandler->endElement("style:master-page");
     }
 
 }
 
 void PageSpan::_writeHeaderFooter(const char *headerFooterTagName,
                   const std::vector<DocumentElement *> & headerFooterContent,
-                  DocumentHandler &xHandler) const
+                  DocumentHandler *pHandler) const
 {
     TagOpenElement headerFooterOpen(headerFooterTagName);
-    headerFooterOpen.write(xHandler);
+    headerFooterOpen.write(pHandler);
     for (std::vector<DocumentElement *>::const_iterator iter = headerFooterContent.begin();
          iter != headerFooterContent.end();
          iter++) {
-        (*iter)->write(xHandler);
+        (*iter)->write(pHandler);
     }
     TagCloseElement headerFooterClose(headerFooterTagName);
-    headerFooterClose.write(xHandler);
+    headerFooterClose.write(pHandler);
 }