Realy not need to make this one depend on boost

4 files changed, 12 insertions, 19 deletions

diff --git a/writerperfect/source/filter/InternalHandler.hxx b/writerperfect/source/filter/InternalHandler.hxx
index a7b58f9af4c2..bb756beb06cd 100644
--- a/writerperfect/source/filter/InternalHandler.hxx
+++ b/writerperfect/source/filter/InternalHandler.hxx
@@ -29,9 +29,8 @@
 #include <libwpd/WPXString.h>
 #include "DocumentElement.hxx"
 #include "OdfDocumentHandler.hxx"
-#include <boost/noncopyable.hpp>
 
-class InternalHandler : public OdfDocumentHandler, private boost::noncopyable
+class InternalHandler : public OdfDocumentHandler
 {
 public:
     InternalHandler(std::vector<DocumentElement *> *elements);
diff --git a/writerperfect/source/filter/ListStyle.cxx b/writerperfect/source/filter/ListStyle.cxx
index 9b705f5ba753..0b56cef2bbc4 100644
--- a/writerperfect/source/filter/ListStyle.cxx
+++ b/writerperfect/source/filter/ListStyle.cxx
@@ -136,11 +136,10 @@ void UnorderedListLevelStyle::write(OdfDocumentHandler *pHandler, int iLevel) co
 
 ListStyle::ListStyle(const char *psName, const int iListID) :
     Style(psName),
-    miNumListLevels(0),
     miListID(iListID)
 {
     for (int i=0; i<WP6_NUM_LIST_LEVELS; ++i)
-        mppListLevels[i] = NULL;
+        mppListLevels[i] = 0;
 
 }
 
@@ -156,7 +155,7 @@ ListStyle::~ListStyle()
 
 bool ListStyle::isListLevelDefined(int iLevel) const
 {
-    if (mppListLevels[iLevel] == NULL)
+    if (!mppListLevels[iLevel])
         return false;
 
     return true;
@@ -167,7 +166,7 @@ void ListStyle::setListLevel(int iLevel, ListLevelStyle *iListLevelStyle)
     // can't uncomment this next line without adding some extra logic.
     // figure out which is best: use the initial message, or constantly
     // update?
-    if (mppListLevels[iLevel] == NULL)
+    if (!mppListLevels[iLevel])
         mppListLevels[iLevel] = iListLevelStyle;
 }
 
@@ -179,7 +178,7 @@ void ListStyle::write(OdfDocumentHandler *pHandler) const
 
     for (int i=0; i<WP6_NUM_LIST_LEVELS; ++i)
     {
-        if (mppListLevels[i] != NULL)
+        if (mppListLevels[i])
             mppListLevels[i]->write(pHandler, i);
     }
 
diff --git a/writerperfect/source/filter/PageSpan.cxx b/writerperfect/source/filter/PageSpan.cxx
index 54161a59c9f8..cb7da9729194 100644
--- a/writerperfect/source/filter/PageSpan.cxx
+++ b/writerperfect/source/filter/PageSpan.cxx
@@ -26,19 +26,16 @@
 /* "This product is not manufactured, approved, or supported by
  * Corel Corporation or Corel Corporation Limited."
  */
-
-#include <stdlib.h>
-
 #include "FilterInternal.hxx"
 #include "PageSpan.hxx"
 #include "DocumentElement.hxx"
 
 PageSpan::PageSpan(const WPXPropertyList &xPropList) :
     mxPropList(xPropList),
-    mpHeaderContent(NULL),
-    mpFooterContent(NULL),
-    mpHeaderLeftContent(NULL),
-    mpFooterLeftContent(NULL)
+    mpHeaderContent(0),
+    mpFooterContent(0),
+    mpHeaderLeftContent(0),
+    mpFooterLeftContent(0)
 {
 }
 
diff --git a/writerperfect/source/filter/Style.hxx b/writerperfect/source/filter/Style.hxx
index 6126e2660fc1..2dd41a49b20d 100644
--- a/writerperfect/source/filter/Style.hxx
+++ b/writerperfect/source/filter/Style.hxx
@@ -28,16 +28,14 @@
 
 #ifndef _STYLE_H
 #define _STYLE_H
-#include <cstdlib>
 #include <libwpd/libwpd.h>
 #include "libwriterperfect_filter.hxx"
 #include "DocumentElement.hxx"
-#include <boost/noncopyable.hpp>
 
-class TopLevelElementStyle : private boost::noncopyable
+class TopLevelElementStyle
 {
 public:
-    TopLevelElementStyle() : mpsMasterPageName(NULL) { }
+    TopLevelElementStyle() : mpsMasterPageName(0) {}
     virtual ~TopLevelElementStyle()
     {
         if (mpsMasterPageName) delete mpsMasterPageName;
@@ -73,7 +71,7 @@ private:
     WPXString msName;
 };
 
-class StyleManager : private boost::noncopyable
+class StyleManager
 {
 public:
     StyleManager() {}