From ebc1c6cd7e421e7bee2c3221c14b8e82adbf275a Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?R=C3=BCdiger=20Timm?= <rt@openoffice.org>
Date: Thu, 4 Sep 2008 09:09:01 +0000
Subject: [PATCH] INTEGRATION: CWS swenhancedfields2 (1.5.140); FILE MERGED
 2008/08/05 15:25:25 b_michaelsen 1.5.140.3: post resync merge fixes
 2008/08/04 12:37:52 b_michaelsen 1.5.140.2: RESYNC: (1.5-1.7); FILE MERGED
 2008/04/23 09:01:55 ama 1.5.140.1: #i33737#: Enhanced fields

---
 .../source/text/XMLTextMarkImportContext.hxx  | 31 +++++++++++++++++--
 1 file changed, 28 insertions(+), 3 deletions(-)

diff --git a/xmloff/source/text/XMLTextMarkImportContext.hxx b/xmloff/source/text/XMLTextMarkImportContext.hxx
index 23e05ac3a20a..4491524e9ec2 100644
--- a/xmloff/source/text/XMLTextMarkImportContext.hxx
+++ b/xmloff/source/text/XMLTextMarkImportContext.hxx
@@ -7,7 +7,7 @@
  * OpenOffice.org - a multi-platform office productivity suite
  *
  * $RCSfile: XMLTextMarkImportContext.hxx,v $
- * $Revision: 1.7 $
+ * $Revision: 1.8 $
  *
  * This file is part of OpenOffice.org.
  *
@@ -49,6 +49,21 @@ namespace rtl {
 }
 class XMLTextImportHelper;
 
+class XMLFieldParamImportContext : public SvXMLImportContext
+{
+    XMLTextImportHelper& rHelper;
+public:
+    XMLFieldParamImportContext(
+        SvXMLImport& rImport,
+        XMLTextImportHelper& rHlp,
+        sal_uInt16 nPrfx,
+        const ::rtl::OUString& rLocalName );
+
+    virtual void StartElement(
+        const ::com::sun::star::uno::Reference<
+            ::com::sun::star::xml::sax::XAttributeList> & xAttrList);
+};
+
 
 /**
  * import bookmarks and reference marks
@@ -61,6 +76,9 @@ class XMLTextMarkImportContext : public SvXMLImportContext
 {
 
     XMLTextImportHelper& rHelper;
+    ::rtl::OUString m_XmlId;
+    ::rtl::OUString sBookmarkName;
+    ::rtl::OUString sFieldName;
 
 public:
 
@@ -72,14 +90,20 @@ public:
         sal_uInt16 nPrfx,
         const ::rtl::OUString& rLocalName );
 
+
 protected:
 
     virtual void StartElement(
         const ::com::sun::star::uno::Reference<
             ::com::sun::star::xml::sax::XAttributeList> & xAttrList);
+    virtual void EndElement();
+
+    virtual SvXMLImportContext *CreateChildContext( USHORT nPrefix,
+                                                    const ::rtl::OUString& rLocalName,
+                                                    const ::com::sun::star::uno::Reference< ::com::sun::star::xml::sax::XAttributeList >& xAttrList );
 
 public:
-    static void CreateAndInsertMark(
+    static ::com::sun::star::uno::Reference< ::com::sun::star::uno::XInterface > CreateAndInsertMark(
         SvXMLImport& rImport,
         const ::rtl::OUString& sServiceName,
         const ::rtl::OUString& sMarkName,
@@ -92,7 +116,8 @@ public:
         const ::com::sun::star::uno::Reference<
             ::com::sun::star::xml::sax::XAttributeList> & xAttrList,
         ::rtl::OUString& sName,
-        ::rtl::OUString& o_rXmlId);
+        ::rtl::OUString& o_rXmlId,
+        ::rtl::OUString *pFieldName=NULL);
 };
 
 #endif