diff --git a/xmloff/inc/XMLTextHeaderFooterContext.hxx b/xmloff/inc/XMLTextHeaderFooterContext.hxx
new file mode 100644
index 000000000000..f63255458cdf
--- /dev/null
+++ b/xmloff/inc/XMLTextHeaderFooterContext.hxx
@@ -0,0 +1,111 @@
+/*************************************************************************
+ *
+ *  $RCSfile: XMLTextHeaderFooterContext.hxx,v $
+ *
+ *  $Revision: 1.1 $
+ *
+ *  last change: $Author: mib $ $Date: 2000-10-12 17:51:18 $
+ *
+ *  The Contents of this file are made available subject to the terms of
+ *  either of the following licenses
+ *
+ *         - GNU Lesser General Public License Version 2.1
+ *         - Sun Industry Standards Source License Version 1.1
+ *
+ *  Sun Microsystems Inc., October, 2000
+ *
+ *  GNU Lesser General Public License Version 2.1
+ *  =============================================
+ *  Copyright 2000 by Sun Microsystems, Inc.
+ *  901 San Antonio Road, Palo Alto, CA 94303, USA
+ *
+ *  This library is free software; you can redistribute it and/or
+ *  modify it under the terms of the GNU Lesser General Public
+ *  License version 2.1, as published by the Free Software Foundation.
+ *
+ *  This library is distributed in the hope that it will be useful,
+ *  but WITHOUT ANY WARRANTY; without even the implied warranty of
+ *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+ *  Lesser General Public License for more details.
+ *
+ *  You should have received a copy of the GNU Lesser General Public
+ *  License along with this library; if not, write to the Free Software
+ *  Foundation, Inc., 59 Temple Place, Suite 330, Boston,
+ *  MA  02111-1307  USA
+ *
+ *
+ *  Sun Industry Standards Source License Version 1.1
+ *  =================================================
+ *  The contents of this file are subject to the Sun Industry Standards
+ *  Source License Version 1.1 (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.openoffice.org/license.html.
+ *
+ *  Software provided under this License is provided on an "AS IS" basis,
+ *  WITHOUT WARRANTY OF ANY KIND, EITHER EXPRESSED OR IMPLIED, INCLUDING,
+ *  WITHOUT LIMITATION, WARRANTIES THAT THE SOFTWARE IS FREE OF DEFECTS,
+ *  MERCHANTABLE, FIT FOR A PARTICULAR PURPOSE, OR NON-INFRINGING.
+ *  See the License for the specific provisions governing your rights and
+ *  obligations concerning the Software.
+ *
+ *  The Initial Developer of the Original Code is: Sun Microsystems, Inc.
+ *
+ *  Copyright: 2000 by Sun Microsystems, Inc.
+ *
+ *  All Rights Reserved.
+ *
+ *  Contributor(s): _______________________________________
+ *
+ *
+ ************************************************************************/
+#ifndef _XMLOFF_TEXTHEADERFOOTERCONTEXT_HXX_
+#define _XMLOFF_TEXTHEADERFOOTERCONTEXT_HXX_
+
+
+#ifndef _XMLOFF_XMLICTXT_HXX_
+#include "xmlictxt.hxx"
+#endif
+
+namespace com { namespace sun { namespace star {
+    namespace text { class XTextCursor; }
+    namespace beans { class XPropertySet; }
+} } }
+
+class XMLTextHeaderFooterContext: public SvXMLImportContext
+{
+    ::com::sun::star::uno::Reference <
+        ::com::sun::star::text::XTextCursor > xOldTextCursor;
+    ::com::sun::star::uno::Reference <
+        ::com::sun::star::beans::XPropertySet > xPropSet;
+
+    const ::rtl::OUString sOn;
+    const ::rtl::OUString sShareContent;
+    const ::rtl::OUString sText;
+    const ::rtl::OUString sTextLeft;
+
+    sal_Bool    bInsertContent : 1;
+    sal_Bool    bLeft : 1;
+
+public:
+    TYPEINFO();
+
+    XMLTextHeaderFooterContext( SvXMLImport& rImport, sal_uInt16 nPrfx,
+            const ::rtl::OUString& rLName,
+            const ::com::sun::star::uno::Reference<
+                    ::com::sun::star::xml::sax::XAttributeList > & xAttrList,
+            const ::com::sun::star::uno::Reference <
+                       ::com::sun::star::beans::XPropertySet > & rPageStylePropSet,
+               sal_Bool bFooter, sal_Bool bLft );
+
+    virtual ~XMLTextHeaderFooterContext();
+
+    virtual SvXMLImportContext *CreateChildContext(
+            sal_uInt16 nPrefix,
+            const ::rtl::OUString& rLocalName,
+            const ::com::sun::star::uno::Reference< ::com::sun::star::xml::sax::XAttributeList > & xAttrList );
+
+    virtual void EndElement();
+};
+
+
+#endif
diff --git a/xmloff/inc/xmlkywd.hxx b/xmloff/inc/xmlkywd.hxx
index 5605763d493a..8c7eb4ae7fc8 100644
--- a/xmloff/inc/xmlkywd.hxx
+++ b/xmloff/inc/xmlkywd.hxx
@@ -2,9 +2,9 @@
  *
  *  $RCSfile: xmlkywd.hxx,v $
  *
- *  $Revision: 1.12 $
+ *  $Revision: 1.13 $
  *
- *  last change: $Author: mib $ $Date: 2000-10-11 07:47:56 $
+ *  last change: $Author: mib $ $Date: 2000-10-12 17:51:18 $
  *
  *  The Contents of this file are made available subject to the terms of
  *  either of the following licenses
@@ -460,7 +460,7 @@ XML_CONSTASCII_ACTION( sXML_footnotes_position, "footnotes-position" );
 XML_CONSTASCII_ACTION( sXML_foreground, "foreground" );
 XML_CONSTASCII_ACTION( sXML_format_source, "format-source" );
 XML_CONSTASCII_ACTION( sXML_formula, "formula");
-XML_CONSTASCII_ACTION( sXML_formula_hidden, "formula_hidden");
+XML_CONSTASCII_ACTION( sXML_formula_hidden, "formula-hidden");
 XML_CONSTASCII_ACTION( sXML_fraction, "fraction" );
 XML_CONSTASCII_ACTION( sXML_frame, "frame" );
 XML_CONSTASCII_ACTION( sXML_frame_content, "frame-content" );
@@ -666,7 +666,7 @@ XML_CONSTASCII_ACTION( sXML_number_wrapped_paragraphs, "number-wrapped-paragraph
 XML_CONSTASCII_ACTION( sXML_object, "object" );
 XML_CONSTASCII_ACTION( sXML_object_count, "object-count" );
 XML_CONSTASCII_ACTION( sXML_object_name, "object-name");
-XML_CONSTASCII_ACTION( sXML_odd_page, "odd_page" );
+XML_CONSTASCII_ACTION( sXML_odd_page, "odd-page" );
 XML_CONSTASCII_ACTION( sXML_offset, "offset" );
 XML_CONSTASCII_ACTION( sXML_onLoad, "onLoad" );
 XML_CONSTASCII_ACTION( sXML_onRequest, "onRequest" );
diff --git a/xmloff/prj/d.lst b/xmloff/prj/d.lst
index 7c6a7e261093..b8d8d21a6421 100644
--- a/xmloff/prj/d.lst
+++ b/xmloff/prj/d.lst
@@ -73,3 +73,7 @@ hedabu: ..\inc\shapeimport.hxx %_DEST%\inc%_EXT%\xmloff\shapeimport.hxx
 hedabu: ..\inc\SchXMLExportHelper.hxx %_DEST%\inc%_EXT%\xmloff\SchXMLExportHelper.hxx
 hedabu: ..\inc\SchXMLImportHelper.hxx %_DEST%\inc%_EXT%\xmloff\SchXMLImportHelper.hxx
 hedabu: ..\inc\functional.hxx %_DEST%\inc%_EXT%\xmloff\functional.hxx
+hedabu: ..\inc\XMLPageExport.hxx %_DEST%\inc%_EXT%\xmloff\XMLPageExport.hxx
+hedabu: ..\inc\XMLTextMasterPageExport.hxx %_DEST%\inc%_EXT%\xmloff\XMLTextMasterPageExport.hxx
+hedabu: ..\inc\XMLTextMasterStylesContext.hxx %_DEST%\inc%_EXT%\xmloff\XMLTextMasterStylesContext.hxx
+hedabu: ..\inc\XMLTextMasterPageContext.hxx %_DEST%\inc%_EXT%\xmloff\XMLTextMasterPageContext.hxx