Adding upstream version 1:7.0.4.upstream/1%7.0.4upstream

Signed-off-by: Daniel Baumann <daniel.baumann@progress-linux.org>

8 files changed, 969 insertions, 0 deletions

diff --git a/writerfilter/inc/dmapper/DomainMapperFactory.hxx b/writerfilter/inc/dmapper/DomainMapperFactory.hxx
new file mode 100644
index 000000000..624805cad
--- /dev/null
+++ b/writerfilter/inc/dmapper/DomainMapperFactory.hxx
@@ -0,0 +1,54 @@
+/*
+ * 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 INCLUDED_WRITERFILTER_INC_DMAPPER_DOMAINMAPPERFACTORY_HXX
+#define INCLUDED_WRITERFILTER_INC_DMAPPER_DOMAINMAPPERFACTORY_HXX
+
+#include <vector>
+
+#include <dmapper/resourcemodel.hxx>
+#include <com/sun/star/io/XInputStream.hpp>
+#include <com/sun/star/lang/XComponent.hpp>
+#include <com/sun/star/uno/XComponentContext.hpp>
+
+namespace utl
+{
+class MediaDescriptor;
+}
+
+namespace writerfilter
+{
+namespace dmapper
+{
+enum class SourceDocumentType
+{
+    OOXML,
+    RTF
+};
+
+/// Interface to create a DomainMapper instance.
+class DomainMapperFactory
+{
+public:
+    static Stream::Pointer_t
+    createMapper(css::uno::Reference<css::uno::XComponentContext> const& xContext,
+                 css::uno::Reference<css::io::XInputStream> const& xInputStream,
+                 css::uno::Reference<css::lang::XComponent> const& xModel, bool bRepairStorage,
+                 SourceDocumentType eDocumentType, utl::MediaDescriptor const& rMediaDesc);
+};
+
+// export just for test
+SAL_DLLPUBLIC_EXPORT std::tuple<OUString, std::vector<OUString>, std::vector<OUString>>
+splitFieldCommand(const OUString& rCommand);
+
+} // namespace dmapper
+} // namespace writerfilter
+
+#endif // INCLUDED_WRITERFILTER_INC_DMAPPER_DOMAINMAPPERFACTORY_HXX
+
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/writerfilter/inc/dmapper/GraphicZOrderHelper.hxx b/writerfilter/inc/dmapper/GraphicZOrderHelper.hxx
new file mode 100644
index 000000000..c566eec17
--- /dev/null
+++ b/writerfilter/inc/dmapper/GraphicZOrderHelper.hxx
@@ -0,0 +1,36 @@
+/*
+ * 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 INCLUDED_WRITERFILTER_INC_DMAPPER_GRAPHICZORDERHELPER_HXX
+#define INCLUDED_WRITERFILTER_INC_DMAPPER_GRAPHICZORDERHELPER_HXX
+
+#include <com/sun/star/beans/XPropertySet.hpp>
+#include <map>
+
+namespace writerfilter
+{
+namespace dmapper
+{
+class GraphicZOrderHelper
+{
+public:
+    void addItem(css::uno::Reference<css::beans::XPropertySet> const& props,
+                 sal_Int32 relativeHeight);
+    sal_Int32 findZOrder(sal_Int32 relativeHeight, bool bOldStyle = false);
+
+private:
+    using Items = std::map<sal_Int32, css::uno::Reference<css::beans::XPropertySet>>;
+    Items items;
+};
+
+} // namespace dmapper
+} // namespace writerfilter
+
+#endif // INCLUDED_WRITERFILTER_INC_DMAPPER_GRAPHICZORDERHELPER_HXX
+
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/writerfilter/inc/dmapper/resourcemodel.hxx b/writerfilter/inc/dmapper/resourcemodel.hxx
new file mode 100644
index 000000000..284e9982f
--- /dev/null
+++ b/writerfilter/inc/dmapper/resourcemodel.hxx
@@ -0,0 +1,406 @@
+/* -*- 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/.
+ *
+ * This file incorporates work covered by the following license notice:
+ *
+ *   Licensed to the Apache Software Foundation (ASF) under one or more
+ *   contributor license agreements. See the NOTICE file distributed
+ *   with this work for additional information regarding copyright
+ *   ownership. The ASF licenses this file to you under the Apache
+ *   License, Version 2.0 (the "License"); you may not use this file
+ *   except in compliance with the License. You may obtain a copy of
+ *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
+ */
+
+#ifndef INCLUDED_WRITERFILTER_INC_DMAPPER_RESOURCEMODEL_HXX
+#define INCLUDED_WRITERFILTER_INC_DMAPPER_RESOURCEMODEL_HXX
+
+#include <string>
+#include <sal/types.h>
+#include <com/sun/star/drawing/XShape.hpp>
+#include <com/sun/star/uno/Any.hxx>
+#include <tools/ref.hxx>
+
+/**
+   @file resourcemodel.hxx
+
+   The classes in this file define the interfaces for the resource
+   model of the DocTokenizer:
+
+   @image html doctok.png
+
+   A resource is a set of events that describe an object. A resource
+   is only an abstract concept. It is not instantiated to a class.
+
+   A reference to a resource represents the object that the resource
+   describes. The reference can be resolved thereby generating the
+   events of the resource.
+
+   A handler receives the events generated by resolving a
+   reference. There are several types of handlers each accepting their
+   specific set of events.
+
+   References always have a parameter determining the kind of handler
+   they send the events they generate to. The set of events generated
+   by resolving the reference is a subset of the events received by
+   the handler.
+*/
+
+
+typedef sal_uInt32 Id;
+
+namespace writerfilter {
+
+/**
+    Reference to a resource that generates events and sends them to a
+    handler.
+
+    The reference can be resolved, i.e. the resource generates its
+    events. The events must be suitable for the handler type given by
+    the template parameter.
+
+    @attention The parameter of the template does not determine the
+    type of the reference's target. It determines the type of the handler!
+
+    Example:
+
+    A Word document can be represented as a stream of events. Event
+    types in a Word document are text, properties, tables, starts and
+    ends of groups. These can be handled by a stream handler (@see
+    Stream). Thus a reference to a Word document is resolved by
+    sending these events to a stream handler.
+*/
+
+template <class T>
+class SAL_DLLPUBLIC_TEMPLATE Reference : public virtual SvRefBase
+{
+public:
+    /**
+        Pointer to reference
+
+        @attention The ownership of a reference is transferred when
+        the reference is passed.
+    */
+    typedef tools::SvRef< Reference<T> > Pointer_t;
+
+    /**
+       Resolves the reference.
+
+       The events of the references target resource are generated and
+       send to a handler.
+
+       @param rHandler         handler which receives the events
+     */
+    virtual void resolve(T & rHandler) = 0;
+
+    Reference() = default;
+    Reference(Reference const &) = default;
+    Reference(Reference &&) = default;
+    Reference & operator =(Reference const &) = default;
+    Reference & operator =(Reference &&) = default;
+
+protected:
+    ~Reference() override {}
+};
+
+class Value;
+class Sprm;
+
+/**
+   Handler for properties.
+ */
+class Properties : public virtual SvRefBase
+{
+public:
+    /**
+       Receives an attribute.
+
+       @param name     name of the attribute
+       @param val      value of the attribute
+     */
+    virtual void attribute(Id name, Value & val) = 0;
+
+    /**
+       Receives a SPRM.
+
+       @param  sprm      the SPRM received
+    */
+    virtual void sprm(Sprm & sprm) = 0;
+
+protected:
+    ~Properties() override {}
+};
+
+/**
+   Handler for tables.
+ */
+class Table : public virtual SvRefBase
+{
+public:
+    typedef tools::SvRef<Table> Pointer_t;
+
+    /**
+       Receives an entry of the table.
+
+       @param pos     position of the entry in the table
+       @param ref     reference to properties of the entry
+     */
+    virtual void entry(int pos, writerfilter::Reference<Properties>::Pointer_t ref) = 0;
+
+protected:
+    ~Table() override {}
+};
+
+/**
+   Handler for binary objects.
+ */
+class BinaryObj
+{
+public:
+    /**
+       Receives binary data of the object.
+
+       @param buf     pointer to buffer containing the data
+       @param len     size of buffer
+     */
+    virtual void data(const sal_uInt8* buf, size_t len) = 0;
+
+protected:
+    ~BinaryObj() {}
+};
+
+const sal_uInt8 cFieldStart = 0x13;
+const sal_uInt8 cFieldSep = 0x14;
+const sal_uInt8 cFieldEnd = 0x15;
+
+/**
+   Handler for a stream.
+ */
+class Stream : public virtual SvRefBase
+{
+public:
+
+    /**
+       Pointer to this stream.
+     */
+    typedef tools::SvRef<Stream> Pointer_t;
+
+    /**
+       Receives start mark for group with the same section properties.
+     */
+    virtual void startSectionGroup() = 0;
+
+    /**
+       Receives end mark for group with the same section properties.
+    */
+    virtual void endSectionGroup() = 0;
+
+    /// The current section is the last one in this body text.
+    virtual void markLastSectionGroup( ) { };
+
+    /**
+       Receives start mark for group with the same paragraph properties.
+     */
+    virtual void startParagraphGroup() = 0;
+
+    /**
+       Receives end mark for group with the same paragraph properties.
+     */
+    virtual void endParagraphGroup() = 0;
+
+    virtual void markLastParagraphInSection( ) { };
+
+    /**
+       Receives start mark for group with the same character properties.
+     */
+    virtual void startCharacterGroup() = 0;
+
+    /**
+       Receives end mark for group with the same character properties.
+     */
+    virtual void endCharacterGroup() = 0;
+
+    /**
+      Receives a shape.
+     */
+    virtual void startShape(css::uno::Reference<css::drawing::XShape> const& xShape) = 0;
+
+    virtual void endShape( ) = 0;
+
+    /**
+       Receives 8-bit per character text.
+
+       @param data  buffer containing the text
+       @param len   number of characters in the text
+     */
+    virtual void text(const sal_uInt8 * data, size_t len) = 0;
+
+    /**
+       Receives 16-bit per character text.
+
+       @param data    buffer containing the text
+       @param len     number of characters in the text.
+     */
+    virtual void utext(const sal_uInt8 * data, size_t len) = 0;
+
+    /**
+     * Offset in EMUs for a shape.
+     *
+     * Call *before* an ooxml::CT_PosH/V_posOffset sprm is sent.
+     */
+    virtual void positionOffset(const OUString& rText, bool bVertical) = 0;
+    /// Returns the last set offsets of a shape in HMM.
+    virtual css::awt::Point getPositionOffset() = 0;
+    /**
+     * Horizontal and vertical alignment for a shape.
+     *
+     * Call *before* an ooxml:CT_PosH/V_align sprm is sent.
+     */
+    virtual void align(const OUString& rText, bool bVertical) = 0;
+    virtual void positivePercentage(const OUString& rText) = 0;
+
+    /**
+       Receives properties of the current run of text.
+
+       @param ref    reference to the properties
+     */
+    virtual void props(writerfilter::Reference<Properties>::Pointer_t ref) = 0;
+
+    /**
+       Receives table.
+
+       @param name     name of the table
+       @param ref      reference to the table
+     */
+    virtual void table(Id name,
+                       writerfilter::Reference<Table>::Pointer_t ref) = 0;
+
+    /**
+        Receives a substream.
+
+        @param name    name of the substream
+        @param ref     reference to the substream
+    */
+    virtual void substream(Id name,
+                           writerfilter::Reference<Stream>::Pointer_t ref) = 0;
+
+    /**
+       Debugging: Receives information about current point in stream.
+
+       @param info     the information
+     */
+    virtual void info(const std::string & info) = 0;
+
+    /// Receives start mark for glossary document entry.
+    virtual void startGlossaryEntry() = 0;
+
+    /// Receives end mark for glossary document entry.
+    virtual void endGlossaryEntry() = 0;
+
+protected:
+    ~Stream() override {}
+};
+
+/**
+   A value.
+
+   The methods of this class may throw exceptions if a certain aspect
+   makes no sense for a certain value, e.g. the integer value of a
+   string.
+ */
+class Value : public virtual SvRefBase
+{
+public:
+    /**
+       Pointer to a value.
+     */
+    typedef tools::SvRef<Value> Pointer_t;
+
+    /**
+       Returns integer representation of the value.
+     */
+    virtual int getInt() const = 0;
+
+    /**
+       Returns string representation of the value.
+     */
+    virtual OUString getString() const = 0;
+
+    /**
+       Returns representation of the value as uno::Any.
+     */
+    virtual css::uno::Any getAny() const = 0;
+
+    /**
+       Returns properties of this value.
+     */
+    virtual writerfilter::Reference<Properties>::Pointer_t getProperties() = 0;
+
+    /**
+       Returns binary object  of this value.
+     */
+    virtual writerfilter::Reference<BinaryObj>::Pointer_t getBinary() = 0;
+
+    /**
+       Returns string representation of this value.
+     */
+#ifdef DBG_UTIL
+    virtual std::string toString() const = 0;
+#endif
+};
+
+/**
+   An SPRM: Section, Paragraph and Run Modifier
+
+ */
+class Sprm : public virtual SvRefBase
+{
+public:
+    typedef tools::SvRef<Sprm> Pointer_t;
+
+    /**
+       Returns id of the SPRM.
+     */
+    virtual sal_uInt32 getId() const = 0;
+
+    /**
+       Returns value of the SPRM.
+     */
+    virtual Value::Pointer_t getValue() = 0;
+
+    /**
+       Returns reference to properties contained in the SPRM.
+
+     */
+    virtual writerfilter::Reference<Properties>::Pointer_t getProps() = 0;
+
+    /**
+       Returns name of sprm.
+    */
+#ifdef DBG_UTIL
+    virtual std::string getName() const = 0;
+#endif
+
+    /**
+       Returns string representation of sprm.
+     */
+#ifdef DBG_UTIL
+    virtual std::string toString() const = 0;
+#endif
+
+protected:
+    ~Sprm() override {}
+};
+
+typedef sal_Int32 Token_t;
+
+}
+
+#endif // INCLUDED_WRITERFILTER_INC_DMAPPER_RESOURCEMODEL_HXX
+
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/writerfilter/inc/ooxml/OOXMLDocument.hxx b/writerfilter/inc/ooxml/OOXMLDocument.hxx
new file mode 100644
index 000000000..82dd78c77
--- /dev/null
+++ b/writerfilter/inc/ooxml/OOXMLDocument.hxx
@@ -0,0 +1,258 @@
+/* -*- 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/.
+ *
+ * This file incorporates work covered by the following license notice:
+ *
+ *   Licensed to the Apache Software Foundation (ASF) under one or more
+ *   contributor license agreements. See the NOTICE file distributed
+ *   with this work for additional information regarding copyright
+ *   ownership. The ASF licenses this file to you under the Apache
+ *   License, Version 2.0 (the "License"); you may not use this file
+ *   except in compliance with the License. You may obtain a copy of
+ *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
+ */
+#ifndef INCLUDED_WRITERFILTER_INC_OOXML_OOXMLDOCUMENT_HXX
+#define INCLUDED_WRITERFILTER_INC_OOXML_OOXMLDOCUMENT_HXX
+
+#include <sal/types.h>
+#include <com/sun/star/uno/Reference.hxx>
+#include <com/sun/star/io/XInputStream.hpp>
+#include <com/sun/star/uno/XComponentContext.hpp>
+#include <dmapper/resourcemodel.hxx>
+#include <com/sun/star/task/XStatusIndicator.hpp>
+#include <com/sun/star/xml/sax/XFastParser.hpp>
+#include <com/sun/star/xml/sax/XFastTokenHandler.hpp>
+#include <com/sun/star/xml/sax/XFastShapeContextHandler.hpp>
+#include <com/sun/star/xml/dom/XDocument.hpp>
+#include <com/sun/star/frame/XModel.hpp>
+#include <com/sun/star/drawing/XDrawPage.hpp>
+
+/**
+   @file OOXMLDocument.hxx
+
+   <h1>Import of OOXML WordprocessingML Documents</h1>
+
+   The following picture shows the classes involved in importing OOXML
+   WordprocessingML documents.
+
+   @image html ooxmlimportchain.png
+
+   The DOCX consists of parts. Each part is an XML document.  The
+   OOXMLDocument opens the DOCX and creates a SAX parser for the part
+   containing the main document content. The OOXMLDocument creates a
+   SAX handler, too. This handler is set as the handler for the events
+   created by the parser. Finally the OOXMLDocument initiates the
+   parsing process.
+
+   The SAX handler hosts a stack of contexts. Each context is an
+   instance of a class derived from OOXMLContext. There is a context
+   class for each <define> in the model.xml.
+
+   For a detailed information about how the contexts are handled see
+   the documentation for OOXMLContext.
+
+   The contexts know how to convert an element in OOXML to the
+   intermediate format that the domain mapper understands. They
+   enumerate the according entity in OOXML by sending the according
+   events to the domain mapper.
+
+   The domain mapper knows how to convert the intermediate format to
+   API calls. It takes the events sent by the contexts and uses the
+   core API to insert the according elements to the core.
+ */
+
+namespace writerfilter {
+namespace ooxml
+{
+
+class OOXMLStream : public virtual SvRefBase
+{
+public:
+    enum StreamType_t { UNKNOWN, DOCUMENT, STYLES, WEBSETTINGS, FONTTABLE, NUMBERING,
+        FOOTNOTES, ENDNOTES, COMMENTS, THEME, CUSTOMXML, CUSTOMXMLPROPS, GLOSSARY, CHARTS, EMBEDDINGS, SETTINGS, VBAPROJECT, FOOTER, HEADER, VBADATA };
+    typedef tools::SvRef<OOXMLStream> Pointer_t;
+
+    /**
+       Returns fast parser for this stream.
+     */
+    virtual css::uno::Reference<css::xml::sax::XFastParser> getFastParser() = 0;
+
+    virtual css::uno::Reference<css::io::XInputStream> getDocumentStream() = 0;
+
+    /**
+       Returns component context for this stream.
+     */
+    virtual css::uno::Reference<css::uno::XComponentContext> getContext() = 0;
+
+    /**
+       Returns target URL from relationships for a given id.
+
+       @param rId           the id to look for
+
+       @return the URL found or an empty string
+     */
+    virtual OUString getTargetForId(const OUString & rId) = 0;
+
+    virtual const OUString & getTarget() const = 0;
+
+    virtual css::uno::Reference<css::xml::sax::XFastTokenHandler>
+    getFastTokenHandler() = 0;
+
+};
+
+class OOXMLDocument : public writerfilter::Reference<Stream>
+{
+public:
+    /**
+       Pointer to this stream.
+    */
+    typedef tools::SvRef<OOXMLDocument> Pointer_t;
+
+    /**
+       Resolves this document to a stream handler.
+
+       @param rStream     stream handler to resolve this document to
+     */
+    virtual void resolve(Stream & rStream) override = 0;
+
+    /**
+       Resolves a footnote to a stream handler.
+
+       A footnote is resolved if either the note type or
+       note id matches.
+
+       @param rStream       stream handler to resolve to
+       @param rNoteType     type of footnote to resolve
+       @param rNoteId       id of the footnote to resolve
+     */
+    virtual void resolveFootnote(Stream & rStream,
+                                 Id aNoteType,
+                                 const sal_Int32 nNoteId) = 0;
+    /**
+       Resolves an endnote to a stream handler.
+
+       An endnote is resolved if either the note type or
+       note id matches.
+
+       @param rStream       stream handler to resolve to
+       @param rNoteType     type of footnote to resolve
+       @param rNoteId       id of the endnote to resolve
+     */
+    virtual void resolveEndnote(Stream & rStream,
+                                Id  aNoteType,
+                                const sal_Int32 NoteId) = 0;
+
+    /**
+       Resolves a comment to a stream handler.
+
+       @param rStream       stream handler to resolve to
+       @param rComment      id of the comment to resolve
+     */
+    virtual void resolveComment(Stream & rStream,
+                                const sal_Int32 nCommentId) = 0;
+
+    /**
+       Resolves a picture to a stream handler.
+
+       @param rStream       stream handler to resolve to
+       @param rPictureId    id of the picture to resolve
+     */
+    virtual void resolvePicture(Stream & rStream,
+                                const OUString & rPictureId) = 0;
+
+    /**
+       Resolves a header to a stream handler.
+
+       @param rStream       stream handler to resolve to
+       @param type          type of header to resolve:
+                            NS_ooxml::LN_Value_ST_HrdFtr_even     header on even page
+                            NS_ooxml::LN_Value_ST_HrdFtr_default  header on right page
+                            NS_ooxml::LN_Value_ST_HrdFtr_first    header on first page
+
+       @param rId           id of the header
+     */
+    virtual void resolveHeader(Stream & rStream,
+                               const sal_Int32 type,
+                               const OUString & rId) = 0;
+
+    /**
+       Resolves a footer to a stream handler.
+
+       @param rStream       stream handler to resolve to
+       @param type          type of footer to resolve:
+                            NS_ooxml::LN_Value_ST_HrdFtr_even     header on even page
+                            NS_ooxml::LN_Value_ST_HrdFtr_default  header on right page
+                            NS_ooxml::LN_Value_ST_HrdFtr_first    header on first page
+
+       @param rId           id of the header
+    */
+    virtual void resolveFooter(Stream & rStream,
+                               const sal_Int32 type,
+                               const OUString & rId) = 0;
+
+
+    /**
+       Returns target URL from relationships for a given id.
+
+       @param rId           the id to look for
+
+       @return the URL found or an empty string
+     */
+    virtual OUString getTargetForId(const OUString & rId) = 0;
+
+    virtual void setModel(css::uno::Reference<css::frame::XModel> xModel) = 0;
+    virtual css::uno::Reference<css::frame::XModel> getModel() = 0;
+    virtual void setDrawPage(css::uno::Reference<css::drawing::XDrawPage> xDrawPage) = 0;
+    virtual css::uno::Reference<css::drawing::XDrawPage> getDrawPage() = 0;
+    virtual css::uno::Reference<css::io::XInputStream> getInputStreamForId(const OUString & rId) = 0;
+    virtual void setXNoteId(const sal_Int32 nId) = 0;
+    virtual sal_Int32 getXNoteId() const = 0;
+    virtual const OUString & getTarget() const = 0;
+    virtual css::uno::Reference<css::xml::sax::XFastShapeContextHandler> getShapeContext( ) = 0;
+    virtual void setShapeContext( css::uno::Reference<css::xml::sax::XFastShapeContextHandler> xContext ) = 0;
+    /// Push context of drawingML shapes, so nested shapes are handled separately.
+    virtual void pushShapeContext() = 0;
+    /// Pop context of a previously pushed drawingML shape.
+    virtual void popShapeContext() = 0;
+    virtual css::uno::Reference<css::xml::dom::XDocument> getThemeDom( ) = 0;
+    virtual css::uno::Reference<css::xml::dom::XDocument> getGlossaryDocDom( ) = 0;
+    virtual css::uno::Sequence<css::uno::Sequence< css::uno::Any> > getGlossaryDomList() = 0;
+    virtual css::uno::Sequence<css::uno::Reference<css::xml::dom::XDocument> > getCustomXmlDomList( ) = 0;
+    virtual css::uno::Sequence<css::uno::Reference<css::xml::dom::XDocument> > getCustomXmlDomPropsList( ) = 0;
+    virtual css::uno::Sequence<css::beans::PropertyValue > getEmbeddingsList() = 0;
+};
+
+
+class OOXMLDocumentFactory
+{
+public:
+    static OOXMLStream::Pointer_t
+    createStream(const css::uno::Reference<css::uno::XComponentContext>& rContext,
+                 const css::uno::Reference<css::io::XInputStream>& rStream,
+                 bool bRepairStorage);
+
+    static OOXMLStream::Pointer_t
+    createStream(const OOXMLStream::Pointer_t& pStream,
+                 OOXMLStream::StreamType_t nStreamType);
+
+    static OOXMLStream::Pointer_t
+    createStream(const OOXMLStream::Pointer_t& pStream, const OUString & rId);
+
+    static OOXMLDocument *
+    createDocument(const OOXMLStream::Pointer_t& pStream,
+                 const css::uno::Reference<css::task::XStatusIndicator>& xStatusIndicator,
+                 bool bSkipImage, const css::uno::Sequence<css::beans::PropertyValue>& rDescriptor);
+
+};
+
+std::string fastTokenToId(sal_uInt32 nToken);
+
+}}
+#endif // INCLUDED_WRITERFILTER_INC_OOXML_OOXMLDOCUMENT_HXX
+
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/writerfilter/inc/ooxml/QNameToString.hxx b/writerfilter/inc/ooxml/QNameToString.hxx
new file mode 100644
index 000000000..9cdf13de1
--- /dev/null
+++ b/writerfilter/inc/ooxml/QNameToString.hxx
@@ -0,0 +1,36 @@
+/* -*- 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/.
+ *
+ * This file incorporates work covered by the following license notice:
+ *
+ *   Licensed to the Apache Software Foundation (ASF) under one or more
+ *   contributor license agreements. See the NOTICE file distributed
+ *   with this work for additional information regarding copyright
+ *   ownership. The ASF licenses this file to you under the Apache
+ *   License, Version 2.0 (the "License"); you may not use this file
+ *   except in compliance with the License. You may obtain a copy of
+ *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
+ */
+#ifndef INCLUDED_WRITERFILTER_INC_OOXML_QNAMETOSTRING_HXX
+#define INCLUDED_WRITERFILTER_INC_OOXML_QNAMETOSTRING_HXX
+
+#include <string>
+#include <dmapper/resourcemodel.hxx>
+
+namespace writerfilter
+{
+
+#ifdef DBG_UTIL
+    std::string QNameToString(Id);
+#endif
+
+}
+
+#endif // INCLUDED_WRITERFILTER_INC_OOXML_QNAMETOSTRING_HXX
+
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/writerfilter/inc/pch/precompiled_writerfilter.cxx b/writerfilter/inc/pch/precompiled_writerfilter.cxx
new file mode 100644
index 000000000..135ea5e8c
--- /dev/null
+++ b/writerfilter/inc/pch/precompiled_writerfilter.cxx
@@ -0,0 +1,12 @@
+/* -*- 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/.
+ */
+
+#include "precompiled_writerfilter.hxx"
+
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/writerfilter/inc/pch/precompiled_writerfilter.hxx b/writerfilter/inc/pch/precompiled_writerfilter.hxx
new file mode 100644
index 000000000..165ea77c7
--- /dev/null
+++ b/writerfilter/inc/pch/precompiled_writerfilter.hxx
@@ -0,0 +1,115 @@
+/* -*- 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/.
+ */
+
+/*
+ This file has been autogenerated by update_pch.sh. It is possible to edit it
+ manually (such as when an include file has been moved/renamed/removed). All such
+ manual changes will be rewritten by the next run of update_pch.sh (which presumably
+ also fixes all possible problems, so it's usually better to use it).
+
+ Generated on 2020-04-25 20:56:04 using:
+ ./bin/update_pch writerfilter writerfilter --cutoff=5 --exclude:system --exclude:module --exclude:local
+
+ If after updating build fails, use the following command to locate conflicting headers:
+ ./bin/update_pch_bisect ./writerfilter/inc/pch/precompiled_writerfilter.hxx "make writerfilter.build" --find-conflicts
+*/
+
+#if PCH_LEVEL >= 1
+#include <algorithm>
+#include <cassert>
+#include <cstddef>
+#include <functional>
+#include <iomanip>
+#include <memory>
+#include <ostream>
+#include <type_traits>
+#include <utility>
+#include <vector>
+#include <boost/logic/tribool.hpp>
+#endif // PCH_LEVEL >= 1
+#if PCH_LEVEL >= 2
+#include <osl/diagnose.h>
+#include <osl/diagnose.hxx>
+#include <osl/file.hxx>
+#include <osl/mutex.hxx>
+#include <osl/thread.h>
+#include <rtl/character.hxx>
+#include <rtl/instance.hxx>
+#include <rtl/locale.h>
+#include <rtl/math.hxx>
+#include <rtl/ref.hxx>
+#include <rtl/strbuf.h>
+#include <rtl/string.hxx>
+#include <rtl/stringconcat.hxx>
+#include <rtl/stringutils.hxx>
+#include <rtl/tencinfo.h>
+#include <rtl/textenc.h>
+#include <rtl/uri.hxx>
+#include <rtl/ustrbuf.hxx>
+#include <rtl/ustring.hxx>
+#include <sal/config.h>
+#include <sal/log.hxx>
+#include <sal/macros.h>
+#include <sal/types.h>
+#include <vcl/dllapi.h>
+#endif // PCH_LEVEL >= 2
+#if PCH_LEVEL >= 3
+#include <com/sun/star/beans/XPropertySet.hpp>
+#include <com/sun/star/drawing/XDrawPageSupplier.hpp>
+#include <com/sun/star/lang/XMultiServiceFactory.hpp>
+#include <com/sun/star/lang/XServiceInfo.hpp>
+#include <com/sun/star/lang/XTypeProvider.hpp>
+#include <com/sun/star/style/XStyleFamiliesSupplier.hpp>
+#include <com/sun/star/table/BorderLine2.hpp>
+#include <com/sun/star/text/HoriOrientation.hpp>
+#include <com/sun/star/text/RelOrientation.hpp>
+#include <com/sun/star/text/SizeType.hpp>
+#include <com/sun/star/text/TextContentAnchorType.hpp>
+#include <com/sun/star/text/VertOrientation.hpp>
+#include <com/sun/star/text/WrapTextMode.hpp>
+#include <com/sun/star/uno/Any.h>
+#include <com/sun/star/uno/Any.hxx>
+#include <com/sun/star/uno/Reference.h>
+#include <com/sun/star/uno/Reference.hxx>
+#include <com/sun/star/uno/RuntimeException.hpp>
+#include <com/sun/star/uno/Sequence.hxx>
+#include <com/sun/star/uno/Type.h>
+#include <com/sun/star/uno/Type.hxx>
+#include <com/sun/star/uno/XInterface.hpp>
+#include <com/sun/star/uno/genfunc.hxx>
+#include <comphelper/comphelperdllapi.h>
+#include <comphelper/propertysequence.hxx>
+#include <comphelper/sequence.hxx>
+#include <comphelper/sequenceashashmap.hxx>
+#include <cppu/cppudllapi.h>
+#include <cppu/unotype.hxx>
+#include <cppuhelper/implbase.hxx>
+#include <cppuhelper/implbase_ex.hxx>
+#include <cppuhelper/weak.hxx>
+#include <editeng/editengdllapi.h>
+#include <filter/msfilter/util.hxx>
+#include <o3tl/typed_flags_set.hxx>
+#include <oox/dllapi.h>
+#include <oox/drawingml/drawingmltypes.hxx>
+#include <ooxml/resourceids.hxx>
+#include <sfx2/dllapi.h>
+#include <tools/color.hxx>
+#include <tools/diagnose_ex.h>
+#include <tools/gen.hxx>
+#include <tools/ref.hxx>
+#include <tools/solar.h>
+#include <uno/data.h>
+#include <uno/sequence2.h>
+#include <unotools/mediadescriptor.hxx>
+#include <unotools/unotoolsdllapi.h>
+#endif // PCH_LEVEL >= 3
+#if PCH_LEVEL >= 4
+#endif // PCH_LEVEL >= 4
+
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/writerfilter/inc/rtftok/RTFDocument.hxx b/writerfilter/inc/rtftok/RTFDocument.hxx
new file mode 100644
index 000000000..55b1fbee3
--- /dev/null
+++ b/writerfilter/inc/rtftok/RTFDocument.hxx
@@ -0,0 +1,52 @@
+/*
+ * 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 INCLUDED_WRITERFILTER_INC_RTFTOK_RTFDOCUMENT_HXX
+#define INCLUDED_WRITERFILTER_INC_RTFTOK_RTFDOCUMENT_HXX
+
+#include <dmapper/resourcemodel.hxx>
+#include <com/sun/star/uno/XComponentContext.hpp>
+#include <com/sun/star/io/XInputStream.hpp>
+#include <com/sun/star/lang/XComponent.hpp>
+#include <com/sun/star/frame/XFrame.hpp>
+#include <com/sun/star/task/XStatusIndicator.hpp>
+#include <unotools/mediadescriptor.hxx>
+
+namespace writerfilter
+{
+namespace rtftok
+{
+/// The RTFDocument opens and resolves the RTF document.
+class RTFDocument : public writerfilter::Reference<Stream>
+{
+public:
+    /// Pointer to this stream.
+    using Pointer_t = tools::SvRef<RTFDocument>;
+
+    /// Resolves this document to a stream handler.
+    void resolve(Stream& rHandler) override = 0;
+};
+
+/// Interface to create an RTFDocument instance.
+class RTFDocumentFactory
+{
+public:
+    static RTFDocument::Pointer_t
+    createDocument(css::uno::Reference<css::uno::XComponentContext> const& xContext,
+                   css::uno::Reference<css::io::XInputStream> const& xInputStream,
+                   css::uno::Reference<css::lang::XComponent> const& xDstDoc,
+                   css::uno::Reference<css::frame::XFrame> const& xFrame,
+                   css::uno::Reference<css::task::XStatusIndicator> const& xStatusIndicator,
+                   const utl::MediaDescriptor& rMediaDescriptor);
+};
+} // namespace rtftok
+} // namespace writerfilter
+
+#endif // INCLUDED_WRITERFILTER_INC_RTFTOK_RTFDOCUMENT_HXX
+
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */