First step for a MWAWImportFilter

Change-Id: I03f48d26a4bafcd82cb96b1b90a7f49f3ea433ce

7 files changed, 1114 insertions, 3 deletions

diff --git a/writerperfect/Library_wpftwriter.mk b/writerperfect/Library_wpftwriter.mk
index c3d1dde1b9c0..00d8107ced0f 100644
--- a/writerperfect/Library_wpftwriter.mk
+++ b/writerperfect/Library_wpftwriter.mk
@@ -52,10 +52,13 @@ $(eval $(call gb_Library_use_externals,wpftwriter,\
 	wpd \
 	wpg \
 	wps \
+	mwaw \
+	zlib \
 ))
 
 $(eval $(call gb_Library_add_exception_objects,wpftwriter,\
 	writerperfect/source/writer/MSWorksImportFilter \
+	writerperfect/source/writer/MWAWImportFilter \
 	writerperfect/source/writer/WordPerfectImportFilter \
 	writerperfect/source/writer/wpftwriter_genericfilter \
 ))
diff --git a/writerperfect/source/writer/MSWorksImportFilter.cxx b/writerperfect/source/writer/MSWorksImportFilter.cxx
index 6c37a36e11fa..11b294d11a44 100644
--- a/writerperfect/source/writer/MSWorksImportFilter.cxx
+++ b/writerperfect/source/writer/MSWorksImportFilter.cxx
@@ -55,7 +55,6 @@ using com::sun::star::xml::sax::XAttributeList;
 using com::sun::star::xml::sax::XDocumentHandler;
 using com::sun::star::xml::sax::XParser;
 
-void callHandler(Reference < XDocumentHandler > xDocHandler);
 
 sal_Bool SAL_CALL MSWorksImportFilter::importImpl( const Sequence< ::com::sun::star::beans::PropertyValue >& aDescriptor )
 throw (RuntimeException)
diff --git a/writerperfect/source/writer/MWAWImportFilter.cxx b/writerperfect/source/writer/MWAWImportFilter.cxx
new file mode 100644
index 000000000000..c282a33e6bb7
--- /dev/null
+++ b/writerperfect/source/writer/MWAWImportFilter.cxx
@@ -0,0 +1,1012 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
+/* MWAWImportFilter: Sets up the filter, and calls DocumentCollector
+ * to do the actual filtering
+ *
+ * This file is part of the LibreOffice project.
+ *
+ * This Source Code Form is subject to the terms of the Mozilla Public
+ * License, v. 2.0. If a copy of the MPL was not distributed with this
+ * file, You can obtain one at http://mozilla.org/MPL/2.0/.
+ */
+
+#include <osl/diagnose.h>
+#include <rtl/tencinfo.h>
+
+#include <com/sun/star/io/XInputStream.hpp>
+#include <com/sun/star/xml/sax/XAttributeList.hpp>
+#include <com/sun/star/xml/sax/XDocumentHandler.hpp>
+#include <com/sun/star/xml/sax/InputSource.hpp>
+#include <com/sun/star/xml/sax/XParser.hpp>
+#include <com/sun/star/io/XSeekable.hpp>
+#include <com/sun/star/uno/Reference.h>
+
+#include <comphelper/componentcontext.hxx>
+#include <xmloff/attrlist.hxx>
+#include <ucbhelper/content.hxx>
+
+#include <libmwaw/libmwaw.hxx>
+
+#include "filter/FilterInternal.hxx"
+#include "filter/DocumentHandler.hxx"
+#include "filter/OdtGenerator.hxx"
+#include "MWAWImportFilter.hxx"
+#include "stream/WPXSvStream.h"
+
+#include <iostream>
+
+using namespace ::com::sun::star::uno;
+using rtl::OUString;
+using com::sun::star::uno::Sequence;
+using com::sun::star::uno::Reference;
+using com::sun::star::uno::Any;
+using com::sun::star::uno::UNO_QUERY;
+using com::sun::star::uno::XInterface;
+using com::sun::star::uno::Exception;
+using com::sun::star::uno::RuntimeException;
+using com::sun::star::beans::PropertyValue;
+using com::sun::star::document::XFilter;
+using com::sun::star::document::XExtendedFilterDetection;
+using com::sun::star::ucb::XCommandEnvironment;
+
+using com::sun::star::io::XInputStream;
+using com::sun::star::document::XImporter;
+using com::sun::star::xml::sax::InputSource;
+using com::sun::star::xml::sax::XAttributeList;
+using com::sun::star::xml::sax::XDocumentHandler;
+using com::sun::star::xml::sax::XParser;
+
+namespace
+{
+
+//! Internal: creates the string "f pt"
+static std::string getStringPt(double f)
+{
+    std::stringstream s;
+    s << float(f) << "pt";
+    return s.str();
+}
+
+static double getSizeInPt(WPXProperty const &prop)
+{
+    WPXString str = prop.getStr();
+    if (!str.len()) return 0.0;
+
+    // we have a string, so we can not use getDouble
+    std::istringstream iss(str.cstr());
+    double res = 0.0;
+    iss >> res;
+
+    // try to guess the type
+    // point->pt, twip->*, inch -> in
+    char c = str.len() ? str.cstr()[str.len()-1] : ' ';
+    if (c == '*') res /= 1440.;
+    else if (c == 't') res /= 72.;
+    else if (c == 'n') ;
+    else if (c == '%')
+    {
+        WRITER_DEBUG_MSG(("MWAWObjectHandlerInternal::getSizeInPoint: called with a percent property\n"));
+    }
+    return res *= 72.;
+}
+
+static std::string getStringSizeInPt(WPXProperty const &prop)
+{
+    return getStringPt(getSizeInPt(prop));
+}
+
+static std::string getStyleName(int id)
+{
+    std::stringstream s;
+    s.str("");
+    s << "bd" << id+1;
+    return s.str();
+}
+
+} // anonymous namespace
+
+namespace MWAWObjectHandlerInternal
+{
+class Shape
+{
+public:
+    Shape() : m_type(BAD), m_styleId(-1), m_w(0), m_h(0), m_rw(0), m_rh(0),
+        m_x(), m_y(), m_angle(), m_path("")
+    {
+    }
+    bool read(const char *psName, WPXPropertyList const &xPropList, int styleId);
+    bool write(OdfDocumentHandler *output) const;
+    bool ok() const
+    {
+        return m_type != BAD;
+    }
+
+protected:
+    bool drawLine(OdfDocumentHandler *output) const;
+    bool drawRectangle(OdfDocumentHandler *output) const;
+    bool drawCircle(OdfDocumentHandler *output) const;
+    bool drawArc(OdfDocumentHandler *output) const;
+    bool drawPath(OdfDocumentHandler *output) const;
+    bool drawPolygon(OdfDocumentHandler *output, bool is2D) const;
+
+    enum Type { LINE, RECTANGLE, CIRCLE, ARC, PATH, POLYLINE, POLYGON, BAD } m_type;
+
+    int m_styleId;
+    double m_w,m_h, m_rw, m_rh;
+    std::vector<double> m_x,m_y;
+    std::vector<double> m_angle;
+    std::string m_path;
+};
+
+class Document
+{
+public:
+    Document() : styles(), shapes(), m_w(0.0), m_h(0.0) {}
+    bool open(const char *psName, WPXPropertyList const &xPropList);
+    bool close(const char *psName);
+
+    void characters(WPXString const &sCharacters);
+
+    void write(OdfDocumentHandler *output);
+
+protected:
+    static void writeStyle(OdfDocumentHandler *output,
+                           WPXPropertyList const &style, int styleId);
+
+    std::vector<WPXPropertyList> styles;
+    std::vector<Shape> shapes;
+
+protected:
+    double m_w, m_h;
+};
+
+}
+
+class MWAWObjectHandler : public MWAWPropertyHandler
+{
+public:
+    MWAWObjectHandler(OdfDocumentHandler *output) : MWAWPropertyHandler(), m_document(), m_output(output) { }
+    ~MWAWObjectHandler() {};
+
+    void startDocument()
+    {
+        m_document= MWAWObjectHandlerInternal::Document();
+    };
+    void endDocument()
+    {
+        if (m_output) m_document.write(m_output);
+    };
+
+    void startElement(const char *psName, const WPXPropertyList &xPropList)
+    {
+        m_document.open(psName, xPropList);
+    }
+    void endElement(const char *psName)
+    {
+        m_document.close(psName);
+    }
+    void characters(const WPXString &sCharacters)
+    {
+        m_document.characters(sCharacters);
+    }
+
+private:
+    MWAWObjectHandler(MWAWObjectHandler const &);
+    MWAWObjectHandler operator=(MWAWObjectHandler const &);
+
+    MWAWObjectHandlerInternal::Document m_document;
+    OdfDocumentHandler *m_output;
+};
+
+
+static bool handleEmbeddedMWAWObject(const WPXBinaryData &data, OdfDocumentHandler *pHandler,  const OdfStreamType)
+{
+    MWAWObjectHandler tmpHandler(pHandler);
+    tmpHandler.startDocument();
+    if (!tmpHandler.checkData(data) || !tmpHandler.readData(data)) return false;
+    tmpHandler.endDocument();
+    return true;
+}
+
+bool MWAWObjectHandlerInternal::Shape::read(const char *psName, WPXPropertyList const &xPropList, int stylId)
+{
+    m_styleId = stylId;
+    m_type = BAD;
+    if (strcmp(psName,"drawLine")==0) m_type = LINE;
+    else if (strcmp(psName,"drawRectangle")==0) m_type = RECTANGLE;
+    else if (strcmp(psName,"drawCircle")==0) m_type = CIRCLE;
+    else if (strcmp(psName,"drawArc")==0) m_type = ARC;
+    else if (strcmp(psName,"drawPath")==0) m_type = PATH;
+    else if (strcmp(psName,"drawPolyline")==0) m_type = POLYLINE;
+    else if (strcmp(psName,"drawPolygon")==0) m_type = POLYGON;
+    else return false;
+
+    WPXPropertyList::Iter i(xPropList);
+    for (i .rewind(); i.next(); )
+    {
+        if (strcmp(i.key(), "w") == 0) m_w = getSizeInPt(*i());
+        else if (strcmp(i.key(), "h") == 0) m_h = getSizeInPt(*i());
+        else if (strcmp(i.key(), "rw") == 0) m_rw = getSizeInPt(*i());
+        else if (strcmp(i.key(), "rh") == 0) m_rh = getSizeInPt(*i());
+        else if (strcmp(i.key(), "path") == 0)
+        {
+            if (i()->getStr().len())
+                m_path = i()->getStr().cstr();
+        }
+        else
+        {
+            char const *key = i.key();
+            int len = (int) strlen(key);
+            bool readOk = len > 1, generic = false;
+            std::vector<double> *which = 0L;
+            if (readOk && strncmp(i.key(),"x",1)==0)
+            {
+                which = &m_x;
+                key++;
+            }
+            else if (readOk && strncmp(i.key(),"y",1)==0)
+            {
+                which = &m_y;
+                key++;
+            }
+            else if (readOk && strncmp(i.key(),"angle",5)==0)
+            {
+                which = &m_angle;
+                key+=5;
+                readOk = len>5;
+                generic=true;
+            }
+            else readOk = false;
+
+            long w;
+            if (readOk)
+            {
+                char *res;
+                w = strtol(key, &res, 10);
+                readOk = (*res=='\0') && (w >= 0);
+            }
+            if (readOk)
+            {
+                if (int(which->size()) < w+1) which->resize(size_t(w)+1,0.0);
+                double unit = generic ? 1./72.0 : 1.0;
+                (*which)[size_t(w)] = getSizeInPt(*i()) * unit;
+            }
+            if (!readOk)
+            {
+                WRITER_DEBUG_MSG(("MWAWObjectHandlerInternal::Shape::read: find an unknown key '%s'\n",i.key()));
+            }
+        }
+    }
+
+    return true;
+}
+
+bool MWAWObjectHandlerInternal::Shape::write(OdfDocumentHandler *output) const
+{
+    if (!output) return true;
+    if (m_type == LINE) return drawLine(output);
+    else if (m_type == RECTANGLE) return drawRectangle(output);
+    else if (m_type == CIRCLE) return drawCircle(output);
+    else if (m_type == ARC) return drawArc(output);
+    else if (m_type == PATH) return drawPath(output);
+    else if (m_type == POLYLINE) return drawPolygon(output, false);
+    else if (m_type == POLYGON) return drawPolygon(output, true);
+
+    return false;
+}
+
+bool MWAWObjectHandlerInternal::Shape::drawLine(OdfDocumentHandler *output) const
+{
+    if (m_x.size() < 2 || m_y.size() < 2)
+    {
+        WRITER_DEBUG_MSG(("MWAWObjectHandlerInternal::Shape::drawLine: PB\n"));
+        return false;
+    }
+
+    WPXPropertyList list;
+    list.insert("draw:text-style-name","P1");
+    list.insert("draw:layer","layout");
+    list.insert("draw:style-name",getStyleName(m_styleId).c_str());
+    list.insert("svg:x1",getStringPt(m_x[0]).c_str());
+    list.insert("svg:y1",getStringPt(m_y[0]).c_str());
+    list.insert("svg:x2",getStringPt(m_x[1]).c_str());
+    list.insert("svg:y2",getStringPt(m_y[1]).c_str());
+    output->startElement("draw:line", list);
+    output->endElement("draw:line");
+    return true;
+}
+
+bool MWAWObjectHandlerInternal::Shape::drawRectangle(OdfDocumentHandler *output) const
+{
+    if (m_x.size() < 1 || m_y.size() < 1)
+    {
+        WRITER_DEBUG_MSG(("MWAWObjectHandlerInternal::Shape::drawRectangle: PB\n"));
+        return false;
+    }
+
+    WPXPropertyList list;
+    list.insert("draw:text-style-name","P1");
+    list.insert("draw:layer","layout");
+    list.insert("draw:style-name",getStyleName(m_styleId).c_str());
+    list.insert("svg:x",getStringPt(m_x[0]).c_str());
+    list.insert("svg:y",getStringPt(m_y[0]).c_str());
+    list.insert("svg:width",getStringPt(m_w).c_str());
+    list.insert("svg:height",getStringPt(m_h).c_str());
+
+    if (m_rw <= 0.0 || m_rh <= 0.0 || m_w < 2*m_rw || m_h < 2*m_rh)
+    {
+        if (m_rw > 0.0 || m_rh > 0.0)
+        {
+            WRITER_DEBUG_MSG(("MWAWObjectHandlerInternal::Shape::drawRectangle:: can only create a rectangle\n"));
+        }
+        output->startElement("draw:rect", list);
+        output->endElement("draw:rect");
+        return true;
+    }
+
+    // ok, we draw a rond rect
+    std::stringstream s;
+    float const unit = 1.0;//35.3;
+    s.str("");
+
+    double const minPt[] = { m_x[0] *unit, m_y[0] *unit };
+    double const maxPt[] = { (m_w+m_x[0]) *unit, (m_h+m_y[0]) *unit };
+
+    s << "0 0 " << int(maxPt[0]) << " " << int(maxPt[1]);
+    list.insert("svg:viewBox", s.str().c_str());
+
+    double const W[] = { m_rw *unit, m_rh *unit };
+    double const xPt[] = { minPt[0]+W[0], maxPt[0]-W[0], maxPt[0],
+                           maxPt[0], maxPt[0], maxPt[0],
+                           maxPt[0]-W[0], minPt[0]+W[0], minPt[0],
+                           minPt[0], minPt[0], minPt[0],
+                           minPt[0]+W[0]
+                         };
+    double const yPt[] = { minPt[1], minPt[1], minPt[1],
+                           minPt[1]+W[1], maxPt[1]-W[1], maxPt[1],
+                           maxPt[1], maxPt[1], maxPt[1],
+                           maxPt[1]-W[1], minPt[1]+W[1], minPt[1],
+                           minPt[1]
+                         };
+    s.str("");
+    for (int i = 0; i < 13; i++)
+    {
+        if (i) s << " ";
+
+        if (i == 0) s << "M";
+        else if ((i%3) == 2) s << "Q";
+        else if ((i%3) == 0);
+        else s << "L";
+        s << int(xPt[i]) << " " << int(yPt[i]);
+    }
+    s << "Z";
+    list.insert("svg:d", s.str().c_str());
+
+    output->startElement("draw:path", list);
+    output->endElement("draw:path");
+    return true;
+}
+
+bool MWAWObjectHandlerInternal::Shape::drawCircle(OdfDocumentHandler *output) const
+{
+    if (m_x.size() < 1 || m_y.size() < 1)
+    {
+        WRITER_DEBUG_MSG(("MWAWObjectHandlerInternal::Shape::drawCircle: PB\n"));
+        return false;
+    }
+
+    WPXPropertyList list;
+    list.insert("draw:text-style-name","P1");
+    list.insert("draw:layer","layout");
+    list.insert("draw:style-name",getStyleName(m_styleId).c_str());
+    list.insert("svg:x",getStringPt(m_x[0]).c_str());
+    list.insert("svg:y",getStringPt(m_y[0]).c_str());
+    list.insert("svg:width",getStringPt(m_w).c_str());
+    list.insert("svg:height",getStringPt(m_h).c_str());
+    if (m_w < m_h || m_w > m_h)
+    {
+        output->startElement("draw:ellipse", list);
+        output->endElement("draw:ellipse");
+    }
+    else
+    {
+        output->startElement("draw:circle", list);
+        output->endElement("draw:circle");
+    }
+    return true;
+}
+
+bool MWAWObjectHandlerInternal::Shape::drawArc(OdfDocumentHandler *output) const
+{
+    if (m_angle.size() < 2)
+    {
+        WRITER_DEBUG_MSG(("MWAWObjectHandlerInternal::Shape::drawArc: angle are filled, call draw Circle\n"));
+        return drawCircle(output);
+    }
+    if (m_x.size() < 1 || m_y.size() < 1)
+    {
+        WRITER_DEBUG_MSG(("MWAWObjectHandlerInternal::Shape::drawArc: PB\n"));
+        return false;
+    }
+
+    WPXPropertyList list;
+    list.insert("draw:text-style-name","P1");
+    list.insert("draw:layer","layout");
+    list.insert("draw:style-name",getStyleName(m_styleId).c_str());
+    list.insert("svg:x",getStringPt(m_x[0]).c_str());
+    list.insert("svg:y",getStringPt(m_y[0]).c_str());
+    list.insert("svg:width",getStringPt(m_w).c_str());
+    list.insert("svg:height",getStringPt(m_h).c_str());
+    list.insert("draw:kind","arc");
+
+    std::stringstream s;
+    // odg prefers angle between -360 and +360, ...
+    int minAngl = int(m_angle[0]), maxAngl = int(m_angle[1]);
+    if (minAngl >= 360 || maxAngl >= 360)
+    {
+        minAngl -= 360;
+        maxAngl -= 360;
+    }
+    s.str("");
+    s << minAngl;
+    list.insert("draw:start-angle", s.str().c_str());
+    s.str("");
+    s << maxAngl;
+    list.insert("draw:end-angle", s.str().c_str());
+
+    if (m_w < m_h || m_w > m_h)
+    {
+        output->startElement("draw:ellipse", list);
+        output->endElement("draw:ellipse");
+    }
+    else
+    {
+        output->startElement("draw:circle", list);
+        output->endElement("draw:circle");
+    }
+    return true;
+}
+
+bool MWAWObjectHandlerInternal::Shape::drawPolygon(OdfDocumentHandler *output, bool is2D) const
+{
+    if (m_x.size() < 1 || m_y.size() != m_x.size())
+    {
+        WRITER_DEBUG_MSG(("MWAWObjectHandlerInternal::Shape::drawPolygon: PB\n"));
+        return false;
+    }
+    std::stringstream s;
+    WPXPropertyList list;
+    list.insert("draw:text-style-name","P1");
+    list.insert("draw:layer","layout");
+    list.insert("draw:style-name","bd1");
+    list.insert("svg:x","0pt");
+    list.insert("svg:y","0pt");
+    list.insert("svg:width",getStringPt(m_w).c_str());
+    list.insert("svg:height",getStringPt(m_h).c_str());
+
+    size_t numPt = m_x.size();
+
+    float const unit = 1; //35.2777; // convert in centimeters
+    s.str("");
+    s << "0 0 " << int(m_w*unit) << " " << int(m_h*unit);
+    list.insert("svg:viewBox", s.str().c_str());
+
+    s.str("");
+    for (size_t i = 0; i < numPt; i++)
+    {
+        if (i) s << " ";
+        s << int(m_x[i]*unit) << "," << int(m_y[i]*unit);
+    }
+    list.insert("draw:points", s.str().c_str());
+    if (!is2D)
+    {
+        output->startElement("draw:polyline", list);
+        output->endElement("draw:polyline");
+    }
+    else
+    {
+        output->startElement("draw:polygon", list);
+        output->endElement("draw:polygon");
+    }
+    return true;
+}
+
+bool MWAWObjectHandlerInternal::Shape::drawPath(OdfDocumentHandler *output) const
+{
+    if (m_path.length()==0 || m_w <= 0 || m_h <= 0)
+    {
+        WRITER_DEBUG_MSG(("MWAWObjectHandlerInternal::Shape::drawPath: PB\n"));
+        return false;
+    }
+
+    WPXPropertyList list;
+    list.insert("draw:text-style-name","P1");
+    list.insert("draw:layer","layout");
+    list.insert("draw:style-name",getStyleName(m_styleId).c_str());
+    list.insert("svg:x","0pt");
+    list.insert("svg:y","0pt");
+    list.insert("svg:width",getStringPt(m_w).c_str());
+    list.insert("svg:height",getStringPt(m_h).c_str());
+    std::stringstream s;
+    s << "0 0 " << int(m_w) << " " << int(m_h);
+    list.insert("svg:viewBox", s.str().c_str());
+    list.insert("svg:d",m_path.c_str());
+
+    output->startElement("draw:path", list);
+    output->endElement("draw:path");
+    return true;
+}
+
+
+bool MWAWObjectHandlerInternal::Document::open(const char *psName, WPXPropertyList const &xPropList)
+{
+    if (strncmp(psName,"libmwaw:", 8) == 0)
+        psName += 8;
+    else
+    {
+        WRITER_DEBUG_MSG(("MWAWObjectHandlerInternal::Document::open Unknown tag '%s'..\n", psName));
+        return false;
+    }
+    if (strcmp(psName, "document") == 0)
+    {
+        m_w = m_h = 0.;
+        WPXPropertyList::Iter i(xPropList);
+        for (i .rewind(); i.next(); )
+        {
+            if (strcmp(i.key(), "w") == 0) m_w = getSizeInPt(*i());
+            else if (strcmp(i.key(), "h") == 0) m_h = getSizeInPt(*i());
+            else
+            {
+                WRITER_DEBUG_MSG(("MWAWObjectHandlerInternal::Document::open: find an unknown key '%s'\n",i.key()));
+            }
+        }
+        return true;
+    }
+    else if (strcmp(psName, "graphicStyle") == 0)
+    {
+        styles.push_back(xPropList);
+        return true;
+    }
+    else
+    {
+        int id = int(styles.size());
+        Shape shape;
+        if (shape.read(psName, xPropList, id ? id-1 : 0))
+        {
+            if (id == 0)
+            {
+                WRITER_DEBUG_MSG(("MWAWObjectHandlerInternal::Document::open shape created without style..\n"));
+                styles.push_back(WPXPropertyList());
+            }
+            shapes.push_back(shape);
+            return true;
+        }
+    }
+    WRITER_DEBUG_MSG(("MWAWObjectHandlerInternal::Document::open Unknown tag '%s'..\n", psName));
+    return false;
+}
+
+bool MWAWObjectHandlerInternal::Document::close(const char *)
+{
+    return true;
+}
+
+void MWAWObjectHandlerInternal::Document::characters(WPXString const &)
+{
+    WRITER_DEBUG_MSG(("Document::characters must NOT be called..\n"));
+}
+
+void MWAWObjectHandlerInternal::Document::write(OdfDocumentHandler *output)
+{
+    if (!output) return;
+    WPXPropertyList list;
+    std::stringstream s;
+
+    list.clear();
+    list.insert("office:mimetype","application/vnd.oasis.opendocument.graphics");
+    list.insert("office:version", "1.0");
+
+    list.insert("xmlns:config", "urn:oasis:names:tc:opendocument:xmlns:config:1.0");
+    list.insert("xmlns:dc", "http://purl.org/dc/elements/1.1/");
+    list.insert("xmlns:draw", "urn:oasis:names:tc:opendocument:xmlns:drawing:1.0");
+    list.insert("xmlns:fo", "urn:oasis:names:tc:opendocument:xmlns:xsl-fo-compatible:1.0");
+    list.insert("xmlns:office", "urn:oasis:names:tc:opendocument:xmlns:office:1.0");
+    list.insert("xmlns:ooo", "http://openoffice.org/2004/office");
+    list.insert("xmlns:style", "urn:oasis:names:tc:opendocument:xmlns:style:1.0");
+    list.insert("xmlns:svg", "urn:oasis:names:tc:opendocument:xmlns:svg-compatible:1.0");
+    list.insert("xmlns:text", "urn:oasis:names:tc:opendocument:xmlns:text:1.0");
+
+    output->startElement("office:document", list);
+
+    // SETTINGS
+    {
+        list.clear();
+        output->startElement("office:settings", list);
+        list.clear();
+        list.insert("config:name","ooo:view-settings");
+        output->startElement("config:config-item-set", list);
+
+        // - Top
+        list.clear();
+        list.insert("config:name","VisibleAreaTop");
+        list.insert("config:type","int");
+        output->startElement("config:config-item", list);
+        output->characters("0");
+
+        output->endElement("config:config-item");
+        // - Left
+        list.clear();
+        list.insert("config:name","VisibleAreaLeft");
+        list.insert("config:type","int");
+        output->startElement("config:config-item", list);
+        output->characters("0");
+        output->endElement("config:config-item");
+        // - Width
+        list.clear();
+        list.insert("config:name","VisibleAreaWidth");
+        list.insert("config:type","int");
+        s.str("");
+        s << int(m_w*35.2777);  // *2540/72. why ?
+        output->startElement("config:config-item", list);
+        output->characters(s.str().c_str());
+        output->endElement("config:config-item");
+        // - Height
+        list.clear();
+        list.insert("config:name","VisibleAreaHeight");
+        list.insert("config:type","int");
+        s.str("");
+        s << int(m_h*35.2777);  // *2540/72. why ?
+        output->startElement("config:config-item", list);
+        output->characters(s.str().c_str());
+        output->endElement("config:config-item");
+
+        output->endElement("config:config-item-set");
+        output->endElement("office:settings");
+    }
+
+    // STYLES
+    {
+        list.clear();
+        output->startElement("office:styles", list);
+        // - a gradient
+        list.clear();
+        list.insert("draw:angle","0");
+        list.insert("draw:border","0%");
+        list.insert("draw:end-color","#000000");
+        list.insert("draw:end-intensity","100%");
+        list.insert("draw:name","Gradient_1");
+        list.insert("draw:start-color","#000000");
+        list.insert("draw:start-intensity","100%");
+        list.insert("draw:style","linear");
+        output->startElement("draw:gradient", list);
+        output->endElement("draw:gradient");
+        // - an arrow
+        list.clear();
+        list.insert("draw:name","Arrow");
+        list.insert("svg:viewBox","0 0 20 30");
+        list.insert("svg:d","m10 0-10 30h20z");
+        output->startElement("draw:marker", list);
+        output->endElement("draw:marker");
+
+        output->endElement("office:styles");
+    }
+
+    // AUTOMATIC STYLES
+    {
+        list.clear();
+        output->startElement("office:automatic-styles", list);
+
+        // - PM0
+        {
+            list.clear();
+            list.insert("style:name","PM0");
+            output->startElement("style:page-layout", list);
+            list.clear();
+            list.insert("fo:margin-bottom","0in");
+            list.insert("fo:margin-left","0in");
+            list.insert("fo:margin-right","0in");
+            list.insert("fo:margin-top","0in");
+            list.insert("fo:page-height",getStringPt(m_h).c_str());
+            list.insert("fo:page-width",getStringPt(m_w).c_str());
+            list.insert("style:print-orientation","portrait");
+            output->startElement("style:page-layout-properties", list);
+            output->endElement("style:page-layout-properties");
+            output->endElement("style:page-layout");
+        }
+
+        // - dp1
+        {
+            list.clear();
+            list.insert("style:family","drawing-page");
+            list.insert("style:name","dp1");
+            output->startElement("style:style", list);
+            list.clear();
+            list.insert("draw:fill","none");
+            output->startElement("style:drawing-page-properties", list);
+            output->endElement("style:drawing-page-properties");
+            output->endElement("style:style");
+        }
+
+        // -- the styles
+        for (size_t i = 0; i < styles.size() ; i++)
+            writeStyle(output, styles[i], int(i));
+
+        output->endElement("office:automatic-styles");
+    }
+
+    // MASTER STYLES
+    {
+        list.clear();
+        output->startElement("office:master-styles", list);
+        list.clear();
+        list.insert("draw:style-name","dp1");
+        list.insert("style:name","Default");
+        list.insert("style:page-layout-name","PM0");
+        output->startElement("style:master-page", list);
+        output->endElement("style:master-page");
+        output->endElement("office:master-styles");
+    }
+
+    // BODY
+    {
+        list.clear();
+        output->startElement("office:body", list);
+        output->startElement("office:drawing", list);
+        {
+            list.clear();
+            list.insert("draw:master-page-name","Default");
+            list.insert("draw:name","page1");
+            list.insert("draw:style-name","dp1");
+
+            output->startElement("draw:page", list);
+
+            for (size_t i = 0; i < shapes.size() ; i++)
+                shapes[i].write(output);
+
+            output->endElement("draw:page");
+        }
+        output->endElement("office:drawing");
+        output->endElement("office:body");
+    }
+    output->endElement("office:document");
+}
+
+void MWAWObjectHandlerInternal::Document::writeStyle (OdfDocumentHandler *output, WPXPropertyList const &style, int styleId)
+{
+    if (!output) return;
+
+    WPXPropertyList list;
+    list.clear();
+    list.insert("style:family","graphic");
+    list.insert("style:name",getStyleName(styleId).c_str());
+    list.insert("style:parent-style-name","standard");
+    output->startElement("style:style", list);
+    {
+        list.clear();
+
+        WPXPropertyList::Iter i(style);
+        for (i .rewind(); i.next(); )
+        {
+            if (strcmp(i.key(), "lineColor") == 0)
+                list.insert("svg:stroke-color", i()->getStr().cstr());
+            else if (strcmp(i.key(), "lineWidth") == 0)
+                list.insert("svg:stroke-width", getStringSizeInPt(*i()).c_str());
+            else if (strcmp(i.key(), "lineFill") == 0)
+                list.insert("draw:stroke", i()->getStr().cstr());
+            else if (strcmp(i.key(), "surfaceColor") == 0)
+                list.insert("draw:fill-color", i()->getStr().cstr());
+            else if (strcmp(i.key(), "surfaceFill") == 0)
+                list.insert("draw:fill", i()->getStr().cstr());
+            else if (strcmp(i.key(), "startArrow") == 0)
+            {
+                if (strcmp(i()->getStr().cstr(), "true") == 0)
+                {
+                    list.insert("draw:marker-start", "Arrow");
+                    list.insert("draw:marker-start-center", "false");
+                }
+            }
+            else if (strcmp(i.key(), "startArrowWidth") == 0)
+                list.insert("draw:marker-start-width",  getStringSizeInPt(*i()).c_str());
+            else if (strcmp(i.key(), "endArrow") == 0)
+            {
+                if (strcmp(i()->getStr().cstr(), "true") == 0)
+                {
+                    list.insert("draw:marker-end", "Arrow");
+                    list.insert("draw:marker-end-center", "false");
+                }
+            }
+            else if (strcmp(i.key(), "endArrowWidth") == 0)
+                list.insert("draw:marker-end-width",  getStringSizeInPt(*i()).c_str());
+            else
+            {
+                WRITER_DEBUG_MSG(("MWAWObjectHandlerInternal::Document::writeStyle: find an unknown key '%s'\n",i.key()));
+            }
+        }
+
+        output->startElement("style:graphic-properties", list);
+        output->endElement("style:graphic-properties");
+    }
+    output->endElement("style:style");
+}
+
+
+sal_Bool SAL_CALL MWAWImportFilter::importImpl( const Sequence< ::com::sun::star::beans::PropertyValue > &aDescriptor )
+throw (RuntimeException)
+{
+    WRITER_DEBUG_MSG(("MWAWImportFilter::importImpl: Got here!\n"));
+
+    sal_Int32 nLength = aDescriptor.getLength();
+    const PropertyValue *pValue = aDescriptor.getConstArray();
+    Reference < XInputStream > xInputStream;
+    for ( sal_Int32 i = 0 ; i < nLength; i++)
+    {
+        if ( pValue[i].Name == "InputStream" )
+            pValue[i].Value >>= xInputStream;
+    }
+    if ( !xInputStream.is() )
+    {
+        OSL_ASSERT( 0 );
+        return sal_False;
+    }
+
+    // An XML import service: what we push sax messages to..
+    OUString sXMLImportService (  "com.sun.star.comp.Writer.XMLOasisImporter"  );
+    Reference < XDocumentHandler > xInternalHandler( comphelper::ComponentContext( mxContext ).createComponent( sXMLImportService ), UNO_QUERY );
+
+    // The XImporter sets up an empty target document for XDocumentHandler to write to..
+    Reference < XImporter > xImporter(xInternalHandler, UNO_QUERY);
+    xImporter->setTargetDocument(mxDoc);
+
+    // OO Document Handler: abstract class to handle document SAX messages, concrete implementation here
+    // writes to in-memory target doc
+    DocumentHandler xHandler(xInternalHandler);
+
+    WPXSvInputStream input( xInputStream );
+
+    OdtGenerator collector(&xHandler, ODF_FLAT_XML);
+    collector.registerEmbeddedObjectHandler("image/mwaw-odg", &handleEmbeddedMWAWObject);
+    if (MWAW_OK == MWAWDocument::parse(&input, &collector))
+        return sal_True;
+    return sal_False;
+}
+
+sal_Bool SAL_CALL MWAWImportFilter::filter( const Sequence< ::com::sun::star::beans::PropertyValue > &aDescriptor )
+throw (RuntimeException)
+{
+    WRITER_DEBUG_MSG(("MWAWImportFilter::filter: Got here!\n"));
+    return importImpl ( aDescriptor );
+}
+void SAL_CALL MWAWImportFilter::cancel(  )
+throw (RuntimeException)
+{
+    WRITER_DEBUG_MSG(("MWAWImportFilter::cancel: Got here!\n"));
+}
+
+// XImporter
+void SAL_CALL MWAWImportFilter::setTargetDocument( const Reference< ::com::sun::star::lang::XComponent > &xDoc )
+throw (::com::sun::star::lang::IllegalArgumentException, RuntimeException)
+{
+    WRITER_DEBUG_MSG(("MWAWImportFilter::getTargetDocument: Got here!\n"));
+    mxDoc = xDoc;
+}
+
+// XExtendedFilterDetection
+OUString SAL_CALL MWAWImportFilter::detect( com::sun::star::uno::Sequence< PropertyValue > &Descriptor )
+throw( com::sun::star::uno::RuntimeException )
+{
+    WRITER_DEBUG_MSG(("MWAWImportFilter::detect: Got here!\n"));
+
+    MWAWConfidence confidence = MWAW_CONFIDENCE_NONE;
+    MWAWDocument::DocumentType docType = MWAWDocument::UNKNOWN;
+    MWAWDocument::DocumentKind docKind = MWAWDocument::K_UNKNOWN;
+    OUString sTypeName;
+    sal_Int32 nLength = Descriptor.getLength();
+    sal_Int32 location = nLength;
+    const PropertyValue *pValue = Descriptor.getConstArray();
+    Reference < XInputStream > xInputStream;
+    for ( sal_Int32 i = 0 ; i < nLength; i++)
+    {
+        if ( pValue[i].Name == "TypeName" )
+            location=i;
+        else if ( pValue[i].Name == "InputStream" )
+            pValue[i].Value >>= xInputStream;
+    }
+
+    if (!xInputStream.is())
+        return ::rtl::OUString();
+
+    WPXSvInputStream input( xInputStream );
+
+    if (input.atEOS())
+        return ::rtl::OUString();
+
+    confidence = MWAWDocument::isFileFormatSupported(&input, docType, docKind);
+
+    if ((confidence == MWAW_CONFIDENCE_EXCELLENT) || (confidence == MWAW_CONFIDENCE_GOOD))
+    {
+    }
+
+    if (!sTypeName.isEmpty())
+    {
+        if ( location == nLength )
+        {
+            Descriptor.realloc(nLength+1);
+            Descriptor[location].Name = "TypeName";
+        }
+
+        Descriptor[location].Value <<=sTypeName;
+    }
+
+    return sTypeName;
+}
+
+
+// XInitialization
+void SAL_CALL MWAWImportFilter::initialize( const Sequence< Any > &aArguments )
+throw (Exception, RuntimeException)
+{
+    WRITER_DEBUG_MSG(("MWAWImportFilter::initialize: Got here!\n"));
+    Sequence < PropertyValue > aAnySeq;
+    sal_Int32 nLength = aArguments.getLength();
+    if ( nLength && ( aArguments[0] >>= aAnySeq ) )
+    {
+        const PropertyValue *pValue = aAnySeq.getConstArray();
+        nLength = aAnySeq.getLength();
+        for ( sal_Int32 i = 0 ; i < nLength; i++)
+        {
+            if ( pValue[i].Name == "Type" )
+            {
+                pValue[i].Value >>= msFilterName;
+                break;
+            }
+        }
+    }
+}
+OUString MWAWImportFilter_getImplementationName ()
+throw (RuntimeException)
+{
+    return OUString (  "com.sun.star.comp.Writer.MWAWImportFilter"  );
+}
+
+#define SERVICE_NAME1 "com.sun.star.document.ImportFilter"
+#define SERVICE_NAME2 "com.sun.star.document.ExtendedTypeDetection"
+sal_Bool SAL_CALL MWAWImportFilter_supportsService( const OUString &ServiceName )
+throw (RuntimeException)
+{
+    return ( ServiceName == SERVICE_NAME1 || ServiceName == SERVICE_NAME2 );
+}
+Sequence< OUString > SAL_CALL MWAWImportFilter_getSupportedServiceNames(  )
+throw (RuntimeException)
+{
+    Sequence < OUString > aRet(2);
+    OUString *pArray = aRet.getArray();
+    pArray[0] =  OUString (  SERVICE_NAME1  );
+    pArray[1] =  OUString (  SERVICE_NAME2  );
+    return aRet;
+}
+#undef SERVICE_NAME2
+#undef SERVICE_NAME1
+
+Reference< XInterface > SAL_CALL MWAWImportFilter_createInstance( const Reference< XComponentContext > &rContext)
+throw( Exception )
+{
+    return (cppu::OWeakObject *) new MWAWImportFilter( rContext );
+}
+
+// XServiceInfo
+OUString SAL_CALL MWAWImportFilter::getImplementationName(  )
+throw (RuntimeException)
+{
+    return MWAWImportFilter_getImplementationName();
+}
+sal_Bool SAL_CALL MWAWImportFilter::supportsService( const OUString &rServiceName )
+throw (RuntimeException)
+{
+    return MWAWImportFilter_supportsService( rServiceName );
+}
+Sequence< OUString > SAL_CALL MWAWImportFilter::getSupportedServiceNames(  )
+throw (RuntimeException)
+{
+    return MWAWImportFilter_getSupportedServiceNames();
+}
+
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/writerperfect/source/writer/MWAWImportFilter.hxx b/writerperfect/source/writer/MWAWImportFilter.hxx
new file mode 100644
index 000000000000..95af68889f37
--- /dev/null
+++ b/writerperfect/source/writer/MWAWImportFilter.hxx
@@ -0,0 +1,91 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
+/*
+ * This file is part of the LibreOffice project.
+ *
+ * This Source Code Form is subject to the terms of the Mozilla Public
+ * License, v. 2.0. If a copy of the MPL was not distributed with this
+ * file, You can obtain one at http://mozilla.org/MPL/2.0/.
+ */
+
+#ifndef _MWAWIMPORTFILTER_HXX
+#define _MWAWIMPORTFILTER_HXX
+
+#include <com/sun/star/document/XFilter.hpp>
+#include <com/sun/star/document/XImporter.hpp>
+#include <com/sun/star/document/XExtendedFilterDetection.hpp>
+#include <com/sun/star/lang/XInitialization.hpp>
+#include <com/sun/star/lang/XServiceInfo.hpp>
+#include <com/sun/star/uno/XComponentContext.hpp>
+#include <com/sun/star/xml/sax/XDocumentHandler.hpp>
+#include <cppuhelper/implbase5.hxx>
+
+/* This component will be instantiated for both import or export. Whether it calls
+ * setSourceDocument or setTargetDocument determines which Impl function the filter
+ * member calls */
+class MWAWImportFilter : public cppu::WeakImplHelper5
+    <
+    com::sun::star::document::XFilter,
+    com::sun::star::document::XImporter,
+    com::sun::star::document::XExtendedFilterDetection,
+    com::sun::star::lang::XInitialization,
+    com::sun::star::lang::XServiceInfo
+    >
+{
+protected:
+    ::com::sun::star::uno::Reference< ::com::sun::star::uno::XComponentContext > mxContext;
+    ::com::sun::star::uno::Reference< ::com::sun::star::lang::XComponent > mxDoc;
+    ::rtl::OUString msFilterName;
+    ::com::sun::star::uno::Reference< ::com::sun::star::xml::sax::XDocumentHandler > mxHandler;
+
+    sal_Bool SAL_CALL importImpl( const ::com::sun::star::uno::Sequence< ::com::sun::star::beans::PropertyValue > &aDescriptor )
+    throw (::com::sun::star::uno::RuntimeException);
+
+public:
+    MWAWImportFilter( const ::com::sun::star::uno::Reference< ::com::sun::star::uno::XComponentContext > &rxContext )
+        : mxContext( rxContext ) {}
+    virtual ~MWAWImportFilter() {}
+
+    // XFilter
+    virtual sal_Bool SAL_CALL filter( const ::com::sun::star::uno::Sequence< ::com::sun::star::beans::PropertyValue > &aDescriptor )
+    throw (::com::sun::star::uno::RuntimeException);
+    virtual void SAL_CALL cancel(  )
+    throw (::com::sun::star::uno::RuntimeException);
+
+    // XImporter
+    virtual void SAL_CALL setTargetDocument( const ::com::sun::star::uno::Reference< ::com::sun::star::lang::XComponent > &xDoc )
+    throw (::com::sun::star::lang::IllegalArgumentException, ::com::sun::star::uno::RuntimeException);
+
+    //XExtendedFilterDetection
+    virtual ::rtl::OUString SAL_CALL detect( com::sun::star::uno::Sequence< com::sun::star::beans::PropertyValue > &Descriptor )
+    throw( com::sun::star::uno::RuntimeException );
+
+    // XInitialization
+    virtual void SAL_CALL initialize( const ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Any > &aArguments )
+    throw (::com::sun::star::uno::Exception, ::com::sun::star::uno::RuntimeException);
+
+    // XServiceInfo
+    virtual ::rtl::OUString SAL_CALL getImplementationName(  )
+    throw (::com::sun::star::uno::RuntimeException);
+    virtual sal_Bool SAL_CALL supportsService( const ::rtl::OUString &ServiceName )
+    throw (::com::sun::star::uno::RuntimeException);
+    virtual ::com::sun::star::uno::Sequence< ::rtl::OUString > SAL_CALL getSupportedServiceNames(  )
+    throw (::com::sun::star::uno::RuntimeException);
+
+};
+
+::rtl::OUString MWAWImportFilter_getImplementationName()
+throw ( ::com::sun::star::uno::RuntimeException );
+
+sal_Bool SAL_CALL MWAWImportFilter_supportsService( const ::rtl::OUString &ServiceName )
+throw ( ::com::sun::star::uno::RuntimeException );
+
+::com::sun::star::uno::Sequence< ::rtl::OUString > SAL_CALL MWAWImportFilter_getSupportedServiceNames(  )
+throw ( ::com::sun::star::uno::RuntimeException );
+
+::com::sun::star::uno::Reference< ::com::sun::star::uno::XInterface >
+SAL_CALL MWAWImportFilter_createInstance( const ::com::sun::star::uno::Reference< ::com::sun::star::uno::XComponentContext > &rContext)
+throw ( ::com::sun::star::uno::Exception );
+
+#endif
+
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/writerperfect/source/writer/WordPerfectImportFilter.cxx b/writerperfect/source/writer/WordPerfectImportFilter.cxx
index 3de972715e23..0b8640af0893 100644
--- a/writerperfect/source/writer/WordPerfectImportFilter.cxx
+++ b/writerperfect/source/writer/WordPerfectImportFilter.cxx
@@ -55,8 +55,6 @@ using com::sun::star::xml::sax::XAttributeList;
 using com::sun::star::xml::sax::XDocumentHandler;
 using com::sun::star::xml::sax::XParser;
 
-void callHandler(Reference < XDocumentHandler > xDocHandler);
-
 
 static bool handleEmbeddedWPGObject(const WPXBinaryData &data, OdfDocumentHandler *pHandler,  const OdfStreamType streamType)
 {
diff --git a/writerperfect/source/writer/wpftwriter_genericfilter.cxx b/writerperfect/source/writer/wpftwriter_genericfilter.cxx
index b09cffedd2f6..0361dd203774 100644
--- a/writerperfect/source/writer/wpftwriter_genericfilter.cxx
+++ b/writerperfect/source/writer/wpftwriter_genericfilter.cxx
@@ -33,6 +33,7 @@
 
 #include "WordPerfectImportFilter.hxx"
 #include "MSWorksImportFilter.hxx"
+#include "MWAWImportFilter.hxx"
 
 namespace {
 
@@ -43,6 +44,9 @@ static cppu::ImplementationEntry const services[] = {
     { &MSWorksImportFilter_createInstance, &MSWorksImportFilter_getImplementationName,
       &MSWorksImportFilter_getSupportedServiceNames,
       &cppu::createSingleComponentFactory, 0, 0 },
+    { &MWAWImportFilter_createInstance, &MWAWImportFilter_getImplementationName,
+      &MWAWImportFilter_getSupportedServiceNames,
+      &cppu::createSingleComponentFactory, 0, 0 },
     { 0, 0, 0, 0, 0, 0 } };
 
 }
diff --git a/writerperfect/util/wpftwriter.component b/writerperfect/util/wpftwriter.component
index 82b0dd263d01..f243d5c96257 100644
--- a/writerperfect/util/wpftwriter.component
+++ b/writerperfect/util/wpftwriter.component
@@ -22,6 +22,10 @@
     <service name="com.sun.star.document.ImportFilter"/>
     <service name="com.sun.star.document.ExtendedTypeDetection"/>
   </implementation>
+  <implementation name="com.sun.star.comp.Writer.MWAWImportFilter">
+    <service name="com.sun.star.document.ImportFilter"/>
+    <service name="com.sun.star.document.ExtendedTypeDetection"/>
+  </implementation>
   <implementation name="com.sun.star.comp.Writer.WordPerfectImportFilter">
     <service name="com.sun.star.document.ExtendedTypeDetection"/>
     <service name="com.sun.star.document.ImportFilter"/>