import of master pages

3 files changed, 29 insertions, 9 deletions

diff --git a/sw/source/filter/xml/xmlfmt.cxx b/sw/source/filter/xml/xmlfmt.cxx
index f86b9c9c744c..4a15c44aa044 100644
--- a/sw/source/filter/xml/xmlfmt.cxx
+++ b/sw/source/filter/xml/xmlfmt.cxx
@@ -2,9 +2,9 @@
  *
  *  $RCSfile: xmlfmt.cxx,v $
  *
- *  $Revision: 1.2 $
+ *  $Revision: 1.3 $
  *
- *  last change: $Author: mib $ $Date: 2000-09-28 12:45:50 $
+ *  last change: $Author: mib $ $Date: 2000-10-12 17:32:03 $
  *
  *  The Contents of this file are made available subject to the terms of
  *  either of the following licenses
@@ -143,6 +143,9 @@
 #ifndef _XMLOFF_FAMILIES_HXX
 #include <xmloff/families.hxx>
 #endif
+#ifndef _XMLOFF_XMLTEXTMASTERSTYLESCONTEXT_HXX
+#include <xmloff/XMLTextMasterStylesContext.hxx>
+#endif
 
 #ifndef _NUMRULE_HXX
 #include <numrule.hxx>
@@ -1622,6 +1625,16 @@ SvXMLImportContext *SwXMLImport::CreateStylesContext(
     return pContext;
 }
 
+SvXMLImportContext *SwXMLImport::CreateMasterStylesContext(
+        const OUString& rLocalName,
+        const Reference< xml::sax::XAttributeList > & xAttrList )
+{
+    SvXMLImportContext *pContext =
+        new XMLTextMasterStylesContext( *this, XML_NAMESPACE_OFFICE, rLocalName,
+                                          xAttrList );
+    return pContext;
+}
+
 void SwXMLImport::InsertStyles()
 {
     sal_Bool bStylesValid = xStyles.Is();
@@ -1687,11 +1700,14 @@ sal_Bool SwXMLImport::FindAutomaticStyle(
 
       Source Code Control System - Header
 
-      $Header: /zpool/svn/migration/cvs_rep_09_09_08/code/sw/source/filter/xml/xmlfmt.cxx,v 1.2 2000-09-28 12:45:50 mib Exp $
+      $Header: /zpool/svn/migration/cvs_rep_09_09_08/code/sw/source/filter/xml/xmlfmt.cxx,v 1.3 2000-10-12 17:32:03 mib Exp $
 
       Source Code Control System - Update
 
       $Log: not supported by cvs2svn $
+      Revision 1.2  2000/09/28 12:45:50  mib
+      Splitting and joining nodes in insert mode fixed
+
       Revision 1.1.1.1  2000/09/18 17:15:00  hr
       initial import
 
diff --git a/sw/source/filter/xml/xmlimp.cxx b/sw/source/filter/xml/xmlimp.cxx
index 1e7f69698e48..221f9238d172 100644
--- a/sw/source/filter/xml/xmlimp.cxx
+++ b/sw/source/filter/xml/xmlimp.cxx
@@ -2,9 +2,9 @@
  *
  *  $RCSfile: xmlimp.cxx,v $
  *
- *  $Revision: 1.2 $
+ *  $Revision: 1.3 $
  *
- *  last change: $Author: mib $ $Date: 2000-09-28 12:45:50 $
+ *  last change: $Author: mib $ $Date: 2000-10-12 17:32:03 $
  *
  *  The Contents of this file are made available subject to the terms of
  *  either of the following licenses
@@ -206,8 +206,8 @@ SvXMLImportContext *SwXMLDocContext_Impl::CreateChildContext(
 //                                                       xAttrList );
 //      break;
     case XML_TOK_DOC_MASTERSTYLES:
-//      pContext = GetSwImport().CreateMasterStylesContext( rLocalName,
-//                                                       xAttrList );
+        pContext = GetSwImport().CreateMasterStylesContext( rLocalName,
+                                                            xAttrList );
         break;
     case XML_TOK_DOC_META:
         pContext = GetSwImport().CreateMetaContext( rLocalName );
diff --git a/sw/source/filter/xml/xmlimp.hxx b/sw/source/filter/xml/xmlimp.hxx
index df399f6000ff..057a0365569c 100644
--- a/sw/source/filter/xml/xmlimp.hxx
+++ b/sw/source/filter/xml/xmlimp.hxx
@@ -2,9 +2,9 @@
  *
  *  $RCSfile: xmlimp.hxx,v $
  *
- *  $Revision: 1.2 $
+ *  $Revision: 1.3 $
  *
- *  last change: $Author: mib $ $Date: 2000-09-28 12:45:50 $
+ *  last change: $Author: mib $ $Date: 2000-10-12 17:32:03 $
  *
  *  The Contents of this file are made available subject to the terms of
  *  either of the following licenses
@@ -140,6 +140,10 @@ public:
                 const ::com::sun::star::uno::Reference<
                     ::com::sun::star::xml::sax::XAttributeList > & xAttrList,
                 sal_Bool bAuto );
+    SvXMLImportContext *CreateMasterStylesContext(
+                const ::rtl::OUString& rLocalName,
+                const ::com::sun::star::uno::Reference<
+                    ::com::sun::star::xml::sax::XAttributeList > & xAttrList );
     SvXMLImportContext *CreateBodyContext( const ::rtl::OUString& rLocalName );
     sal_uInt16 GetStyleFamilyMask() const { return nStyleFamilyMask; }
     sal_Bool IsInsertMode() const { return bInsert; }