#93467# eliminated (most) direct calls on XDocumentHandler

22 files changed, 673 insertions, 1125 deletions

diff --git a/xmloff/inc/DashStyle.hxx b/xmloff/inc/DashStyle.hxx
index 7242160a38e6..39436a562f0d 100644
--- a/xmloff/inc/DashStyle.hxx
+++ b/xmloff/inc/DashStyle.hxx
@@ -2,9 +2,9 @@
  *
  *  $RCSfile: DashStyle.hxx,v $
  *
- *  $Revision: 1.2 $
+ *  $Revision: 1.3 $
  *
- *  last change: $Author: dvo $ $Date: 2001-06-29 21:07:26 $
+ *  last change: $Author: dvo $ $Date: 2001-10-19 18:43:57 $
  *
  *  The Contents of this file are made available subject to the terms of
  *  either of the following licenses
@@ -62,44 +62,46 @@
 #ifndef _XMLOFF_DASHSTYLE_HXX
 #define _XMLOFF_DASHSTYLE_HXX
 
-#ifndef _COM_SUN_STAR_XML_SAX_XDOCUMENTHANDLER_HPP_
-#include <com/sun/star/xml/sax/XDocumentHandler.hpp>
+#ifndef _SAL_TYPES_H_
+#include <sal/types.h>
 #endif
 
-#ifndef _XMLOFF_XMLTOKEN_HXX
-#include "xmltoken.hxx"
-#endif
+class SvXMLImport;
+class SvXMLExport;
+namespace com { namespace sun { namespace star {
+    namespace uno { template<class A> class Reference; }
+    namespace xml { namespace sax { class XAttributeList; } }
+    namespace uno { class Any; }
+} } }
+namespace rtl { class OUString; }
 
-class SvXMLNamespaceMap;
-class SvXMLAttributeList;
-class SvXMLUnitConverter;
 
-class XMLDashStyle
+class XMLDashStyleImport
 {
-public:
-    XMLDashStyle( const ::com::sun::star::uno::Reference< ::com::sun::star::xml::sax::XDocumentHandler > * _pHandler,
-                        const SvXMLNamespaceMap& _rNamespaceMap, const SvXMLUnitConverter& _rUnitConverter );
-    ~XMLDashStyle();
+    SvXMLImport& rImport;
 
-    sal_Bool exportXML( const ::rtl::OUString& rStrName, const ::com::sun::star::uno::Any& rValue );
-    sal_Bool importXML( const ::com::sun::star::uno::Reference< ::com::sun::star::xml::sax::XAttributeList >& xAttrList, ::com::sun::star::uno::Any& rValue, ::rtl::OUString& rStrName );
+public:
+    XMLDashStyleImport( SvXMLImport& rImport );
+    ~XMLDashStyleImport();
 
-private:
-    const ::com::sun::star::uno::Reference< ::com::sun::star::xml::sax::XDocumentHandler > * mpHandler;
-    const SvXMLNamespaceMap&  mrNamespaceMap;
-    const SvXMLUnitConverter& mrUnitConverter;
+    sal_Bool importXML(
+        const ::com::sun::star::uno::Reference<
+                ::com::sun::star::xml::sax::XAttributeList >& xAttrList,
+        ::com::sun::star::uno::Any& rValue,
+        ::rtl::OUString& rStrName );
+};
 
-    SvXMLAttributeList *mpAttrList;
 
-    sal_Bool ImpExportXML( const ::com::sun::star::uno::Reference< ::com::sun::star::xml::sax::XDocumentHandler > & rHandler,
-                           const SvXMLNamespaceMap& rNamespaceMap, const SvXMLUnitConverter& rUnitConverter,
-                           const ::rtl::OUString& rStrName, const ::com::sun::star::uno::Any& rValue );
-    sal_Bool ImpImportXML( const SvXMLUnitConverter& rUnitConverter,
-                           const ::com::sun::star::uno::Reference< ::com::sun::star::xml::sax::XAttributeList >& xAttrList,
-                           ::com::sun::star::uno::Any& rValue, ::rtl::OUString& rStrName );
+class XMLDashStyleExport
+{
+    SvXMLExport& rExport;
 
-    void AddAttribute( sal_uInt16 nPrefix, enum ::xmloff::token::XMLTokenEnum eName, const ::rtl::OUString& rStrValue );
+public:
+    XMLDashStyleExport( SvXMLExport& rExport );
+    ~XMLDashStyleExport();
 
+    sal_Bool exportXML( const ::rtl::OUString& rStrName,
+                        const ::com::sun::star::uno::Any& rValue );
 };
 
 #endif // _XMLOFF_DASHSTYLE_HXX
diff --git a/xmloff/inc/GradientStyle.hxx b/xmloff/inc/GradientStyle.hxx
index db9445fd4592..24b177bc653b 100644
--- a/xmloff/inc/GradientStyle.hxx
+++ b/xmloff/inc/GradientStyle.hxx
@@ -2,9 +2,9 @@
  *
  *  $RCSfile: GradientStyle.hxx,v $
  *
- *  $Revision: 1.2 $
+ *  $Revision: 1.3 $
  *
- *  last change: $Author: dvo $ $Date: 2001-06-29 21:07:26 $
+ *  last change: $Author: dvo $ $Date: 2001-10-19 18:43:57 $
  *
  *  The Contents of this file are made available subject to the terms of
  *  either of the following licenses
@@ -62,45 +62,47 @@
 #ifndef _XMLOFF_GRADIENTSTYLE_HXX
 #define _XMLOFF_GRADIENTSTYLE_HXX
 
-#ifndef _COM_SUN_STAR_XML_SAX_XDOCUMENTHANDLER_HPP_
-#include <com/sun/star/xml/sax/XDocumentHandler.hpp>
-#endif
-
-#ifndef _XMLOFF_XMLTOKEN_HXX
-#include "xmltoken.hxx"
+#ifndef _SAL_TYPES_H_
+#include <sal/types.h>
 #endif
 
+class SvXMLImport;
+class SvXMLExport;
+namespace com { namespace sun { namespace star {
+    namespace uno { template<class A> class Reference; }
+    namespace xml { namespace sax { class XAttributeList; } }
+    namespace uno { class Any; }
+} } }
+namespace rtl { class OUString; }
 
-class SvXMLNamespaceMap;
-class SvXMLAttributeList;
-class SvXMLUnitConverter;
 
-class XMLGradientStyle
+class XMLGradientStyleImport
 {
-public:
-    XMLGradientStyle( const ::com::sun::star::uno::Reference< ::com::sun::star::xml::sax::XDocumentHandler > * _pHandler,
-                        const SvXMLNamespaceMap& _rNamespaceMap, const SvXMLUnitConverter& _rUnitConverter );
-    ~XMLGradientStyle();
+    SvXMLImport& rImport;
 
-    sal_Bool exportXML( const ::rtl::OUString& rStrName, const ::com::sun::star::uno::Any& rValue );
-    sal_Bool importXML( const ::com::sun::star::uno::Reference< ::com::sun::star::xml::sax::XAttributeList >& xAttrList, ::com::sun::star::uno::Any& rValue, ::rtl::OUString& rStrName );
+public:
+    XMLGradientStyleImport( SvXMLImport& rImport );
+    ~XMLGradientStyleImport();
 
-private:
-    const ::com::sun::star::uno::Reference< ::com::sun::star::xml::sax::XDocumentHandler > * mpHandler;
-    const SvXMLNamespaceMap&  mrNamespaceMap;
-    const SvXMLUnitConverter& mrUnitConverter;
+    sal_Bool importXML(
+        const ::com::sun::star::uno::Reference<
+           ::com::sun::star::xml::sax::XAttributeList >& xAttrList,
+        ::com::sun::star::uno::Any& rValue,
+        ::rtl::OUString& rStrName );
+};
 
-    SvXMLAttributeList *mpAttrList;
 
-    sal_Bool ImpExportXML( const ::com::sun::star::uno::Reference< ::com::sun::star::xml::sax::XDocumentHandler > & rHandler,
-                           const SvXMLNamespaceMap& rNamespaceMap, const SvXMLUnitConverter& rUnitConverter,
-                           const ::rtl::OUString& rStrName, const ::com::sun::star::uno::Any& rValue );
-    sal_Bool ImpImportXML( const SvXMLUnitConverter& rUnitConverter,
-                           const ::com::sun::star::uno::Reference< ::com::sun::star::xml::sax::XAttributeList >& xAttrList,
-                           ::com::sun::star::uno::Any& rValue, ::rtl::OUString& rStrName );
+class XMLGradientStyleExport
+{
+    SvXMLExport& rExport;
 
-    void AddAttribute( sal_uInt16 nPrefix, enum ::xmloff::token::XMLTokenEnum eName, const ::rtl::OUString& rStrValue );
+public:
+    XMLGradientStyleExport( SvXMLExport& rExport );
+    ~XMLGradientStyleExport();
 
+    sal_Bool exportXML(
+        const ::rtl::OUString& rStrName,
+        const ::com::sun::star::uno::Any& rValue );
 };
 
 #endif // _XMLOFF_GRADIENTSTYLE_HXX
diff --git a/xmloff/inc/HatchStyle.hxx b/xmloff/inc/HatchStyle.hxx
index 236dcd822f80..489b8b06400a 100644
--- a/xmloff/inc/HatchStyle.hxx
+++ b/xmloff/inc/HatchStyle.hxx
@@ -2,9 +2,9 @@
  *
  *  $RCSfile: HatchStyle.hxx,v $
  *
- *  $Revision: 1.2 $
+ *  $Revision: 1.3 $
  *
- *  last change: $Author: dvo $ $Date: 2001-06-29 21:07:26 $
+ *  last change: $Author: dvo $ $Date: 2001-10-19 18:43:57 $
  *
  *  The Contents of this file are made available subject to the terms of
  *  either of the following licenses
@@ -62,46 +62,44 @@
 #ifndef _XMLOFF_HATCHSTYLE_HXX
 #define _XMLOFF_HATCHSTYLE_HXX
 
-#ifndef _COM_SUN_STAR_XML_SAX_XDOCUMENTHANDLER_HPP_
-#include <com/sun/star/xml/sax/XDocumentHandler.hpp>
+#ifndef _SAL_TYPES_H_
+#include <sal/types.h>
 #endif
 
-#ifndef _XMLOFF_XMLTOKEN_HXX
-#include "xmltoken.hxx"
-#endif
-
-class SvXMLNamespaceMap;
-class SvXMLAttributeList;
-class SvXMLUnitConverter;
+class SvXMLImport;
+class SvXMLExport;
+namespace com { namespace sun { namespace star {
+    namespace uno { template<class A> class Reference; }
+    namespace xml { namespace sax { class XAttributeList; } }
+    namespace uno { class Any; }
+} } }
+namespace rtl { class OUString; }
 
-namespace com { namespace sun { namespace star { namespace rtl { class OUString; } } } }
 
-class XMLHatchStyle
+class XMLHatchStyleImport
 {
-public:
-    XMLHatchStyle( const ::com::sun::star::uno::Reference< ::com::sun::star::xml::sax::XDocumentHandler > & _rHandler,
-                        const SvXMLNamespaceMap& _rNamespaceMap, const SvXMLUnitConverter& _rUnitConverter );
-    ~XMLHatchStyle();
-
-    sal_Bool exportXML( const ::rtl::OUString& rStrName, const ::com::sun::star::uno::Any& rValue );
-    sal_Bool importXML( const ::com::sun::star::uno::Reference< ::com::sun::star::xml::sax::XAttributeList >& xAttrList, ::com::sun::star::uno::Any& rValue, ::rtl::OUString& rStrName );
+    SvXMLImport& rImport;
 
-private:
-    const ::com::sun::star::uno::Reference< ::com::sun::star::xml::sax::XDocumentHandler > & rHandler;
-    const SvXMLNamespaceMap&  mrNamespaceMap;
-    const SvXMLUnitConverter& rUnitConverter;
+public:
+    XMLHatchStyleImport( SvXMLImport& rImport );
+    ~XMLHatchStyleImport();
 
-    SvXMLAttributeList *pAttrList;
+    sal_Bool importXML(
+        const ::com::sun::star::uno::Reference<
+            ::com::sun::star::xml::sax::XAttributeList>& xAttrList,
+        ::com::sun::star::uno::Any& rValue,
+        ::rtl::OUString& rStrName );
+};
 
-    sal_Bool ImpExportXML( const ::com::sun::star::uno::Reference< ::com::sun::star::xml::sax::XDocumentHandler > & rHandler,
-                           const SvXMLNamespaceMap& rNamespaceMap, const SvXMLUnitConverter& rUnitConverter,
-                           const ::rtl::OUString& rStrName, const ::com::sun::star::uno::Any& rValue );
-    sal_Bool ImpImportXML( const SvXMLUnitConverter& rUnitConverter,
-                           const ::com::sun::star::uno::Reference< ::com::sun::star::xml::sax::XAttributeList >& xAttrList,
-                           ::com::sun::star::uno::Any& rValue, ::rtl::OUString& rStrName );
+class XMLHatchStyleExport
+{
+    SvXMLExport& rExport;
 
-    void AddAttribute( sal_uInt16 nPrefix, enum ::xmloff::token::XMLTokenEnum eName, const ::rtl::OUString& rStrValue );
+public:
+    XMLHatchStyleExport( SvXMLExport& rExport );
+    ~XMLHatchStyleExport();
 
+    sal_Bool exportXML( const ::rtl::OUString& rStrName, const ::com::sun::star::uno::Any& rValue );
 };
 
 #endif // _XMLOFF_HATCHELEMENT_HXX
diff --git a/xmloff/inc/MarkerStyle.hxx b/xmloff/inc/MarkerStyle.hxx
index 1f83e854d9aa..003317653aec 100644
--- a/xmloff/inc/MarkerStyle.hxx
+++ b/xmloff/inc/MarkerStyle.hxx
@@ -2,9 +2,9 @@
  *
  *  $RCSfile: MarkerStyle.hxx,v $
  *
- *  $Revision: 1.2 $
+ *  $Revision: 1.3 $
  *
- *  last change: $Author: dvo $ $Date: 2001-06-29 21:07:26 $
+ *  last change: $Author: dvo $ $Date: 2001-10-19 18:43:57 $
  *
  *  The Contents of this file are made available subject to the terms of
  *  either of the following licenses
@@ -62,44 +62,47 @@
 #ifndef _XMLOFF_MARKERSTYLE_HXX
 #define _XMLOFF_MARKERSTYLE_HXX
 
-#ifndef _COM_SUN_STAR_XML_SAX_XDOCUMENTHANDLER_HPP_
-#include <com/sun/star/xml/sax/XDocumentHandler.hpp>
-#endif
 
-#ifndef _XMLOFF_XMLTOKEN_HXX
-#include "xmltoken.hxx"
+#ifndef _SAL_TYPES_H_
+#include <sal/types.h>
 #endif
 
-class SvXMLNamespaceMap;
-class SvXMLAttributeList;
-class SvXMLUnitConverter;
+class SvXMLImport;
+class SvXMLExport;
+namespace com { namespace sun { namespace star {
+    namespace uno { template<class A> class Reference; }
+    namespace xml { namespace sax { class XAttributeList; } }
+    namespace uno { class Any; }
+} } }
+namespace rtl { class OUString; }
 
-class XMLMarkerStyle
-{
-public:
-    XMLMarkerStyle( const ::com::sun::star::uno::Reference< ::com::sun::star::xml::sax::XDocumentHandler > & _rHandler,
-                        const SvXMLNamespaceMap& _rNamespaceMap, const SvXMLUnitConverter& _rUnitConverter );
-    ~XMLMarkerStyle();
 
-    sal_Bool exportXML( const ::rtl::OUString& rStrName, const ::com::sun::star::uno::Any& rValue );
-    sal_Bool importXML( const ::com::sun::star::uno::Reference< ::com::sun::star::xml::sax::XAttributeList >& xAttrList, ::com::sun::star::uno::Any& rValue, ::rtl::OUString& rStrName );
+class XMLMarkerStyleImport
+{
+    SvXMLImport& rImport;
 
-private:
-    const ::com::sun::star::uno::Reference< ::com::sun::star::xml::sax::XDocumentHandler > & rHandler;
-    const SvXMLNamespaceMap&  mrNamespaceMap;
-    const SvXMLUnitConverter& rUnitConverter;
+public:
+    XMLMarkerStyleImport( SvXMLImport& rImport );
+    ~XMLMarkerStyleImport();
 
-    SvXMLAttributeList *pAttrList;
+    sal_Bool importXML(
+        const ::com::sun::star::uno::Reference<
+            ::com::sun::star::xml::sax::XAttributeList >& xAttrList,
+        ::com::sun::star::uno::Any& rValue,
+        ::rtl::OUString& rStrName );
+};
 
-    sal_Bool ImpExportXML( const ::com::sun::star::uno::Reference< ::com::sun::star::xml::sax::XDocumentHandler > & rHandler,
-                           const SvXMLNamespaceMap& rNamespaceMap, const SvXMLUnitConverter& rUnitConverter,
-                           const ::rtl::OUString& rStrName, const ::com::sun::star::uno::Any& rValue );
-    sal_Bool ImpImportXML( const SvXMLUnitConverter& rUnitConverter,
-                           const ::com::sun::star::uno::Reference< ::com::sun::star::xml::sax::XAttributeList >& xAttrList,
-                           ::com::sun::star::uno::Any& rValue, ::rtl::OUString& rStrName );
+class XMLMarkerStyleExport
+{
+    SvXMLExport& rExport;
 
-    void AddAttribute( sal_uInt16 nPrefix, enum ::xmloff::token::XMLTokenEnum eName, const ::rtl::OUString& rStrValue );
+public:
+    XMLMarkerStyleExport( SvXMLExport& rExport );
+    ~XMLMarkerStyleExport();
 
+    sal_Bool exportXML(
+        const ::rtl::OUString& rStrName,
+        const ::com::sun::star::uno::Any& rValue );
 };
 
 #endif // _XMLOFF_MARKERSTYLE_HXX
diff --git a/xmloff/inc/TransGradientStyle.hxx b/xmloff/inc/TransGradientStyle.hxx
index e8f0fc078d06..510ce58b4df5 100644
--- a/xmloff/inc/TransGradientStyle.hxx
+++ b/xmloff/inc/TransGradientStyle.hxx
@@ -2,9 +2,9 @@
  *
  *  $RCSfile: TransGradientStyle.hxx,v $
  *
- *  $Revision: 1.2 $
+ *  $Revision: 1.3 $
  *
- *  last change: $Author: dvo $ $Date: 2001-06-29 21:07:26 $
+ *  last change: $Author: dvo $ $Date: 2001-10-19 18:43:57 $
  *
  *  The Contents of this file are made available subject to the terms of
  *  either of the following licenses
@@ -62,44 +62,45 @@
 #ifndef _XMLOFF_TRANSGRADIENTSTYLE_HXX
 #define _XMLOFF_TRANSGRADIENTSTYLE_HXX
 
-#ifndef _COM_SUN_STAR_XML_SAX_XDOCUMENTHANDLER_HPP_
-#include <com/sun/star/xml/sax/XDocumentHandler.hpp>
-#endif
-#ifndef _XMLOFF_XMLTOKEN_HXX
-#include "xmltoken.hxx"
+
+#ifndef _SAL_TYPES_H_
+#include <sal/types.h>
 #endif
 
+class SvXMLImport;
+class SvXMLExport;
+namespace com { namespace sun { namespace star {
+    namespace uno { template<class A> class Reference; }
+    namespace xml { namespace sax { class XAttributeList; } }
+    namespace uno { class Any; }
+} } }
+namespace rtl { class OUString; }
 
-class SvXMLNamespaceMap;
-class SvXMLAttributeList;
-class SvXMLUnitConverter;
 
-class XMLTransGradientStyle
+class XMLTransGradientStyleImport
 {
-public:
-    XMLTransGradientStyle( const ::com::sun::star::uno::Reference< ::com::sun::star::xml::sax::XDocumentHandler > & _rHandler,
-                        const SvXMLNamespaceMap& _rNamespaceMap, const SvXMLUnitConverter& _rUnitConverter );
-    ~XMLTransGradientStyle();
-
-    sal_Bool exportXML( const ::rtl::OUString& rStrName, const ::com::sun::star::uno::Any& rValue );
-    sal_Bool importXML( const ::com::sun::star::uno::Reference< ::com::sun::star::xml::sax::XAttributeList >& xAttrList, ::com::sun::star::uno::Any& rValue, ::rtl::OUString& rStrName );
+    SvXMLImport& rImport;
 
-private:
-    const ::com::sun::star::uno::Reference< ::com::sun::star::xml::sax::XDocumentHandler > & rHandler;
-    const SvXMLNamespaceMap&  mrNamespaceMap;
-    const SvXMLUnitConverter& rUnitConverter;
+public:
+    XMLTransGradientStyleImport( SvXMLImport& rImport );
+    ~XMLTransGradientStyleImport();
 
-    SvXMLAttributeList *pAttrList;
+    sal_Bool importXML(
+        const ::com::sun::star::uno::Reference<
+            ::com::sun::star::xml::sax::XAttributeList >& xAttrList,
+        ::com::sun::star::uno::Any& rValue,
+        ::rtl::OUString& rStrName );
+};
 
-    sal_Bool ImpExportXML( const ::com::sun::star::uno::Reference< ::com::sun::star::xml::sax::XDocumentHandler > & rHandler,
-                           const SvXMLNamespaceMap& rNamespaceMap, const SvXMLUnitConverter& rUnitConverter,
-                           const ::rtl::OUString& rStrName, const ::com::sun::star::uno::Any& rValue );
-    sal_Bool ImpImportXML( const SvXMLUnitConverter& rUnitConverter,
-                           const ::com::sun::star::uno::Reference< ::com::sun::star::xml::sax::XAttributeList >& xAttrList,
-                           ::com::sun::star::uno::Any& rValue, ::rtl::OUString& rStrName );
+class XMLTransGradientStyleExport
+{
+    SvXMLExport& rExport;
 
-    void AddAttribute( sal_uInt16 nPrefix, enum ::xmloff::token::XMLTokenEnum eName, const ::rtl::OUString& rStrValue );
+public:
+    XMLTransGradientStyleExport( SvXMLExport& rExport );
+    ~XMLTransGradientStyleExport();
 
+    sal_Bool exportXML( const ::rtl::OUString& rStrName, const ::com::sun::star::uno::Any& rValue );
 };
 
 #endif // _XMLOFF_TRANSGRADIENTSTYLE_HXX
diff --git a/xmloff/inc/xmltabe.hxx b/xmloff/inc/xmltabe.hxx
index 2cda9ff108b6..1b08241b72eb 100644
--- a/xmloff/inc/xmltabe.hxx
+++ b/xmloff/inc/xmltabe.hxx
@@ -2,9 +2,9 @@
  *
  *  $RCSfile: xmltabe.hxx,v $
  *
- *  $Revision: 1.2 $
+ *  $Revision: 1.3 $
  *
- *  last change: $Author: dvo $ $Date: 2001-06-29 21:07:26 $
+ *  last change: $Author: dvo $ $Date: 2001-10-19 18:43:57 $
  *
  *  The Contents of this file are made available subject to the terms of
  *  either of the following licenses
@@ -62,66 +62,28 @@
 #ifndef _XMLOFF_XMLTABE_HXX
 #define _XMLOFF_XMLTABE_HXX
 
-#ifndef _RTL_USTRING_HXX_
-#include <rtl/ustring.hxx>
-#endif
-#ifndef _VCL_MAPUNIT_HXX
-#include <vcl/mapunit.hxx>
-#endif
+class SvXMLExport;
+namespace com { namespace sun { namespace star {
+    namespace style { struct TabStop; }
+    namespace uno { class Any; }
+} } }
 
-#ifndef _XMLOFF_ATTRLIST_HXX
-#include "attrlist.hxx"
-#endif
-
-#ifndef _XMLOFF_XMLTOKEN_HXX
-#include "xmltoken.hxx"
-#endif
-
-class SvXMLNamespaceMap;
-class SvXMLUnitConverter;
-
-#ifndef _COM_SUN_STAR_STYLE_TABSTOP_HPP_
-#include <com/sun/star/style/TabStop.hpp>
-#endif
 
 class SvxXMLTabStopExport
 {
-    const ::rtl::OUString msCDATA;
-    const ::rtl::OUString msWS;
-
-    ::com::sun::star::uno::Reference< ::com::sun::star::xml::sax::XDocumentHandler >            mxHandler;      // the handlers
-
-    SvXMLAttributeList          *mpAttrList;        // a common attribute list
-    ::com::sun::star::uno::Reference< ::com::sun::star::xml::sax::XAttributeList >          mxAttrList;     // and an interface of it
-
-    const SvXMLNamespaceMap     *mpNamespaceMap;    // the namepspace map
-    const SvXMLUnitConverter&   mrUnitConv;
+    SvXMLExport& rExport;   // for access to document handler
 
 protected:
 
-    // Check if common attribute list is empty.
-#ifdef PRODUCT
-    void CheckAttrList() {}
-#else
-    void CheckAttrList();
-#endif
-    void ClearAttrList();
-    void AddAttribute( sal_uInt16 nPrefixKey,
-                       enum ::xmloff::token::XMLTokenEnum eName,
-                       const ::rtl::OUString& rValue );
-    ::rtl::OUString GetQNameByKey( sal_uInt16 nKey,
-                            const ::rtl::OUString& rLocalName ) const;
-
     void exportTabStop( const ::com::sun::star::style::TabStop* pTabStop );
 
 public:
 
-    SvxXMLTabStopExport(  const ::com::sun::star::uno::Reference< ::com::sun::star::xml::sax::XDocumentHandler > & rHandler,
-                          const SvXMLUnitConverter& rUnitConverter );
+    SvxXMLTabStopExport(  SvXMLExport& rExport );
     virtual ~SvxXMLTabStopExport();
 
     // core API
-    void Export( const ::com::sun::star::uno::Any& rAny, const SvXMLNamespaceMap& rNamespMap );
+    void Export( const ::com::sun::star::uno::Any& rAny );
 };
 
 
diff --git a/xmloff/source/core/XMLBase64Export.cxx b/xmloff/source/core/XMLBase64Export.cxx
index 16004a8a5931..216b4822b1fd 100644
--- a/xmloff/source/core/XMLBase64Export.cxx
+++ b/xmloff/source/core/XMLBase64Export.cxx
@@ -2,9 +2,9 @@
  *
  *  $RCSfile: XMLBase64Export.cxx,v $
  *
- *  $Revision: 1.2 $
+ *  $Revision: 1.3 $
  *
- *  last change: $Author: mib $ $Date: 2001-06-19 14:51:24 $
+ *  last change: $Author: dvo $ $Date: 2001-10-19 18:43:57 $
  *
  *  The Contents of this file are made available subject to the terms of
  *  either of the following licenses
@@ -107,11 +107,9 @@ sal_Bool XMLBase64Export::exportXML( const Reference < XInputStream> & rIn )
             {
                 GetExport().GetMM100UnitConverter().encodeBase64( aOutBuff,
                                                                   aInBuff );
-                GetExport().GetDocHandler()->characters(
-                                            aOutBuff.makeStringAndClear() );
+                GetExport().Characters( aOutBuff.makeStringAndClear() );
                 if( nRead == INPUT_BUFFER_SIZE )
-                    GetExport().GetDocHandler()->ignorableWhitespace(
-                                            GetExport().sWS );
+                    GetExport().IgnorableWhitespace();
             }
         }
         while( nRead == INPUT_BUFFER_SIZE );
diff --git a/xmloff/source/core/xmlexp.cxx b/xmloff/source/core/xmlexp.cxx
index 168b41bcfb92..26eeb6558d36 100644
--- a/xmloff/source/core/xmlexp.cxx
+++ b/xmloff/source/core/xmlexp.cxx
@@ -2,9 +2,9 @@
  *
  *  $RCSfile: xmlexp.cxx,v $
  *
- *  $Revision: 1.90 $
+ *  $Revision: 1.91 $
  *
- *  last change: $Author: sab $ $Date: 2001-10-19 11:46:32 $
+ *  last change: $Author: dvo $ $Date: 2001-10-19 18:43:57 $
  *
  *  The Contents of this file are made available subject to the terms of
  *  either of the following licenses
@@ -402,7 +402,7 @@ SvXMLExport::SvXMLExport(
     _InitCtor();
 
     if (xNumberFormatsSupplier.is())
-        pNumExport = new SvXMLNumFmtExport(rHandler, xNumberFormatsSupplier);
+        pNumExport = new SvXMLNumFmtExport(*this, xNumberFormatsSupplier);
 }
 
 SvXMLExport::SvXMLExport(
@@ -435,7 +435,7 @@ SvXMLExport::SvXMLExport(
     _InitCtor();
 
     if (xNumberFormatsSupplier.is())
-        pNumExport = new SvXMLNumFmtExport(rHandler, xNumberFormatsSupplier);
+        pNumExport = new SvXMLNumFmtExport(*this, xNumberFormatsSupplier);
 }
 
 SvXMLExport::SvXMLExport(
@@ -470,7 +470,7 @@ SvXMLExport::SvXMLExport(
     _InitCtor();
 
     if (xNumberFormatsSupplier.is())
-        pNumExport = new SvXMLNumFmtExport(rHandler, xNumberFormatsSupplier);
+        pNumExport = new SvXMLNumFmtExport(*this, xNumberFormatsSupplier);
 }
 
 SvXMLExport::~SvXMLExport()
@@ -545,7 +545,7 @@ void SAL_CALL SvXMLExport::setSourceDocument( const uno::Reference< lang::XCompo
     {
         xNumberFormatsSupplier = xNumberFormatsSupplier.query( xModel );
         if(xNumberFormatsSupplier.is() && xHandler.is())
-            pNumExport = new SvXMLNumFmtExport(xHandler, xNumberFormatsSupplier);
+            pNumExport = new SvXMLNumFmtExport(*this, xNumberFormatsSupplier);
     }
     if (xExportInfo.is())
     {
@@ -650,7 +650,7 @@ void SAL_CALL SvXMLExport::initialize( const uno::Sequence< uno::Any >& aArgumen
             *pAny >>= xExtHandler;
 
             if (xNumberFormatsSupplier.is() && pNumExport == NULL)
-                pNumExport = new SvXMLNumFmtExport(xHandler, xNumberFormatsSupplier);
+                pNumExport = new SvXMLNumFmtExport(*this, xNumberFormatsSupplier);
         }
 
         // property set to transport data across
@@ -1049,8 +1049,8 @@ sal_uInt32 SvXMLExport::exportDoc( enum ::xmloff::token::XMLTokenEnum eClass )
 
 void SvXMLExport::_ExportMeta()
 {
-    SfxXMLMetaExport aMeta( GetDocHandler(), xModel );
-    aMeta.Export( GetNamespaceMap() );
+    SfxXMLMetaExport aMeta( *this, xModel );
+    aMeta.Export();
 }
 
 void SvXMLExport::_ExportViewSettings(const XMLSettingsExportHelper& rSettingsExportHelper)
@@ -1116,7 +1116,7 @@ void SvXMLExport::_ExportStyles( sal_Bool bUsed )
             uno::Reference< container::XNameAccess > xGradient( xFact->createInstance( OUString(RTL_CONSTASCII_USTRINGPARAM("com.sun.star.drawing.GradientTable") ) ), uno::UNO_QUERY );
             if( xGradient.is() )
             {
-                XMLGradientStyle aGradientStyle( &xHandler, *pNamespaceMap, *pUnitConv );
+                XMLGradientStyleExport aGradientStyle( *this );
 
                 if( xGradient->hasElements() )
                 {
@@ -1147,7 +1147,7 @@ void SvXMLExport::_ExportStyles( sal_Bool bUsed )
             uno::Reference< container::XNameAccess > xHatch( xFact->createInstance( OUString(RTL_CONSTASCII_USTRINGPARAM("com.sun.star.drawing.HatchTable") ) ), uno::UNO_QUERY );
             if( xHatch.is() )
             {
-                XMLHatchStyle aHatchStyle( xHandler, *pNamespaceMap, *pUnitConv );
+                XMLHatchStyleExport aHatchStyle( *this );
 
                 if( xHatch->hasElements() )
                 {
@@ -1209,7 +1209,7 @@ void SvXMLExport::_ExportStyles( sal_Bool bUsed )
             uno::Reference< container::XNameAccess > xTransGradient( xFact->createInstance( OUString(RTL_CONSTASCII_USTRINGPARAM("com.sun.star.drawing.TransparencyGradientTable") ) ), uno::UNO_QUERY );
             if( xTransGradient.is() )
             {
-                XMLTransGradientStyle aTransGradientstyle( xHandler, *pNamespaceMap, *pUnitConv );
+                XMLTransGradientStyleExport aTransGradientstyle( *this );
 
                 if( xTransGradient->hasElements() )
                 {
@@ -1240,7 +1240,7 @@ void SvXMLExport::_ExportStyles( sal_Bool bUsed )
             uno::Reference< container::XNameAccess > xMarker( xFact->createInstance( OUString(RTL_CONSTASCII_USTRINGPARAM("com.sun.star.drawing.MarkerTable") ) ), uno::UNO_QUERY );
             if( xMarker.is() )
             {
-                XMLMarkerStyle aMarkerStyle( xHandler, *pNamespaceMap, *pUnitConv );
+                XMLMarkerStyleExport aMarkerStyle( *this );
 
                 if( xMarker->hasElements() )
                 {
@@ -1271,7 +1271,7 @@ void SvXMLExport::_ExportStyles( sal_Bool bUsed )
             uno::Reference< container::XNameAccess > xDashes( xFact->createInstance( OUString(RTL_CONSTASCII_USTRINGPARAM("com.sun.star.drawing.DashTable") ) ), uno::UNO_QUERY );
             if( xDashes.is() )
             {
-                XMLDashStyle aDashStyle( &xHandler, *pNamespaceMap, *pUnitConv );
+                XMLDashStyleExport aDashStyle( *this );
 
                 if( xDashes->hasElements() )
                 {
@@ -1350,13 +1350,13 @@ void SvXMLExport::addDataStyle(const sal_Int32 nNumberFormat, sal_Bool bTimeForm
 void SvXMLExport::exportDataStyles()
 {
     if(pNumExport)
-        pNumExport->Export(*pNamespaceMap, sal_False);
+        pNumExport->Export(sal_False);
 }
 
 void SvXMLExport::exportAutoDataStyles()
 {
     if(pNumExport)
-        pNumExport->Export(*pNamespaceMap, sal_True);
+        pNumExport->Export(sal_True);
 
     if (mxFormExport.is())
         mxFormExport->exportAutoControlNumberStyles();
diff --git a/xmloff/source/forms/layerexport.cxx b/xmloff/source/forms/layerexport.cxx
index bdf5c0cb1a51..f7eb546cc8b3 100644
--- a/xmloff/source/forms/layerexport.cxx
+++ b/xmloff/source/forms/layerexport.cxx
@@ -2,9 +2,9 @@
  *
  *  $RCSfile: layerexport.cxx,v $
  *
- *  $Revision: 1.15 $
+ *  $Revision: 1.16 $
  *
- *  last change: $Author: fs $ $Date: 2001-06-11 06:34:30 $
+ *  last change: $Author: dvo $ $Date: 2001-10-19 18:43:58 $
  *
  *  The Contents of this file are made available subject to the terms of
  *  either of the following licenses
@@ -318,14 +318,14 @@ namespace xmloff
     void OFormLayerXMLExport_Impl::exportControlNumberStyles()
     {
         if (m_pControlNumberStyles)
-            m_pControlNumberStyles->Export(m_rContext.GetNamespaceMap(), sal_False);
+            m_pControlNumberStyles->Export(sal_False);
     }
 
     //---------------------------------------------------------------------
     void OFormLayerXMLExport_Impl::exportAutoControlNumberStyles()
     {
         if (m_pControlNumberStyles)
-            m_pControlNumberStyles->Export(m_rContext.GetNamespaceMap(), sal_True);
+            m_pControlNumberStyles->Export(sal_True);
     }
 
     //---------------------------------------------------------------------
@@ -645,7 +645,7 @@ namespace xmloff
             OSL_ENSURE(m_xControlNumberFormats.is(), "OFormLayerXMLExport_Impl::getControlNumberStyleExport: could not obtain my default number formats!");
 
             // create the exporter
-            m_pControlNumberStyles = new SvXMLNumFmtExport(m_rContext.GetDocHandler(), xFormatsSupplier, getControlNumberStyleNamePrefix());
+            m_pControlNumberStyles = new SvXMLNumFmtExport(m_rContext, xFormatsSupplier, getControlNumberStyleNamePrefix());
         }
     }
 
@@ -663,6 +663,9 @@ namespace xmloff
 /*************************************************************************
  * history:
  *  $Log: not supported by cvs2svn $
+ *  Revision 1.15  2001/06/11 06:34:30  fs
+ *  #87978# corrected popping states in examineForms
+ *
  *  Revision 1.14  2001/05/28 15:04:18  fs
  *  #86712# no releaseContext anymore
  *
diff --git a/xmloff/source/meta/MetaExportComponent.cxx b/xmloff/source/meta/MetaExportComponent.cxx
index 88d9347a19d4..53257de77c6f 100644
--- a/xmloff/source/meta/MetaExportComponent.cxx
+++ b/xmloff/source/meta/MetaExportComponent.cxx
@@ -2,9 +2,9 @@
  *
  *  $RCSfile: MetaExportComponent.cxx,v $
  *
- *  $Revision: 1.7 $
+ *  $Revision: 1.8 $
  *
- *  last change: $Author: mtg $ $Date: 2001-07-10 17:08:28 $
+ *  last change: $Author: dvo $ $Date: 2001-10-19 18:43:58 $
  *
  *  The Contents of this file are made available subject to the terms of
  *  either of the following licenses
@@ -151,8 +151,8 @@ sal_uInt32 XMLMetaExportComponent::exportDoc( enum XMLTokenEnum eClass )
 
             SvXMLElementExport aElem( *this, XML_NAMESPACE_OFFICE, XML_META,
                             sal_True, sal_True );
-            SfxXMLMetaExport aMeta( GetDocHandler(), GetModel() );
-            aMeta.Export( GetNamespaceMap() );
+            SfxXMLMetaExport aMeta( *this, GetModel() );
+            aMeta.Export();
         }
     }
     GetDocHandler()->endDocument();
diff --git a/xmloff/source/meta/xmlmetae.cxx b/xmloff/source/meta/xmlmetae.cxx
index b359f8fd8f78..a490b1ad814d 100644
--- a/xmloff/source/meta/xmlmetae.cxx
+++ b/xmloff/source/meta/xmlmetae.cxx
@@ -2,9 +2,9 @@
  *
  *  $RCSfile: xmlmetae.cxx,v $
  *
- *  $Revision: 1.7 $
+ *  $Revision: 1.8 $
  *
- *  last change: $Author: dvo $ $Date: 2001-06-29 21:07:15 $
+ *  last change: $Author: dvo $ $Date: 2001-10-19 18:43:58 $
  *
  *  The Contents of this file are made available subject to the terms of
  *  either of the following licenses
@@ -84,6 +84,10 @@
 #include "xmlnmspe.hxx"
 #endif
 
+#ifndef _XMLOFF_XMLEXP_HXX
+#include "xmlexp.hxx"
+#endif
+
 #ifndef _COM_SUN_STAR_DOCUMENT_XDOCUMENTINFOSUPPLIER_HPP_
 #include <com/sun/star/document/XDocumentInfoSupplier.hpp>
 #endif
@@ -189,12 +193,9 @@ rtl::OUString SfxXMLMetaExport::GetISODurationString( const Time& rTime )
 //-------------------------------------------------------------------------
 
 SfxXMLMetaExport::SfxXMLMetaExport(
-        const uno::Reference<xml::sax::XDocumentHandler>& rHdl,
+        SvXMLExport& rExp,
         const uno::Reference<frame::XModel>& rDocModel ) :
-    xHandler( rHdl ),
-    pNamespaceMap( NULL ),
-    sCDATA( GetXMLToken(XML_CDATA) ),
-    sWS( GetXMLToken(XML_WS) )
+    rExport( rExp )
 {
     uno::Reference<document::XDocumentInfoSupplier> xSupp( rDocModel, uno::UNO_QUERY );
     if ( xSupp.is() )
@@ -223,9 +224,6 @@ SfxXMLMetaExport::SfxXMLMetaExport(
 
     // for Image etc. there is no XModel and no document info
 //  DBG_ASSERT( xInfoProp.is(), "no document info properties" );
-
-    pAttrList = new SvXMLAttributeList;
-    xAttrList = pAttrList;
 }
 
 SfxXMLMetaExport::~SfxXMLMetaExport()
@@ -242,12 +240,10 @@ void SfxXMLMetaExport::SimpleStringElement( const rtl::OUString& rPropertyName,
     {
         if ( sValue.getLength() )
         {
-            rtl::OUString sElem = pNamespaceMap->GetQNameByKey( nNamespace,
-                                                   GetXMLToken(eElementName) );
-            xHandler->ignorableWhitespace( sWS );
-            xHandler->startElement( sElem, xAttrList );
-            xHandler->characters( sValue );
-            xHandler->endElement( sElem );
+            SvXMLElementExport aElem( rExport, nNamespace, eElementName,
+                                      sal_True, sal_False );
+            rExport.Characters( sValue );
+
         }
     }
 }
@@ -262,12 +258,9 @@ void SfxXMLMetaExport::SimpleDateTimeElement(
     {
         rtl::OUString sValue = GetISODateTimeString( aDateTime );
 
-        rtl::OUString sElem = pNamespaceMap->GetQNameByKey( nNamespace,
-                                                  GetXMLToken(eElementName) );
-        xHandler->ignorableWhitespace( sWS );
-        xHandler->startElement( sElem, xAttrList );
-        xHandler->characters( sValue );
-        xHandler->endElement( sElem );
+        SvXMLElementExport aElem( rExport, nNamespace, eElementName,
+                                  sal_True, sal_False );
+        rExport.Characters( sValue );
     }
 }
 
@@ -299,9 +292,8 @@ rtl::OUString lcl_GetProductName()
     return aName.makeStringAndClear();
 }
 
-void SfxXMLMetaExport::Export( const SvXMLNamespaceMap& rNamespaceMap )
+void SfxXMLMetaExport::Export()
 {
-    pNamespaceMap = &rNamespaceMap;
     if ( !xInfoProp.is() ) return;
 
     rtl::OUString sElem, sSubElem, sAttrName, sValue;
@@ -309,20 +301,17 @@ void SfxXMLMetaExport::Export( const SvXMLNamespaceMap& rNamespaceMap )
 
     //  generator (exported only)
     sValue = lcl_GetProductName();
-    sElem = pNamespaceMap->GetQNameByKey( XML_NAMESPACE_META,
-                                          GetXMLToken(XML_GENERATOR) );
-    xHandler->ignorableWhitespace( sWS );
-    xHandler->startElement( sElem, xAttrList );
-    xHandler->characters( sValue );
-    xHandler->endElement( sElem );
+    {
+        SvXMLElementExport aElem( rExport, XML_NAMESPACE_META, XML_GENERATOR,
+                                  sal_True, sal_True );
+        rExport.Characters( sValue );
+    }
 
     //  build-id as comment
-    uno::Reference<xml::sax::XExtendedDocumentHandler> xExt( xHandler,
-                                uno::UNO_QUERY );   //! pass in ctor?
-    if (xExt.is())
+    if (rExport.GetExtDocHandler().is())
     {
         sValue = String::CreateFromAscii( RSCUPDVER );
-        xExt->comment( sValue );
+        rExport.GetExtDocHandler()->comment( sValue );
     }
 
     //  document title
@@ -363,25 +352,19 @@ void SfxXMLMetaExport::Export( const SvXMLNamespaceMap& rNamespaceMap )
     aPropVal >>= sKeywords;
     if ( sKeywords.getLength() )
     {
-        sElem = pNamespaceMap->GetQNameByKey( XML_NAMESPACE_META,
-                            GetXMLToken(XML_KEYWORDS) );
-        xHandler->ignorableWhitespace( sWS );
-        xHandler->startElement( sElem, xAttrList );
+        SvXMLElementExport aElem( rExport, XML_NAMESPACE_META, XML_KEYWORDS,
+                                  sal_True, sal_True );
         sal_Int32 nTokenIndex = 0;
         do
         {
             rtl::OUString sKeyword = sKeywords.getToken( 0, ',', nTokenIndex ).trim();
 
-            sSubElem = pNamespaceMap->GetQNameByKey( XML_NAMESPACE_META,
-                                                   GetXMLToken(XML_KEYWORD) );
-            xHandler->ignorableWhitespace( sWS );
-            xHandler->startElement( sSubElem, xAttrList );
-            xHandler->characters( sKeyword );
-            xHandler->endElement( sSubElem );
+            SvXMLElementExport aKeywElem( rExport,
+                                          XML_NAMESPACE_META, XML_KEYWORD,
+                                          sal_True, sal_False );
+            rExport.Characters( sKeyword );
         }
         while ( nTokenIndex >= 0 );
-        xHandler->ignorableWhitespace( sWS );
-        xHandler->endElement( sElem );
     }
 
     //  document language
@@ -391,12 +374,9 @@ void SfxXMLMetaExport::Export( const SvXMLNamespaceMap& rNamespaceMap )
         sValue = ConvertLanguageToIsoString( eLanguage, '-' );
         if ( sValue.getLength() )
         {
-            sElem = pNamespaceMap->GetQNameByKey( XML_NAMESPACE_DC,
-                                                  GetXMLToken(XML_LANGUAGE) );
-            xHandler->ignorableWhitespace( sWS );
-            xHandler->startElement( sElem, xAttrList );
-            xHandler->characters( sValue );
-            xHandler->endElement( sElem );
+            SvXMLElementExport aElem( rExport, XML_NAMESPACE_DC, XML_LANGUAGE,
+                                      sal_True, sal_False );
+            aElem->Characters( sValue );
         }
     }
 #endif
@@ -408,12 +388,9 @@ void SfxXMLMetaExport::Export( const SvXMLNamespaceMap& rNamespaceMap )
             sValue += rtl::OUString::valueOf((sal_Unicode)'-');
             sValue += aLocale.Country;
         }
-        sElem = pNamespaceMap->GetQNameByKey( XML_NAMESPACE_DC,
-                                              GetXMLToken(XML_LANGUAGE) );
-        xHandler->ignorableWhitespace( sWS );
-        xHandler->startElement( sElem, xAttrList );
-        xHandler->characters( sValue );
-        xHandler->endElement( sElem );
+        SvXMLElementExport aElem( rExport, XML_NAMESPACE_DC, XML_LANGUAGE,
+                                  sal_True, sal_False );
+        rExport.Characters( sValue );
     }
 
     //  editing cycles
@@ -424,12 +401,10 @@ void SfxXMLMetaExport::Export( const SvXMLNamespaceMap& rNamespaceMap )
     {
         sValue = rtl::OUString::valueOf( nCycles );
 
-        sElem = pNamespaceMap->GetQNameByKey( XML_NAMESPACE_META,
-                                              GetXMLToken(XML_EDITING_CYCLES) );
-        xHandler->ignorableWhitespace( sWS );
-        xHandler->startElement( sElem, xAttrList );
-        xHandler->characters( sValue );
-        xHandler->endElement( sElem );
+        SvXMLElementExport aElem( rExport,
+                                  XML_NAMESPACE_META, XML_EDITING_CYCLES,
+                                  sal_True, sal_False );
+        rExport.Characters( sValue );
     }
 
     //  editing duration
@@ -442,12 +417,10 @@ void SfxXMLMetaExport::Export( const SvXMLNamespaceMap& rNamespaceMap )
         Time aDurTime( nDurVal );
         sValue = GetISODurationString( aDurTime );
 
-        sElem = pNamespaceMap->GetQNameByKey( XML_NAMESPACE_META,
-                                           GetXMLToken(XML_EDITING_DURATION) );
-        xHandler->ignorableWhitespace( sWS );
-        xHandler->startElement( sElem, xAttrList );
-        xHandler->characters( sValue );
-        xHandler->endElement( sElem );
+        SvXMLElementExport aElem( rExport,
+                                  XML_NAMESPACE_META, XML_EDITING_DURATION,
+                                  sal_True, sal_False );
+        rExport.Characters( sValue );
     }
 
     //  default target
@@ -457,27 +430,18 @@ void SfxXMLMetaExport::Export( const SvXMLNamespaceMap& rNamespaceMap )
     aPropVal >>= sDefTarget;
     if ( sDefTarget.getLength() )
     {
-        sAttrName = pNamespaceMap->GetQNameByKey( XML_NAMESPACE_OFFICE,
-                                          GetXMLToken(XML_TARGET_FRAME_NAME) );
-        pAttrList->AddAttribute( sAttrName, sCDATA, sDefTarget );
+        rExport.AddAttribute( XML_NAMESPACE_OFFICE, XML_TARGET_FRAME_NAME,
+                              sDefTarget );
 
         //! define strings for xlink:show values
-        rtl::OUString sShow = GetXMLToken(
-            sDefTarget.compareToAscii( "_blank" ) == 0 ? XML_NEW
-                                                       : XML_REPLACE );
-
-        sAttrName = pNamespaceMap->GetQNameByKey( XML_NAMESPACE_XLINK,
-                                                  GetXMLToken(XML_SHOW) );
-        pAttrList->AddAttribute( sAttrName, sCDATA, sShow );
-
-        sElem = pNamespaceMap->GetQNameByKey( XML_NAMESPACE_META,
-                                        GetXMLToken(XML_HYPERLINK_BEHAVIOUR) );
-
-        xHandler->ignorableWhitespace( sWS );
-        xHandler->startElement( sElem, xAttrList );
-        xHandler->endElement( sElem );
-
-        pAttrList->Clear();
+        XMLTokenEnum eShow =
+            sDefTarget.equalsAsciiL(RTL_CONSTASCII_STRINGPARAM("_blank"))
+                ? XML_NEW : XML_REPLACE;
+        rExport.AddAttribute( XML_NAMESPACE_XLINK, XML_SHOW, eShow );
+
+        SvXMLElementExport aElem( rExport,
+                                  XML_NAMESPACE_META,XML_HYPERLINK_BEHAVIOUR,
+                                  sal_True, sal_False );
     }
 
     //  auto-reload
@@ -494,9 +458,8 @@ void SfxXMLMetaExport::Export( const SvXMLNamespaceMap& rNamespaceMap )
         aPropVal >>= sReloadURL;
         if ( sReloadURL.getLength() )
         {
-            sAttrName = pNamespaceMap->GetQNameByKey( XML_NAMESPACE_XLINK,
-                                                      GetXMLToken(XML_HREF) );
-            pAttrList->AddAttribute( sAttrName, sCDATA, INetURLObject::AbsToRel( sReloadURL) );
+            rExport.AddAttribute( XML_NAMESPACE_XLINK, XML_HREF,
+                                  INetURLObject::AbsToRel( sReloadURL) );
         }
 
         aPropVal = xInfoProp->getPropertyValue(
@@ -508,19 +471,12 @@ void SfxXMLMetaExport::Export( const SvXMLNamespaceMap& rNamespaceMap )
             aTime.MakeTimeFromMS( nSecs * 1000 );
             rtl::OUString sReloadTime = GetISODurationString( aTime );
 
-            sAttrName = pNamespaceMap->GetQNameByKey( XML_NAMESPACE_META,
-                                                      GetXMLToken(XML_DELAY) );
-            pAttrList->AddAttribute( sAttrName, sCDATA, sReloadTime );
+            rExport.AddAttribute( XML_NAMESPACE_META, XML_DELAY, sReloadTime );
         }
 
-        sElem = pNamespaceMap->GetQNameByKey( XML_NAMESPACE_META,
-                                              GetXMLToken(XML_AUTO_RELOAD) );
 
-        xHandler->ignorableWhitespace( sWS );
-        xHandler->startElement( sElem, xAttrList );
-        xHandler->endElement( sElem );
-
-        pAttrList->Clear();
+        SvXMLElementExport aElem( rExport, XML_NAMESPACE_META, XML_AUTO_RELOAD,
+                                  sal_True, sal_False );
     }
 
     //  template
@@ -530,25 +486,13 @@ void SfxXMLMetaExport::Export( const SvXMLNamespaceMap& rNamespaceMap )
     aPropVal >>= sTplPath;
     if ( sTplPath.getLength() )
     {
-        sAttrName = pNamespaceMap->GetQNameByKey( XML_NAMESPACE_XLINK,
-                                                  GetXMLToken(XML_TYPE) );
-        pAttrList->AddAttribute( sAttrName, sCDATA,
-                                 GetXMLToken(XML_SIMPLE) );
-        sAttrName = pNamespaceMap->GetQNameByKey( XML_NAMESPACE_XLINK,
-                                                  GetXMLToken(XML_ACTUATE) );
-        pAttrList->AddAttribute( sAttrName, sCDATA,
-                                 GetXMLToken(XML_ONREQUEST) );
-
-        sAttrName = pNamespaceMap->GetQNameByKey( XML_NAMESPACE_XLINK,
-                                                  GetXMLToken(XML_ROLE) );
-        pAttrList->AddAttribute( sAttrName, sCDATA,
-                      pNamespaceMap->GetQNameByKey( XML_NAMESPACE_OFFICE,
-                                                 GetXMLToken(XML_TEMPLATE) ) );
+        rExport.AddAttribute( XML_NAMESPACE_XLINK, XML_TYPE, XML_SIMPLE );
+        rExport.AddAttribute( XML_NAMESPACE_XLINK, XML_ACTUATE, XML_ONREQUEST );
+        rExport.AddAttribute( XML_NAMESPACE_XLINK, XML_ROLE, XML_TEMPLATE );
 
         //  template URL
-        sAttrName = pNamespaceMap->GetQNameByKey( XML_NAMESPACE_XLINK,
-                                                  GetXMLToken(XML_HREF) );
-        pAttrList->AddAttribute( sAttrName, sCDATA, INetURLObject::AbsToRel(sTplPath) );
+        rExport.AddAttribute( XML_NAMESPACE_XLINK, XML_HREF,
+                              INetURLObject::AbsToRel(sTplPath) );
 
         //  template name
         aPropVal = xInfoProp->getPropertyValue(
@@ -557,9 +501,7 @@ void SfxXMLMetaExport::Export( const SvXMLNamespaceMap& rNamespaceMap )
         aPropVal >>= sTplName;
         if ( sTplName.getLength() )
         {
-            sAttrName = pNamespaceMap->GetQNameByKey( XML_NAMESPACE_XLINK,
-                                                      GetXMLToken(XML_TITLE) );
-            pAttrList->AddAttribute( sAttrName, sCDATA, sTplName );
+            rExport.AddAttribute( XML_NAMESPACE_XLINK, XML_TITLE, sTplName );
         }
 
         //  template date
@@ -570,47 +512,29 @@ void SfxXMLMetaExport::Export( const SvXMLNamespaceMap& rNamespaceMap )
         {
             rtl::OUString sTplDate = GetISODateTimeString( aDateTime );
 
-            sAttrName = pNamespaceMap->GetQNameByKey( XML_NAMESPACE_META,
-                                                      GetXMLToken(XML_DATE) );
-            pAttrList->AddAttribute( sAttrName, sCDATA, sTplDate );
+            rExport.AddAttribute( XML_NAMESPACE_META, XML_DATE, sTplDate );
         }
 
-        sElem = pNamespaceMap->GetQNameByKey( XML_NAMESPACE_META,
-                                              GetXMLToken(XML_TEMPLATE) );
-
-        xHandler->ignorableWhitespace( sWS );
-        xHandler->startElement( sElem, xAttrList );
-        xHandler->endElement( sElem );
-
-        pAttrList->Clear();
+        SvXMLElementExport aElem( rExport, XML_NAMESPACE_META, XML_TEMPLATE,
+                                  sal_True, sal_False );
     }
 
     //  user defined fields
     sal_Int16 nUFCount = xDocInfo->getUserFieldCount();
     if ( nUFCount )
     {
-        sSubElem = pNamespaceMap->GetQNameByKey( XML_NAMESPACE_META,
-                                               GetXMLToken(XML_USER_DEFINED) );
-        sAttrName = pNamespaceMap->GetQNameByKey( XML_NAMESPACE_META,
-                                                  GetXMLToken(XML_NAME) );
-
         for (sal_Int16 nUF=0; nUF<nUFCount; nUF++)
         {
             rtl::OUString aUFName = xDocInfo->getUserFieldName( nUF );
             rtl::OUString aUFValue = xDocInfo->getUserFieldValue( nUF );
 
-            pAttrList->AddAttribute( sAttrName, sCDATA, aUFName );
+            rExport.AddAttribute( XML_NAMESPACE_META, XML_NAME, aUFName );
 
-            xHandler->ignorableWhitespace( sWS );
-            xHandler->startElement( sSubElem, xAttrList );
-            xHandler->characters( aUFValue );
-            xHandler->endElement( sSubElem );
-
-            pAttrList->Clear();
+            SvXMLElementExport aElem( rExport, XML_NAMESPACE_META,
+                                      XML_USER_DEFINED, sal_True, sal_False );
+            rExport.Characters( aUFValue );
         }
     }
-
-    pNamespaceMap = NULL;
 }
 
 
diff --git a/xmloff/source/style/DashStyle.cxx b/xmloff/source/style/DashStyle.cxx
index 04bfa8ea0de3..fb2a0dde3e51 100644
--- a/xmloff/source/style/DashStyle.cxx
+++ b/xmloff/source/style/DashStyle.cxx
@@ -2,9 +2,9 @@
  *
  *  $RCSfile: DashStyle.cxx,v $
  *
- *  $Revision: 1.8 $
+ *  $Revision: 1.9 $
  *
- *  last change: $Author: dvo $ $Date: 2001-06-29 21:07:16 $
+ *  last change: $Author: dvo $ $Date: 2001-10-19 18:43:58 $
  *
  *  The Contents of this file are made available subject to the terms of
  *  either of the following licenses
@@ -80,23 +80,31 @@
 #endif
 
 #ifndef _XMLOFF_XMLUCONV_HXX
-#include"xmluconv.hxx"
+#include "xmluconv.hxx"
 #endif
 
 #ifndef _XMLOFF_XMLNMSPE_HXX
-#include"xmlnmspe.hxx"
+#include "xmlnmspe.hxx"
 #endif
 
 #ifndef _XMLOFF_XMLTOKEN_HXX
 #include "xmltoken.hxx"
 #endif
 
+#ifndef _XMLOFF_XMLEXP_HXX
+#include "xmlexp.hxx"
+#endif
+
+#ifndef _XMLOFF_XMLIMP_HXX
+#include "xmlimp.hxx"
+#endif
+
 #ifndef _RTL_USTRBUF_HXX_
-#include<rtl/ustrbuf.hxx>
+#include <rtl/ustrbuf.hxx>
 #endif
 
 #ifndef _RTL_USTRING_
-#include<rtl/ustring>
+#include <rtl/ustring>
 #endif
 
 #ifndef _TOOLS_DEBUG_HXX
@@ -144,43 +152,32 @@ SvXMLEnumMapEntry __READONLY_DATA pXML_DashStyle_Enum[] =
     { XML_TOKEN_INVALID, 0 }
 };
 
-XMLDashStyle::XMLDashStyle( const ::com::sun::star::uno::Reference< ::com::sun::star::xml::sax::XDocumentHandler > * _pHandler,
-                                        const SvXMLNamespaceMap& _rNamespaceMap, const SvXMLUnitConverter& _rUnitConverter )
-: mpHandler      ( _pHandler ),
-  mrNamespaceMap ( _rNamespaceMap ),
-  mrUnitConverter( _rUnitConverter ),
-  mpAttrList     ( NULL )
+XMLDashStyleExport::XMLDashStyleExport( SvXMLExport& rExp )
+    : rExport(rExp)
 {
 }
 
-XMLDashStyle::~XMLDashStyle()
+XMLDashStyleImport::XMLDashStyleImport( SvXMLImport& rImp )
+    : rImport(rImp)
 {
 }
 
-void XMLDashStyle::AddAttribute( sal_uInt16 nPrefix, enum XMLTokenEnum eName, const OUString& rStrValue )
+XMLDashStyleExport::~XMLDashStyleExport()
 {
-    const OUString aStrName( GetXMLToken( eName ) );
-    const OUString aStrCDATA( GetXMLToken( XML_CDATA ) );
-
-    mpAttrList->AddAttribute( mrNamespaceMap.GetQNameByKey( nPrefix, aStrName ), aStrCDATA, rStrValue );
 }
 
-sal_Bool XMLDashStyle::exportXML( const OUString& rStrName, const ::com::sun::star::uno::Any& rValue )
+XMLDashStyleImport::~XMLDashStyleImport()
 {
-    return ImpExportXML( *mpHandler, mrNamespaceMap, mrUnitConverter, rStrName, rValue );
 }
 
-sal_Bool XMLDashStyle::importXML( const uno::Reference< xml::sax::XAttributeList >& xAttrList, uno::Any& rValue, OUString& rStrName )
-{
-    return ImpImportXML( mrUnitConverter, xAttrList, rValue, rStrName );
-}
-
-sal_Bool XMLDashStyle::ImpExportXML( const ::com::sun::star::uno::Reference< ::com::sun::star::xml::sax::XDocumentHandler > & rHandler,
-                                           const SvXMLNamespaceMap& rNamespaceMap, const SvXMLUnitConverter& rUnitConverter,
-                                           const OUString& rStrName, const uno::Any& rValue )
+sal_Bool XMLDashStyleExport::exportXML(
+    const OUString& rStrName,
+    const uno::Any& rValue )
 {
     sal_Bool bRet = sal_False;
 
+    SvXMLUnitConverter rUnitConverter = rExport.GetMM100UnitConverter();
+
     drawing::LineDash aLineDash;
 
     if( rStrName.getLength() )
@@ -189,25 +186,22 @@ sal_Bool XMLDashStyle::ImpExportXML( const ::com::sun::star::uno::Reference< ::c
         {
             sal_Bool bIsRel = aLineDash.Style == drawing::DashStyle_RECTRELATIVE || aLineDash.Style == drawing::DashStyle_ROUNDRELATIVE;
 
-            mpAttrList = new SvXMLAttributeList();
-            uno::Reference< xml::sax::XAttributeList > xAttrList( mpAttrList );
-
             OUString aStrValue;
             OUStringBuffer aOut;
 
             // Name
-            AddAttribute( XML_NAMESPACE_DRAW, XML_NAME, rStrName );
+            rExport.AddAttribute( XML_NAMESPACE_DRAW, XML_NAME, rStrName );
 
             // Style
             rUnitConverter.convertEnum( aOut, aLineDash.Style, pXML_DashStyle_Enum );
             aStrValue = aOut.makeStringAndClear();
-            AddAttribute( XML_NAMESPACE_DRAW, XML_STYLE, aStrValue );
+            rExport.AddAttribute( XML_NAMESPACE_DRAW, XML_STYLE, aStrValue );
 
 
             // dots
             if( aLineDash.Dots )
             {
-                AddAttribute( XML_NAMESPACE_DRAW, XML_DOTS1, OUString::valueOf( (sal_Int32)aLineDash.Dots ) );
+                rExport.AddAttribute( XML_NAMESPACE_DRAW, XML_DOTS1, OUString::valueOf( (sal_Int32)aLineDash.Dots ) );
 
                 if( aLineDash.DotLen )
                 {
@@ -221,14 +215,14 @@ sal_Bool XMLDashStyle::ImpExportXML( const ::com::sun::star::uno::Reference< ::c
                         rUnitConverter.convertMeasure( aOut, aLineDash.DotLen );
                     }
                     aStrValue = aOut.makeStringAndClear();
-                    AddAttribute( XML_NAMESPACE_DRAW, XML_DOTS1_LENGTH, aStrValue );
+                    rExport.AddAttribute( XML_NAMESPACE_DRAW, XML_DOTS1_LENGTH, aStrValue );
                 }
             }
 
             // dashes
             if( aLineDash.Dashes )
             {
-                AddAttribute( XML_NAMESPACE_DRAW, XML_DOTS2, OUString::valueOf( (sal_Int32)aLineDash.Dashes ) );
+                rExport.AddAttribute( XML_NAMESPACE_DRAW, XML_DOTS2, OUString::valueOf( (sal_Int32)aLineDash.Dashes ) );
 
                 if( aLineDash.DashLen )
                 {
@@ -242,7 +236,7 @@ sal_Bool XMLDashStyle::ImpExportXML( const ::com::sun::star::uno::Reference< ::c
                         rUnitConverter.convertMeasure( aOut, aLineDash.DashLen );
                     }
                     aStrValue = aOut.makeStringAndClear();
-                    AddAttribute( XML_NAMESPACE_DRAW, XML_DOTS2_LENGTH, aStrValue );
+                    rExport.AddAttribute( XML_NAMESPACE_DRAW, XML_DOTS2_LENGTH, aStrValue );
                 }
             }
 
@@ -256,26 +250,22 @@ sal_Bool XMLDashStyle::ImpExportXML( const ::com::sun::star::uno::Reference< ::c
                 rUnitConverter.convertMeasure( aOut, aLineDash.Distance );
             }
             aStrValue = aOut.makeStringAndClear();
-            AddAttribute( XML_NAMESPACE_DRAW, XML_DISTANCE, aStrValue );
+            rExport.AddAttribute( XML_NAMESPACE_DRAW, XML_DISTANCE, aStrValue );
 
 
-            // Do Write
-            OUString sWS( GetXMLToken( XML_WS ) );
-            rHandler->ignorableWhitespace( sWS );
-            OUString sElem = rNamespaceMap.GetQNameByKey( XML_NAMESPACE_DRAW,
-                                           GetXMLToken(XML_STROKE_DASH) );
-
-            rHandler->startElement( sElem, xAttrList );
-            rHandler->endElement( sElem );
-            rHandler->ignorableWhitespace( sWS );
+            // do Write
+            SvXMLElementExport rElem( rExport,
+                                      XML_NAMESPACE_DRAW, XML_STROKE_DASH,
+                                      sal_True, sal_False );
         }
     }
     return bRet;
 }
 
-sal_Bool XMLDashStyle::ImpImportXML( const SvXMLUnitConverter& rUnitConverter,
-                                           const uno::Reference< xml::sax::XAttributeList >& xAttrList,
-                                           uno::Any& rValue, OUString& rStrName )
+sal_Bool XMLDashStyleImport::importXML(
+    const uno::Reference< xml::sax::XAttributeList >& xAttrList,
+    uno::Any& rValue,
+    OUString& rStrName )
 {
     drawing::LineDash aLineDash;
     aLineDash.Style = drawing::DashStyle_RECT;
@@ -287,6 +277,9 @@ sal_Bool XMLDashStyle::ImpImportXML( const SvXMLUnitConverter& rUnitConverter,
 
     sal_Bool bIsRel = sal_False;
 
+    SvXMLNamespaceMap& rNamespaceMap = rImport.GetNamespaceMap();
+    SvXMLUnitConverter& rUnitConverter = rImport.GetMM100UnitConverter();
+
     SvXMLTokenMap aTokenMap( aDashStyleAttrTokenMap );
 
     sal_Int16 nAttrCount = xAttrList.is() ? xAttrList->getLength() : 0;
@@ -294,11 +287,9 @@ sal_Bool XMLDashStyle::ImpImportXML( const SvXMLUnitConverter& rUnitConverter,
     {
         const OUString& rFullAttrName = xAttrList->getNameByIndex( i );
         OUString aStrAttrName;
-        sal_uInt16 nPrefix = mrNamespaceMap.GetKeyByAttrName( rFullAttrName, &aStrAttrName );
+        sal_uInt16 nPrefix = rNamespaceMap.GetKeyByAttrName( rFullAttrName, &aStrAttrName );
         const OUString& rStrValue = xAttrList->getValueByIndex( i );
 
-        sal_Int32 nTmpValue;
-
         switch( aTokenMap.Get( nPrefix, aStrAttrName ) )
         {
         case XML_TOK_DASH_NAME:
diff --git a/xmloff/source/style/FillStyleContext.cxx b/xmloff/source/style/FillStyleContext.cxx
index 56414460f0a5..696c6050ae25 100644
--- a/xmloff/source/style/FillStyleContext.cxx
+++ b/xmloff/source/style/FillStyleContext.cxx
@@ -2,9 +2,9 @@
  *
  *  $RCSfile: FillStyleContext.cxx,v $
  *
- *  $Revision: 1.5 $
+ *  $Revision: 1.6 $
  *
- *  last change: $Author: cl $ $Date: 2001-08-09 14:03:06 $
+ *  last change: $Author: dvo $ $Date: 2001-10-19 18:43:58 $
  *
  *  The Contents of this file are made available subject to the terms of
  *  either of the following licenses
@@ -123,7 +123,7 @@ XMLGradientStyleContext::XMLGradientStyleContext( SvXMLImport& rImport, sal_uInt
 //  SetFamily( XML_STYLE_FAMILY_FILLSTYLE_GRADIENT_ID );
 
     // start import
-    XMLGradientStyle aGradientStyle( NULL, GetImport().GetNamespaceMap(), GetImport().GetMM100UnitConverter() );
+    XMLGradientStyleImport aGradientStyle( GetImport() );
     aGradientStyle.importXML( xAttrList, maAny, maStrName );
 }
 
@@ -164,7 +164,7 @@ XMLHatchStyleContext::XMLHatchStyleContext( SvXMLImport& rImport, sal_uInt16 nPr
 :   SvXMLStyleContext(rImport, nPrfx, rLName, xAttrList)
 {
     // start import
-    XMLHatchStyle aHatchStyle( NULL, GetImport().GetNamespaceMap(), GetImport().GetMM100UnitConverter() );
+    XMLHatchStyleImport aHatchStyle( GetImport() );
     aHatchStyle.importXML( xAttrList, maAny, maStrName );
 }
 
@@ -280,7 +280,7 @@ XMLTransGradientStyleContext::XMLTransGradientStyleContext( SvXMLImport& rImport
 :   SvXMLStyleContext(rImport, nPrfx, rLName, xAttrList)
 {
     // start import
-    XMLTransGradientStyle aTransGradientStyle( NULL, GetImport().GetNamespaceMap(), GetImport().GetMM100UnitConverter() );
+    XMLTransGradientStyleImport aTransGradientStyle( GetImport() );
     aTransGradientStyle.importXML( xAttrList, maAny, maStrName );
 }
 
@@ -321,7 +321,7 @@ XMLMarkerStyleContext::XMLMarkerStyleContext( SvXMLImport& rImport, sal_uInt16 n
 :   SvXMLStyleContext(rImport, nPrfx, rLName, xAttrList)
 {
     // start import
-    XMLMarkerStyle aMarkerStyle( NULL, GetImport().GetNamespaceMap(), GetImport().GetMM100UnitConverter() );
+    XMLMarkerStyleImport aMarkerStyle( GetImport() );
     aMarkerStyle.importXML( xAttrList, maAny, maStrName );
 }
 
@@ -362,7 +362,7 @@ XMLDashStyleContext::XMLDashStyleContext( SvXMLImport& rImport, sal_uInt16 nPrfx
 :   SvXMLStyleContext(rImport, nPrfx, rLName, xAttrList)
 {
     // start import
-    XMLDashStyle aDashStyle( NULL, GetImport().GetNamespaceMap(), GetImport().GetMM100UnitConverter() );
+    XMLDashStyleImport aDashStyle( GetImport() );
     aDashStyle.importXML( xAttrList, maAny, maStrName );
 }
 
diff --git a/xmloff/source/style/GradientStyle.cxx b/xmloff/source/style/GradientStyle.cxx
index bb11f8cfd40d..3d93ab0cb5bd 100644
--- a/xmloff/source/style/GradientStyle.cxx
+++ b/xmloff/source/style/GradientStyle.cxx
@@ -2,9 +2,9 @@
  *
  *  $RCSfile: GradientStyle.cxx,v $
  *
- *  $Revision: 1.6 $
+ *  $Revision: 1.7 $
  *
- *  last change: $Author: dvo $ $Date: 2001-06-29 21:07:17 $
+ *  last change: $Author: dvo $ $Date: 2001-10-19 18:43:58 $
  *
  *  The Contents of this file are made available subject to the terms of
  *  either of the following licenses
@@ -64,7 +64,7 @@
 #endif
 
 #ifndef _COM_SUN_STAR_AWT_GRADIENT_HPP_
-#include<com/sun/star/awt/Gradient.hpp>
+#include <com/sun/star/awt/Gradient.hpp>
 #endif
 
 #ifndef _XMLOFF_ATTRLIST_HXX
@@ -76,11 +76,11 @@
 #endif
 
 #ifndef _XMLOFF_XMLUCONV_HXX
-#include"xmluconv.hxx"
+#include "xmluconv.hxx"
 #endif
 
 #ifndef _XMLOFF_XMLNMSPE_HXX
-#include"xmlnmspe.hxx"
+#include "xmlnmspe.hxx"
 #endif
 
 #ifndef _XMLOFF_XMLTOKEN_HXX
@@ -103,6 +103,16 @@
 #include "xmltkmap.hxx"
 #endif
 
+#ifndef _XMLOFF_XMLEXP_HXX
+#include "xmlexp.hxx"
+#endif
+
+#ifndef _XMLOFF_XMLIMP_HXX
+#include "xmlimp.hxx"
+#endif
+
+
+
 using namespace ::com::sun::star;
 using namespace ::rtl;
 using namespace ::xmloff::token;
@@ -148,40 +158,29 @@ SvXMLEnumMapEntry __READONLY_DATA pXML_GradientStyle_Enum[] =
     { XML_TOKEN_INVALID, 0 }
 };
 
-XMLGradientStyle::XMLGradientStyle( const ::com::sun::star::uno::Reference< ::com::sun::star::xml::sax::XDocumentHandler > * _pHandler,
-                                        const SvXMLNamespaceMap& _rNamespaceMap, const SvXMLUnitConverter& _rUnitConverter )
-: mpHandler      ( _pHandler ),
-  mrNamespaceMap ( _rNamespaceMap ),
-  mrUnitConverter( _rUnitConverter ),
-  mpAttrList     ( NULL )
+XMLGradientStyleImport::XMLGradientStyleImport(
+    SvXMLImport& rImp )
+    : rImport(rImp)
 {
 }
 
-XMLGradientStyle::~XMLGradientStyle()
+XMLGradientStyleExport::XMLGradientStyleExport(
+    SvXMLExport& rExp )
+    : rExport(rExp)
 {
 }
 
-void XMLGradientStyle::AddAttribute( sal_uInt16 nPrefix, enum ::xmloff::token::XMLTokenEnum eName, const OUString& rStrValue )
+XMLGradientStyleImport::~XMLGradientStyleImport()
 {
-    const OUString aStrName( GetXMLToken( eName ) );
-    const OUString aStrCDATA( GetXMLToken( XML_CDATA ) );
-
-    mpAttrList->AddAttribute( mrNamespaceMap.GetQNameByKey( nPrefix, aStrName ), aStrCDATA, rStrValue );
 }
 
-sal_Bool XMLGradientStyle::exportXML( const OUString& rStrName, const ::com::sun::star::uno::Any& rValue )
+XMLGradientStyleExport::~XMLGradientStyleExport()
 {
-    return ImpExportXML( *mpHandler, mrNamespaceMap, mrUnitConverter, rStrName, rValue );
 }
 
-sal_Bool XMLGradientStyle::importXML( const uno::Reference< xml::sax::XAttributeList >& xAttrList, uno::Any& rValue, OUString& rStrName )
-{
-    return ImpImportXML( mrUnitConverter, xAttrList, rValue, rStrName );
-}
-
-sal_Bool XMLGradientStyle::ImpExportXML( const ::com::sun::star::uno::Reference< ::com::sun::star::xml::sax::XDocumentHandler > & rHandler,
-                                           const SvXMLNamespaceMap& rNamespaceMap, const SvXMLUnitConverter& rUnitConverter,
-                                           const OUString& rStrName, const uno::Any& rValue )
+sal_Bool XMLGradientStyleExport::exportXML(
+    const OUString& rStrName,
+    const uno::Any& rValue )
 {
     sal_Bool bRet = sal_False;
     awt::Gradient aGradient;
@@ -190,21 +189,21 @@ sal_Bool XMLGradientStyle::ImpExportXML( const ::com::sun::star::uno::Reference<
     {
         if( rValue >>= aGradient )
         {
-            mpAttrList = new SvXMLAttributeList();  // Do NOT delete me !!
-            ::com::sun::star::uno::Reference< ::com::sun::star::xml::sax::XAttributeList > xAttrList( mpAttrList );
-
             OUString aStrValue;
             OUStringBuffer aOut;
 
+            SvXMLUnitConverter& rUnitConverter =
+                rExport.GetMM100UnitConverter();
+
             // Name
             OUString aStrName( rStrName );
-            AddAttribute( XML_NAMESPACE_DRAW, XML_NAME, aStrName );
+            rExport.AddAttribute( XML_NAMESPACE_DRAW, XML_NAME, aStrName );
 
             // Style
             if( !rUnitConverter.convertEnum( aOut, aGradient.Style, pXML_GradientStyle_Enum ) )
                 return sal_False;
             aStrValue = aOut.makeStringAndClear();
-            AddAttribute( XML_NAMESPACE_DRAW, XML_STYLE, aStrValue );
+            rExport.AddAttribute( XML_NAMESPACE_DRAW, XML_STYLE, aStrValue );
 
             // Center x/y
             if( aGradient.Style != awt::GradientStyle_LINEAR &&
@@ -212,11 +211,11 @@ sal_Bool XMLGradientStyle::ImpExportXML( const ::com::sun::star::uno::Reference<
             {
                 rUnitConverter.convertPercent( aOut, aGradient.XOffset );
                 aStrValue = aOut.makeStringAndClear();
-                AddAttribute( XML_NAMESPACE_DRAW, XML_CX, aStrValue );
+                rExport.AddAttribute( XML_NAMESPACE_DRAW, XML_CX, aStrValue );
 
                 rUnitConverter.convertPercent( aOut, aGradient.YOffset );
                 aStrValue = aOut.makeStringAndClear();
-                AddAttribute( XML_NAMESPACE_DRAW, XML_CY, aStrValue );
+                rExport.AddAttribute( XML_NAMESPACE_DRAW, XML_CY, aStrValue );
             }
 
             Color aColor;
@@ -225,54 +224,50 @@ sal_Bool XMLGradientStyle::ImpExportXML( const ::com::sun::star::uno::Reference<
             aColor.SetColor( aGradient.StartColor );
             rUnitConverter.convertColor( aOut, aColor );
             aStrValue = aOut.makeStringAndClear();
-            AddAttribute( XML_NAMESPACE_DRAW, XML_START_COLOR, aStrValue );
+            rExport.AddAttribute( XML_NAMESPACE_DRAW, XML_START_COLOR, aStrValue );
 
             // Color end
             aColor.SetColor( aGradient.EndColor );
             rUnitConverter.convertColor( aOut, aColor );
             aStrValue = aOut.makeStringAndClear();
-            AddAttribute( XML_NAMESPACE_DRAW, XML_END_COLOR, aStrValue );
+            rExport.AddAttribute( XML_NAMESPACE_DRAW, XML_END_COLOR, aStrValue );
 
             // Intensity start
             rUnitConverter.convertPercent( aOut, aGradient.StartIntensity );
             aStrValue = aOut.makeStringAndClear();
-            AddAttribute( XML_NAMESPACE_DRAW, XML_START_INTENSITY, aStrValue );
+            rExport.AddAttribute( XML_NAMESPACE_DRAW, XML_START_INTENSITY, aStrValue );
 
             // Intensity end
             rUnitConverter.convertPercent( aOut, aGradient.EndIntensity );
             aStrValue = aOut.makeStringAndClear();
-            AddAttribute( XML_NAMESPACE_DRAW, XML_END_INTENSITY, aStrValue );
+            rExport.AddAttribute( XML_NAMESPACE_DRAW, XML_END_INTENSITY, aStrValue );
 
             // Angle
             if( aGradient.Style != awt::GradientStyle_RADIAL )
             {
                 rUnitConverter.convertNumber( aOut, sal_Int32( aGradient.Angle ) );
                 aStrValue = aOut.makeStringAndClear();
-                AddAttribute( XML_NAMESPACE_DRAW, XML_GRADIENT_ANGLE, aStrValue );
+                rExport.AddAttribute( XML_NAMESPACE_DRAW, XML_GRADIENT_ANGLE, aStrValue );
             }
 
             // Border
             rUnitConverter.convertPercent( aOut, aGradient.Border );
             aStrValue = aOut.makeStringAndClear();
-            AddAttribute( XML_NAMESPACE_DRAW, XML_GRADIENT_BORDER, aStrValue );
+            rExport.AddAttribute( XML_NAMESPACE_DRAW, XML_GRADIENT_BORDER, aStrValue );
 
             // Do Write
-            OUString sWS( GetXMLToken( XML_WS ) );
-            rHandler->ignorableWhitespace( sWS );
-            OUString aStrTmp( GetXMLToken( XML_GRADIENT ) );
-            rHandler->startElement( rNamespaceMap.GetQNameByKey( XML_NAMESPACE_DRAW, aStrTmp ),
-                                    xAttrList );
-            rHandler->endElement( GetXMLToken( XML_GRADIENT ) );
-            rHandler->ignorableWhitespace( sWS );
+            SvXMLElementExport aElem( rExport, XML_NAMESPACE_DRAW, XML_GRADIENT,
+                                      sal_True, sal_False );
         }
     }
 
     return bRet;
 }
 
-sal_Bool XMLGradientStyle::ImpImportXML( const SvXMLUnitConverter& rUnitConverter,
-                                           const uno::Reference< xml::sax::XAttributeList >& xAttrList,
-                                           uno::Any& rValue, OUString& rStrName )
+sal_Bool XMLGradientStyleImport::importXML(
+    const uno::Reference< xml::sax::XAttributeList >& xAttrList,
+    uno::Any& rValue,
+    OUString& rStrName )
 {
     sal_Bool bRet           = sal_False;
     sal_Bool bHasName       = sal_False;
@@ -289,13 +284,15 @@ sal_Bool XMLGradientStyle::ImpImportXML( const SvXMLUnitConverter& rUnitConverte
     aGradient.Border = 0;
 
     SvXMLTokenMap aTokenMap( aGradientAttrTokenMap );
+    SvXMLNamespaceMap& rNamespaceMap = rImport.GetNamespaceMap();
+    SvXMLUnitConverter& rUnitConverter = rImport.GetMM100UnitConverter();
 
     sal_Int16 nAttrCount = xAttrList.is() ? xAttrList->getLength() : 0;
     for( sal_Int16 i=0; i < nAttrCount; i++ )
     {
         const OUString& rFullAttrName = xAttrList->getNameByIndex( i );
         OUString aStrAttrName;
-        sal_uInt16 nPrefix = mrNamespaceMap.GetKeyByAttrName( rFullAttrName, &aStrAttrName );
+        sal_uInt16 nPrefix = rNamespaceMap.GetKeyByAttrName( rFullAttrName, &aStrAttrName );
         const OUString& rStrValue = xAttrList->getValueByIndex( i );
 
         sal_Int32 nTmpValue;
@@ -372,3 +369,4 @@ sal_Bool XMLGradientStyle::ImpImportXML( const SvXMLUnitConverter& rUnitConverte
 
     return bRet;
 }
+
diff --git a/xmloff/source/style/HatchStyle.cxx b/xmloff/source/style/HatchStyle.cxx
index f65a4bf34eca..b37fc77f17cf 100644
--- a/xmloff/source/style/HatchStyle.cxx
+++ b/xmloff/source/style/HatchStyle.cxx
@@ -2,9 +2,9 @@
  *
  *  $RCSfile: HatchStyle.cxx,v $
  *
- *  $Revision: 1.5 $
+ *  $Revision: 1.6 $
  *
- *  last change: $Author: dvo $ $Date: 2001-06-29 21:07:17 $
+ *  last change: $Author: dvo $ $Date: 2001-10-19 18:43:58 $
  *
  *  The Contents of this file are made available subject to the terms of
  *  either of the following licenses
@@ -67,32 +67,36 @@
 #include <com/sun/star/drawing/Hatch.hpp>
 #endif
 
-#ifndef _XMLOFF_ATTRLIST_HXX
-#include"attrlist.hxx"
-#endif
-
 #ifndef _XMLOFF_NMSPMAP_HXX
 #include "nmspmap.hxx"
 #endif
 
 #ifndef _XMLOFF_XMLUCONV_HXX
-#include"xmluconv.hxx"
+#include "xmluconv.hxx"
 #endif
 
 #ifndef _XMLOFF_XMLNMSPE_HXX
-#include"xmlnmspe.hxx"
+#include "xmlnmspe.hxx"
 #endif
 
 #ifndef _XMLOFF_XMLTOKEN_HXX
 #include "xmltoken.hxx"
 #endif
 
+#ifndef _XMLOFF_XMLEXP_HXX
+#include "xmlexp.hxx"
+#endif
+
+#ifndef _XMLOFF_XMLIMP_HXX
+#include "xmlimp.hxx"
+#endif
+
 #ifndef _RTL_USTRBUF_HXX_
-#include<rtl/ustrbuf.hxx>
+#include <rtl/ustrbuf.hxx>
 #endif
 
 #ifndef _RTL_USTRING_
-#include<rtl/ustring>
+#include <rtl/ustring>
 #endif
 
 #ifndef _TOOLS_DEBUG_HXX
@@ -135,41 +139,27 @@ SvXMLEnumMapEntry __READONLY_DATA pXML_HatchStyle_Enum[] =
     { XML_TOKEN_INVALID, 0 }
 };
 
-XMLHatchStyle::XMLHatchStyle( const ::com::sun::star::uno::Reference< ::com::sun::star::xml::sax::XDocumentHandler > & _rHandler,
-                                        const SvXMLNamespaceMap& _rNamespaceMap, const SvXMLUnitConverter& _rUnitConverter )
-: rHandler      ( _rHandler ),
-  mrNamespaceMap ( _rNamespaceMap ),
-  rUnitConverter( _rUnitConverter ),
-  pAttrList     ( NULL )
+XMLHatchStyleImport::XMLHatchStyleImport( SvXMLImport& rImp )
+    : rImport(rImp)
 {
 }
 
-XMLHatchStyle::~XMLHatchStyle()
+XMLHatchStyleExport::XMLHatchStyleExport( SvXMLExport& rExp )
+    : rExport(rExp)
 {
 }
 
-void XMLHatchStyle::AddAttribute( sal_uInt16 nPrefix, enum ::xmloff::token::XMLTokenEnum eName, const ::rtl::OUString& rStrValue )
+XMLHatchStyleImport::~XMLHatchStyleImport()
 {
-    const ::rtl::OUString aStrName( GetXMLToken( eName ) );
-    const ::rtl::OUString aStrCDATA( GetXMLToken( XML_CDATA ) );
-
-    pAttrList->AddAttribute( mrNamespaceMap.GetQNameByKey( nPrefix, aStrName ), aStrCDATA, rStrValue );
 }
 
-sal_Bool XMLHatchStyle::exportXML( const ::rtl::OUString& rStrName, const ::com::sun::star::uno::Any& rValue )
+XMLHatchStyleExport::~XMLHatchStyleExport()
 {
-    return ImpExportXML( rHandler, mrNamespaceMap, rUnitConverter, rStrName, rValue );
 }
 
-sal_Bool XMLHatchStyle::importXML( const uno::Reference< xml::sax::XAttributeList >& xAttrList, uno::Any& rValue, OUString& rStrName )
-{
-    return ImpImportXML( rUnitConverter, xAttrList, rValue, rStrName );
-}
-
-
-sal_Bool XMLHatchStyle::ImpExportXML( const ::com::sun::star::uno::Reference< ::com::sun::star::xml::sax::XDocumentHandler > & rHandler,
-                                           const SvXMLNamespaceMap& rNamespaceMap, const SvXMLUnitConverter& rUnitConverter,
-                                           const ::rtl::OUString& rStrName, const uno::Any& rValue )
+sal_Bool XMLHatchStyleExport::exportXML(
+    const OUString& rStrName,
+    const uno::Any& rValue )
 {
     sal_Bool bRet = sal_False;
     drawing::Hatch aHatch;
@@ -178,52 +168,49 @@ sal_Bool XMLHatchStyle::ImpExportXML( const ::com::sun::star::uno::Reference< ::
     {
         if( rValue >>= aHatch )
         {
-            pAttrList = new SvXMLAttributeList();   // Do NOT delete me !!
-            ::com::sun::star::uno::Reference< ::com::sun::star::xml::sax::XAttributeList > xAttrList( pAttrList );
+            OUString aStrValue;
+            OUStringBuffer aOut;
 
-            ::rtl::OUString aStrValue;
-            ::rtl::OUStringBuffer aOut;
+            SvXMLUnitConverter& rUnitConverter =
+                rExport.GetMM100UnitConverter();
 
             // Name
-            AddAttribute( XML_NAMESPACE_DRAW, XML_NAME, rStrName );
+            rExport.AddAttribute( XML_NAMESPACE_DRAW, XML_NAME, rStrName );
 
             // Style
             if( !rUnitConverter.convertEnum( aOut, aHatch.Style, pXML_HatchStyle_Enum ) )
                 return sal_False;
             aStrValue = aOut.makeStringAndClear();
-            AddAttribute( XML_NAMESPACE_DRAW, XML_STYLE, aStrValue );
+            rExport.AddAttribute( XML_NAMESPACE_DRAW, XML_STYLE, aStrValue );
 
             // Color
             rUnitConverter.convertColor( aOut, Color( aHatch.Color ) );
             aStrValue = aOut.makeStringAndClear();
-            AddAttribute( XML_NAMESPACE_DRAW, XML_COLOR, aStrValue );
+            rExport.AddAttribute( XML_NAMESPACE_DRAW, XML_COLOR, aStrValue );
 
             // Distance
             rUnitConverter.convertMeasure( aOut, aHatch.Distance );
             aStrValue = aOut.makeStringAndClear();
-            AddAttribute( XML_NAMESPACE_DRAW, XML_HATCH_DISTANCE, aStrValue );
+            rExport.AddAttribute( XML_NAMESPACE_DRAW, XML_HATCH_DISTANCE, aStrValue );
 
             // Angle
             rUnitConverter.convertNumber( aOut, sal_Int32( aHatch.Angle ) );
             aStrValue = aOut.makeStringAndClear();
-            AddAttribute( XML_NAMESPACE_DRAW, XML_ROTATION, aStrValue );
+            rExport.AddAttribute( XML_NAMESPACE_DRAW, XML_ROTATION, aStrValue );
 
             // Do Write
-            OUString sWS( GetXMLToken( XML_WS ) );
-            rHandler->ignorableWhitespace( sWS );
-            rHandler->startElement( rNamespaceMap.GetQNameByKey( XML_NAMESPACE_DRAW, GetXMLToken(XML_HATCH) ),
-                                    xAttrList );
-            rHandler->endElement( GetXMLToken( XML_GRADIENT ) );
-            rHandler->ignorableWhitespace( sWS );
+            SvXMLElementExport rElem( rExport, XML_NAMESPACE_DRAW, XML_GRADIENT,
+                                      sal_True, sal_False );
         }
     }
 
     return bRet;
 }
 
-sal_Bool XMLHatchStyle::ImpImportXML( const SvXMLUnitConverter& rUnitConverter,
-                                        const uno::Reference< xml::sax::XAttributeList >& xAttrList,
-                                        uno::Any& rValue, OUString& rStrName )
+sal_Bool XMLHatchStyleImport::importXML(
+    const uno::Reference< xml::sax::XAttributeList >& xAttrList,
+    uno::Any& rValue,
+    OUString& rStrName )
 {
     sal_Bool bRet = sal_False;
 
@@ -239,13 +226,15 @@ sal_Bool XMLHatchStyle::ImpImportXML( const SvXMLUnitConverter& rUnitConverter,
     aHatch.Angle = 0;
 
     SvXMLTokenMap aTokenMap( aHatchAttrTokenMap );
+    SvXMLNamespaceMap rNamespaceMap = rImport.GetNamespaceMap();
+    SvXMLUnitConverter& rUnitConverter = rImport.GetMM100UnitConverter();
 
     sal_Int16 nAttrCount = xAttrList.is() ? xAttrList->getLength() : 0;
     for( sal_Int16 i=0; i < nAttrCount; i++ )
     {
         const OUString& rFullAttrName = xAttrList->getNameByIndex( i );
         OUString aStrAttrName;
-        sal_uInt16 nPrefix = mrNamespaceMap.GetKeyByAttrName( rFullAttrName, &aStrAttrName );
+        sal_uInt16 nPrefix = rNamespaceMap.GetKeyByAttrName( rFullAttrName, &aStrAttrName );
         const OUString& rStrValue = xAttrList->getValueByIndex( i );
 
         switch( aTokenMap.Get( nPrefix, aStrAttrName ) )
diff --git a/xmloff/source/style/MarkerStyle.cxx b/xmloff/source/style/MarkerStyle.cxx
index 726e6b968e02..e37cb2f82334 100644
--- a/xmloff/source/style/MarkerStyle.cxx
+++ b/xmloff/source/style/MarkerStyle.cxx
@@ -2,9 +2,9 @@
  *
  *  $RCSfile: MarkerStyle.cxx,v $
  *
- *  $Revision: 1.5 $
+ *  $Revision: 1.6 $
  *
- *  last change: $Author: dvo $ $Date: 2001-06-29 21:07:17 $
+ *  last change: $Author: dvo $ $Date: 2001-10-19 18:43:58 $
  *
  *  The Contents of this file are made available subject to the terms of
  *  either of the following licenses
@@ -87,6 +87,14 @@
 #include "xmltoken.hxx"
 #endif
 
+#ifndef _XMLOFF_XMLEXP_HXX
+#include "xmlexp.hxx"
+#endif
+
+#ifndef _XMLOFF_XMLIMP_HXX
+#include "xmlimp.hxx"
+#endif
+
 #ifndef _RTL_USTRBUF_HXX_
 #include <rtl/ustrbuf.hxx>
 #endif
@@ -103,40 +111,28 @@ using namespace ::com::sun::star;
 using namespace ::rtl;
 using namespace ::xmloff::token;
 
-XMLMarkerStyle::XMLMarkerStyle( const ::com::sun::star::uno::Reference< ::com::sun::star::xml::sax::XDocumentHandler > & _rHandler,
-                                        const SvXMLNamespaceMap& _rNamespaceMap, const SvXMLUnitConverter& _rUnitConverter )
-: rHandler      ( _rHandler ),
-  mrNamespaceMap ( _rNamespaceMap ),
-  rUnitConverter( _rUnitConverter ),
-  pAttrList     ( NULL )
-{
-}
 
-XMLMarkerStyle::~XMLMarkerStyle()
+XMLMarkerStyleImport::XMLMarkerStyleImport( SvXMLImport& rImp )
+    : rImport( rImp )
 {
 }
 
-void XMLMarkerStyle::AddAttribute( sal_uInt16 nPrefix, enum XMLTokenEnum eName, const OUString& rStrValue )
+XMLMarkerStyleImport::~XMLMarkerStyleImport()
 {
-    const OUString aStrName( GetXMLToken( eName ) );
-    const OUString aStrCDATA( GetXMLToken( XML_CDATA ) );
-
-    pAttrList->AddAttribute( mrNamespaceMap.GetQNameByKey( nPrefix, aStrName ), aStrCDATA, rStrValue );
 }
 
-sal_Bool XMLMarkerStyle::exportXML( const OUString& rStrName, const ::com::sun::star::uno::Any& rValue )
+XMLMarkerStyleExport::XMLMarkerStyleExport( SvXMLExport& rExp )
+    : rExport( rExp )
 {
-    return ImpExportXML( rHandler, mrNamespaceMap, rUnitConverter, rStrName, rValue );
 }
 
-sal_Bool XMLMarkerStyle::importXML( const uno::Reference< xml::sax::XAttributeList >& xAttrList, uno::Any& rValue, OUString& rStrName )
+XMLMarkerStyleExport::~XMLMarkerStyleExport()
 {
-    return ImpImportXML( rUnitConverter, xAttrList, rValue, rStrName );
 }
 
-sal_Bool XMLMarkerStyle::ImpExportXML( const uno::Reference< xml::sax::XDocumentHandler > & rHandler,
-   const SvXMLNamespaceMap& rNamespaceMap, const SvXMLUnitConverter& rUnitConverter,
-   const OUString& rStrName, const uno::Any& rValue )
+sal_Bool XMLMarkerStyleExport::exportXML(
+    const OUString& rStrName,
+    const uno::Any& rValue )
 {
     sal_Bool bRet(sal_False);
 
@@ -146,15 +142,16 @@ sal_Bool XMLMarkerStyle::ImpExportXML( const uno::Reference< xml::sax::XDocument
 
         if(rValue >>= aBezier)
         {
-            pAttrList = new SvXMLAttributeList();   // Do NOT delete me !!
-            uno::Reference< xml::sax::XAttributeList > xAttrList( pAttrList );
             OUString aStrValue;
             OUStringBuffer aOut;
 
+            SvXMLUnitConverter& rUnitConverter =
+                rExport.GetMM100UnitConverter();
+
             /////////////////
             // Name
             OUString aStrName( rStrName );
-            AddAttribute( XML_NAMESPACE_DRAW, XML_NAME, aStrName );
+            rExport.AddAttribute( XML_NAMESPACE_DRAW, XML_NAME, aStrName );
 
             /////////////////
             // Viewbox (viewBox="0 0 1500 1000")
@@ -206,7 +203,7 @@ sal_Bool XMLMarkerStyle::ImpExportXML( const uno::Reference< xml::sax::XDocument
             sal_Int32 nDifY(nMaxY - nMinY);
 
             SdXMLImExViewBox aViewBox( 0, 0, nDifX, nDifY );
-            AddAttribute( XML_NAMESPACE_SVG, XML_VIEWBOX, aViewBox.GetExportString( rUnitConverter ) );
+            rExport.AddAttribute( XML_NAMESPACE_SVG, XML_VIEWBOX, aViewBox.GetExportString( rUnitConverter ) );
 
             /////////////////
             // Pathdata
@@ -226,26 +223,22 @@ sal_Bool XMLMarkerStyle::ImpExportXML( const uno::Reference< xml::sax::XDocument
             }
 
             // write point array
-            AddAttribute(XML_NAMESPACE_SVG, XML_D, aSvgDElement.GetExportString());
+            rExport.AddAttribute(XML_NAMESPACE_SVG, XML_D, aSvgDElement.GetExportString());
 
             /////////////////
             // Do Write
-            OUString sWS( GetXMLToken( XML_WS ) );
-
-            OUString aStrTmp( GetXMLToken( XML_MARKER ) );
-            rHandler->ignorableWhitespace( sWS );
-            rHandler->startElement( rNamespaceMap.GetQNameByKey( XML_NAMESPACE_DRAW, aStrTmp ), xAttrList );
-            rHandler->endElement( GetXMLToken( XML_MARKER ) );
-            rHandler->ignorableWhitespace( sWS );
+            SvXMLElementExport rElem( rExport, XML_NAMESPACE_DRAW, XML_MARKER,
+                                      sal_True, sal_False );
         }
     }
 
     return bRet;
 }
 
-sal_Bool XMLMarkerStyle::ImpImportXML( const SvXMLUnitConverter& rUnitConverter,
+sal_Bool XMLMarkerStyleImport::importXML(
     const uno::Reference< xml::sax::XAttributeList >& xAttrList,
-    uno::Any& rValue, OUString& rStrName )
+    uno::Any& rValue,
+    OUString& rStrName )
 {
     sal_Bool bRet           = sal_False;
     sal_Bool bHasViewBox    = sal_False;
@@ -253,12 +246,15 @@ sal_Bool XMLMarkerStyle::ImpImportXML( const SvXMLUnitConverter& rUnitConverter,
 
     SdXMLImExViewBox* pViewBox = NULL;
 
+    SvXMLNamespaceMap& rNamespaceMap = rImport.GetNamespaceMap();
+    SvXMLUnitConverter& rUnitConverter = rImport.GetMM100UnitConverter();
+
     sal_Int16 nAttrCount = xAttrList.is() ? xAttrList->getLength() : 0;
     for( sal_Int16 i = 0; i < nAttrCount; i++ )
     {
         OUString aStrFullAttrName = xAttrList->getNameByIndex( i );
         OUString aStrAttrName;
-        mrNamespaceMap.GetKeyByAttrName( aStrFullAttrName, &aStrAttrName );
+        rNamespaceMap.GetKeyByAttrName( aStrFullAttrName, &aStrAttrName );
         OUString aStrValue = xAttrList->getValueByIndex( i );
 
         if( IsXMLToken( aStrAttrName, XML_NAME ) )
diff --git a/xmloff/source/style/TransGradientStyle.cxx b/xmloff/source/style/TransGradientStyle.cxx
index 6091dab4b410..c6716a236f0e 100644
--- a/xmloff/source/style/TransGradientStyle.cxx
+++ b/xmloff/source/style/TransGradientStyle.cxx
@@ -2,9 +2,9 @@
  *
  *  $RCSfile: TransGradientStyle.cxx,v $
  *
- *  $Revision: 1.7 $
+ *  $Revision: 1.8 $
  *
- *  last change: $Author: dvo $ $Date: 2001-06-29 21:07:17 $
+ *  last change: $Author: dvo $ $Date: 2001-10-19 18:43:58 $
  *
  *  The Contents of this file are made available subject to the terms of
  *  either of the following licenses
@@ -64,11 +64,11 @@
 #endif
 
 #ifndef _COM_SUN_STAR_AWT_GRADIENT_HPP_
-#include<com/sun/star/awt/Gradient.hpp>
+#include <com/sun/star/awt/Gradient.hpp>
 #endif
 
 #ifndef _XMLOFF_ATTRLIST_HXX
-#include"attrlist.hxx"
+#include "attrlist.hxx"
 #endif
 
 #ifndef _XMLOFF_NMSPMAP_HXX
@@ -76,11 +76,11 @@
 #endif
 
 #ifndef _XMLOFF_XMLUCONV_HXX
-#include"xmluconv.hxx"
+#include "xmluconv.hxx"
 #endif
 
 #ifndef _XMLOFF_XMLNMSPE_HXX
-#include"xmlnmspe.hxx"
+#include "xmlnmspe.hxx"
 #endif
 
 #ifndef _RTL_USTRBUF_HXX_
@@ -88,7 +88,7 @@
 #endif
 
 #ifndef _RTL_USTRING_
-#include<rtl/ustring>
+#include <rtl/ustring>
 #endif
 
 #ifndef _TOOLS_DEBUG_HXX
@@ -99,6 +99,15 @@
 #include "xmltkmap.hxx"
 #endif
 
+#ifndef _XMLOFF_XMLEXP_HXX
+#include "xmlexp.hxx"
+#endif
+
+#ifndef _XMLOFF_XMLIMP_HXX
+#include "xmlimp.hxx"
+#endif
+
+
 using namespace ::com::sun::star;
 using namespace ::rtl;
 using namespace ::xmloff::token;
@@ -140,40 +149,28 @@ SvXMLEnumMapEntry __READONLY_DATA pXML_GradientStyle_Enum[] =
     { XML_TOKEN_INVALID,                0 }
 };
 
-XMLTransGradientStyle::XMLTransGradientStyle( const ::com::sun::star::uno::Reference< ::com::sun::star::xml::sax::XDocumentHandler > & _rHandler,
-                                        const SvXMLNamespaceMap& _rNamespaceMap, const SvXMLUnitConverter& _rUnitConverter )
-: rHandler      ( _rHandler ),
-  mrNamespaceMap ( _rNamespaceMap ),
-  rUnitConverter( _rUnitConverter ),
-  pAttrList     ( NULL )
+XMLTransGradientStyleImport::XMLTransGradientStyleImport( SvXMLImport& rImp )
+    : rImport(rImp)
 {
 }
 
-XMLTransGradientStyle::~XMLTransGradientStyle()
+XMLTransGradientStyleImport::~XMLTransGradientStyleImport()
 {
 }
 
-void XMLTransGradientStyle::AddAttribute( sal_uInt16 nPrefix, enum ::xmloff::token::XMLTokenEnum eName, const ::rtl::OUString& rStrValue )
+XMLTransGradientStyleExport::XMLTransGradientStyleExport( SvXMLExport& rExp )
+    : rExport(rExp)
 {
-    const ::rtl::OUString aStrName( GetXMLToken( eName ) );
-    const ::rtl::OUString aStrCDATA( GetXMLToken( XML_CDATA ) );
-
-    pAttrList->AddAttribute( mrNamespaceMap.GetQNameByKey( nPrefix, aStrName ), aStrCDATA, rStrValue );
 }
 
-sal_Bool XMLTransGradientStyle::exportXML( const OUString& rStrName, const ::com::sun::star::uno::Any& rValue )
+XMLTransGradientStyleExport::~XMLTransGradientStyleExport()
 {
-    return ImpExportXML( rHandler, mrNamespaceMap, rUnitConverter, rStrName, rValue );
 }
 
-sal_Bool XMLTransGradientStyle::importXML( const uno::Reference< xml::sax::XAttributeList >& xAttrList, uno::Any& rValue, OUString& rStrName )
-{
-    return ImpImportXML( rUnitConverter, xAttrList, rValue, rStrName );
-}
 
-sal_Bool XMLTransGradientStyle::ImpExportXML( const ::com::sun::star::uno::Reference< ::com::sun::star::xml::sax::XDocumentHandler > & rHandler,
-                                              const SvXMLNamespaceMap& rNamespaceMap, const SvXMLUnitConverter& rUnitConverter,
-                                              const OUString& rStrName, const uno::Any& rValue )
+sal_Bool XMLTransGradientStyleExport::exportXML(
+    const OUString& rStrName,
+    const uno::Any& rValue )
 {
     sal_Bool bRet = sal_False;
     awt::Gradient aGradient;
@@ -182,20 +179,20 @@ sal_Bool XMLTransGradientStyle::ImpExportXML( const ::com::sun::star::uno::Refer
     {
         if( rValue >>= aGradient )
         {
-            pAttrList = new SvXMLAttributeList();
-            ::com::sun::star::uno::Reference< ::com::sun::star::xml::sax::XAttributeList > xAttrList( pAttrList );
-
             OUString aStrValue;
             OUStringBuffer aOut;
 
+            SvXMLUnitConverter& rUnitConverter =
+                rExport.GetMM100UnitConverter();
+
             // Name
-            AddAttribute( XML_NAMESPACE_DRAW, XML_NAME, rStrName );
+            rExport.AddAttribute( XML_NAMESPACE_DRAW, XML_NAME, rStrName );
 
             // Style
             if( !rUnitConverter.convertEnum( aOut, aGradient.Style, pXML_GradientStyle_Enum ) )
                 return sal_False;
             aStrValue = aOut.makeStringAndClear();
-            AddAttribute( XML_NAMESPACE_DRAW, XML_STYLE, aStrValue );
+            rExport.AddAttribute( XML_NAMESPACE_DRAW, XML_STYLE, aStrValue );
 
             // Center x/y
             if( aGradient.Style != awt::GradientStyle_LINEAR &&
@@ -203,11 +200,11 @@ sal_Bool XMLTransGradientStyle::ImpExportXML( const ::com::sun::star::uno::Refer
             {
                 rUnitConverter.convertPercent( aOut, aGradient.XOffset );
                 aStrValue = aOut.makeStringAndClear();
-                AddAttribute( XML_NAMESPACE_DRAW, XML_CX, aStrValue );
+                rExport.AddAttribute( XML_NAMESPACE_DRAW, XML_CX, aStrValue );
 
                 rUnitConverter.convertPercent( aOut, aGradient.YOffset );
                 aStrValue = aOut.makeStringAndClear();
-                AddAttribute( XML_NAMESPACE_DRAW, XML_CY, aStrValue );
+                rExport.AddAttribute( XML_NAMESPACE_DRAW, XML_CY, aStrValue );
             }
 
 
@@ -218,44 +215,42 @@ sal_Bool XMLTransGradientStyle::ImpExportXML( const ::com::sun::star::uno::Refer
             sal_Int32 aStartValue = (sal_Int32)(((aColor.GetRed() + 1) * 100) / 255);
             rUnitConverter.convertPercent( aOut, aStartValue );
             aStrValue = aOut.makeStringAndClear();
-            AddAttribute( XML_NAMESPACE_DRAW, XML_START, aStrValue );
+            rExport.AddAttribute( XML_NAMESPACE_DRAW, XML_START, aStrValue );
 
             // Transparency end
             aColor.SetColor( aGradient.EndColor );
             sal_Int32 aEndValue = (sal_Int32)(((aColor.GetRed() + 1) * 100) / 255);
             rUnitConverter.convertPercent( aOut, aEndValue );
             aStrValue = aOut.makeStringAndClear();
-            AddAttribute( XML_NAMESPACE_DRAW, XML_END, aStrValue );
+            rExport.AddAttribute( XML_NAMESPACE_DRAW, XML_END, aStrValue );
 
             // Angle
             if( aGradient.Style != awt::GradientStyle_RADIAL )
             {
                 rUnitConverter.convertNumber( aOut, sal_Int32( aGradient.Angle ) );
                 aStrValue = aOut.makeStringAndClear();
-                AddAttribute( XML_NAMESPACE_DRAW, XML_GRADIENT_ANGLE, aStrValue );
+                rExport.AddAttribute( XML_NAMESPACE_DRAW, XML_GRADIENT_ANGLE, aStrValue );
             }
 
             // Border
             rUnitConverter.convertPercent( aOut, aGradient.Border );
             aStrValue = aOut.makeStringAndClear();
-            AddAttribute( XML_NAMESPACE_DRAW, XML_GRADIENT_BORDER, aStrValue );
+            rExport.AddAttribute( XML_NAMESPACE_DRAW, XML_GRADIENT_BORDER, aStrValue );
 
             // Do Write
-            OUString sWS( GetXMLToken( XML_WS ) );
-            rHandler->ignorableWhitespace( sWS );
-            rHandler->startElement( rNamespaceMap.GetQNameByKey( XML_NAMESPACE_DRAW, GetXMLToken(XML_TRANSPARENCY) ),
-                                    xAttrList );
-            rHandler->endElement( GetXMLToken(XML_GRADIENT) );
-            rHandler->ignorableWhitespace( sWS );
+            SvXMLElementExport rElem( rExport,
+                                      XML_NAMESPACE_DRAW, XML_TRANSPARENCY,
+                                      sal_True, sal_False );
         }
     }
 
     return bRet;
 }
 
-sal_Bool XMLTransGradientStyle::ImpImportXML( const SvXMLUnitConverter& rUnitConverter,
-                                           const uno::Reference< xml::sax::XAttributeList >& xAttrList,
-                                           uno::Any& rValue, OUString& rStrName )
+sal_Bool XMLTransGradientStyleImport::importXML(
+    const uno::Reference< xml::sax::XAttributeList >& xAttrList,
+    uno::Any& rValue,
+    OUString& rStrName )
 {
     sal_Bool bRet           = sal_False;
     sal_Bool bHasName       = sal_False;
@@ -270,13 +265,15 @@ sal_Bool XMLTransGradientStyle::ImpImportXML( const SvXMLUnitConverter& rUnitCon
     aGradient.Border = 0;
 
     SvXMLTokenMap aTokenMap( aTrGradientAttrTokenMap );
+    SvXMLNamespaceMap& rNamespaceMap = rImport.GetNamespaceMap();
+    SvXMLUnitConverter& rUnitConverter = rImport.GetMM100UnitConverter();
 
     sal_Int16 nAttrCount = xAttrList.is() ? xAttrList->getLength() : 0;
     for( sal_Int16 i=0; i < nAttrCount; i++ )
     {
         const OUString& rFullAttrName = xAttrList->getNameByIndex( i );
         OUString aStrAttrName;
-        sal_uInt16 nPrefix = mrNamespaceMap.GetKeyByAttrName( rFullAttrName, &aStrAttrName );
+        sal_uInt16 nPrefix = rNamespaceMap.GetKeyByAttrName( rFullAttrName, &aStrAttrName );
         const OUString& rStrValue = xAttrList->getValueByIndex( i );
 
         sal_Int32 nTmpValue;
diff --git a/xmloff/source/style/xmlnumfe.cxx b/xmloff/source/style/xmlnumfe.cxx
index bc043727c1ae..25485d1d2f02 100644
--- a/xmloff/source/style/xmlnumfe.cxx
+++ b/xmloff/source/style/xmlnumfe.cxx
@@ -2,9 +2,9 @@
  *
  *  $RCSfile: xmlnumfe.cxx,v $
  *
- *  $Revision: 1.23 $
+ *  $Revision: 1.24 $
  *
- *  last change: $Author: nn $ $Date: 2001-08-27 18:37:35 $
+ *  last change: $Author: dvo $ $Date: 2001-10-19 18:43:58 $
  *
  *  The Contents of this file are made available subject to the terms of
  *  either of the following licenses
@@ -90,6 +90,10 @@
 #include "xmltoken.hxx"
 #endif
 
+#ifndef _XMLOFF_XMLEXP_HXX
+#include "xmlexp.hxx"
+#endif
+
 #include <set>
 
 using namespace ::rtl;
@@ -272,13 +276,10 @@ void SvXMLNumUsedList_Impl::SetWasUsed(const uno::Sequence<sal_Int32>& rWasUsed)
 //-------------------------------------------------------------------------
 
 SvXMLNumFmtExport::SvXMLNumFmtExport(
-            const uno::Reference< xml::sax::XDocumentHandler >& rHdl,
+            SvXMLExport& rExp,
             const uno::Reference< util::XNumberFormatsSupplier >& rSupp ) :
-    xHandler( rHdl ),
+    rExport( rExp ),
     pFormatter( NULL ),
-    pNamespaceMap( NULL ),
-    sCDATA( GetXMLToken(XML_CDATA) ),
-    sWS( GetXMLToken(XML_WS) ),
     pCharClass( NULL ),
     pLocaleData( NULL ),
     sPrefix( OUString::createFromAscii( "N" ) )
@@ -303,22 +304,16 @@ SvXMLNumFmtExport::SvXMLNumFmtExport(
         pLocaleData = new LocaleDataWrapper( ::comphelper::getProcessServiceFactory(), aLocale );
     }
 
-    pAttrList = new SvXMLAttributeList;
-    xAttrList = pAttrList;
-
     pUsedList = new SvXMLNumUsedList_Impl;
 }
 
-SvXMLNumFmtExport::SvXMLNumFmtExport( const ::com::sun::star::uno::Reference<
-                        ::com::sun::star::xml::sax::XDocumentHandler >& rHdl,
+SvXMLNumFmtExport::SvXMLNumFmtExport(
+                       SvXMLExport& rExp,
                        const ::com::sun::star::uno::Reference<
                         ::com::sun::star::util::XNumberFormatsSupplier >& rSupp,
                        const rtl::OUString& rPrefix ) :
-    xHandler( rHdl ),
+    rExport( rExp ),
     pFormatter( NULL ),
-    pNamespaceMap( NULL ),
-    sCDATA( GetXMLToken(XML_CDATA) ),
-    sWS( GetXMLToken(XML_WS) ),
     pCharClass( NULL ),
     pLocaleData( NULL ),
     sPrefix( rPrefix )
@@ -343,9 +338,6 @@ SvXMLNumFmtExport::SvXMLNumFmtExport( const ::com::sun::star::uno::Reference<
         pLocaleData = new LocaleDataWrapper( ::comphelper::getProcessServiceFactory(), aLocale );
     }
 
-    pAttrList = new SvXMLAttributeList;
-    xAttrList = pAttrList;
-
     pUsedList = new SvXMLNumUsedList_Impl;
 }
 
@@ -379,10 +371,7 @@ void SvXMLNumFmtExport::AddCalendarAttr_Impl( const OUString& rCalendar )
 {
     if ( rCalendar.getLength() )
     {
-        OUString sAttrName = pNamespaceMap->GetQNameByKey( XML_NAMESPACE_NUMBER,
-                                GetXMLToken(XML_CALENDAR) );
-        OUString sAttrValue = rCalendar;
-        pAttrList->AddAttribute( sAttrName, sCDATA, sAttrValue );
+        rExport.AddAttribute( XML_NAMESPACE_NUMBER, XML_CALENDAR, rCalendar );
     }
 }
 
@@ -390,9 +379,7 @@ void SvXMLNumFmtExport::AddTextualAttr_Impl( sal_Bool bText )
 {
     if ( bText )            // non-textual
     {
-        OUString sAttrName = pNamespaceMap->GetQNameByKey( XML_NAMESPACE_NUMBER,
-                                GetXMLToken(XML_TEXTUAL) );
-        pAttrList->AddAttribute( sAttrName, sCDATA, GetXMLToken(XML_TRUE) );
+        rExport.AddAttribute( XML_NAMESPACE_NUMBER, XML_TEXTUAL, XML_TRUE );
     }
 }
 
@@ -400,9 +387,7 @@ void SvXMLNumFmtExport::AddStyleAttr_Impl( sal_Bool bLong )
 {
     if ( bLong )            // short is default
     {
-        OUString sAttrName = pNamespaceMap->GetQNameByKey( XML_NAMESPACE_NUMBER,
-                                GetXMLToken(XML_STYLE) );
-        pAttrList->AddAttribute( sAttrName, sCDATA, GetXMLToken(XML_LONG) );
+        rExport.AddAttribute( XML_NAMESPACE_NUMBER, XML_STYLE, XML_LONG );
     }
 }
 
@@ -413,18 +398,16 @@ void SvXMLNumFmtExport::AddLanguageAttr_Impl( sal_Int32 nLang )
         String aLangStr, aCountryStr;
         ConvertLanguageToIsoNames( (LanguageType)nLang, aLangStr, aCountryStr );
 
-        OUString sAttrName, sAttrValue;
+        OUString sAttrValue;
         if (aLangStr.Len())
         {
-            sAttrName = pNamespaceMap->GetQNameByKey( XML_NAMESPACE_NUMBER, GetXMLToken(XML_LANGUAGE) );
             sAttrValue = aLangStr;
-            pAttrList->AddAttribute( sAttrName, sCDATA, sAttrValue );
+            rExport.AddAttribute( XML_NAMESPACE_NUMBER, XML_LANGUAGE, sAttrValue );
         }
         if (aCountryStr.Len())
         {
-            sAttrName = pNamespaceMap->GetQNameByKey( XML_NAMESPACE_NUMBER, GetXMLToken(XML_COUNTRY) );
             sAttrValue = aCountryStr;
-            pAttrList->AddAttribute( sAttrName, sCDATA, sAttrValue );
+            rExport.AddAttribute( XML_NAMESPACE_NUMBER, XML_COUNTRY, sAttrValue );
         }
     }
 }
@@ -445,18 +428,11 @@ void SvXMLNumFmtExport::AddToTextElement_Impl( const OUString& rString )
 
 void SvXMLNumFmtExport::FinishTextElement_Impl()
 {
-    DBG_ASSERT( !xAttrList->getLength(), "FinishTextElement_Impl: AttrList not empty" );
-
     if ( sTextContent.getLength() )
     {
-        OUString sElem = pNamespaceMap->GetQNameByKey( XML_NAMESPACE_NUMBER,
-                            GetXMLToken(XML_TEXT) );
-        OUString sContentStr = sTextContent.makeStringAndClear();
-
-        xHandler->ignorableWhitespace( sWS );
-        xHandler->startElement( sElem, xAttrList );
-        xHandler->characters( sContentStr );
-        xHandler->endElement( sElem );
+        SvXMLElementExport aElem( rExport, XML_NAMESPACE_NUMBER, XML_TEXT,
+                                  sal_True, sal_False );
+        rExport.Characters( sTextContent.makeStringAndClear() );
     }
 }
 
@@ -464,21 +440,13 @@ void SvXMLNumFmtExport::WriteColorElement_Impl( const Color& rColor )
 {
     FinishTextElement_Impl();
 
-    OUString sElem = pNamespaceMap->GetQNameByKey( XML_NAMESPACE_STYLE,
-                        GetXMLToken(XML_PROPERTIES) );
-
-    OUString sAttrName = pNamespaceMap->GetQNameByKey( XML_NAMESPACE_FO,
-                            GetXMLToken(XML_COLOR) );
     OUStringBuffer aColStr( 7 );
     SvXMLUnitConverter::convertColor( aColStr, rColor );
-    OUString sAttrValue = aColStr.makeStringAndClear();
-    pAttrList->AddAttribute( sAttrName, sCDATA, sAttrValue );
-
-    xHandler->ignorableWhitespace( sWS );
-    xHandler->startElement( sElem, xAttrList );
-    xHandler->endElement( sElem );
+    rExport.AddAttribute( XML_NAMESPACE_FO, XML_COLOR,
+                          aColStr.makeStringAndClear() );
 
-    pAttrList->Clear();
+    SvXMLElementExport aElem( rExport, XML_NAMESPACE_STYLE, XML_PROPERTIES,
+                              sal_True, sal_False );
 }
 
 void SvXMLNumFmtExport::WriteCurrencyElement_Impl( const OUString& rString,
@@ -486,9 +454,6 @@ void SvXMLNumFmtExport::WriteCurrencyElement_Impl( const OUString& rString,
 {
     FinishTextElement_Impl();
 
-    OUString sElem = pNamespaceMap->GetQNameByKey( XML_NAMESPACE_NUMBER,
-                        GetXMLToken(XML_CURRENCY_SYMBOL) );
-
     if ( rExt.getLength() )
     {
         sal_Int32 nLang = rExt.toInt32(16);     // hex
@@ -497,34 +462,26 @@ void SvXMLNumFmtExport::WriteCurrencyElement_Impl( const OUString& rString,
         AddLanguageAttr_Impl( nLang );          // adds to pAttrList
     }
 
-    xHandler->ignorableWhitespace( sWS );
-    xHandler->startElement( sElem, xAttrList );
-    xHandler->characters( rString );
-    xHandler->endElement( sElem );
-
-    pAttrList->Clear();
+    SvXMLElementExport aElem( rExport,
+                              XML_NAMESPACE_NUMBER, XML_CURRENCY_SYMBOL,
+                              sal_True, sal_False );
+    rExport.Characters( rString );
 }
 
 void SvXMLNumFmtExport::WriteBooleanElement_Impl()
 {
     FinishTextElement_Impl();
 
-    OUString sElem = pNamespaceMap->GetQNameByKey( XML_NAMESPACE_NUMBER,
-                        GetXMLToken(XML_BOOLEAN) );
-    xHandler->ignorableWhitespace( sWS );
-    xHandler->startElement( sElem, xAttrList );
-    xHandler->endElement( sElem );
+    SvXMLElementExport aElem( rExport, XML_NAMESPACE_NUMBER, XML_BOOLEAN,
+                              sal_True, sal_False );
 }
 
 void SvXMLNumFmtExport::WriteTextContentElement_Impl()
 {
     FinishTextElement_Impl();
 
-    OUString sElem = pNamespaceMap->GetQNameByKey( XML_NAMESPACE_NUMBER,
-                        GetXMLToken(XML_TEXT_CONTENT) );
-    xHandler->ignorableWhitespace( sWS );
-    xHandler->startElement( sElem, xAttrList );
-    xHandler->endElement( sElem );
+    SvXMLElementExport aElem( rExport, XML_NAMESPACE_NUMBER, XML_TEXT_CONTENT,
+                              sal_True, sal_False );
 }
 
 //  date elements
@@ -533,117 +490,77 @@ void SvXMLNumFmtExport::WriteDayElement_Impl( const OUString& rCalendar, sal_Boo
 {
     FinishTextElement_Impl();
 
-    OUString sElem = pNamespaceMap->GetQNameByKey( XML_NAMESPACE_NUMBER,
-                        GetXMLToken(XML_DAY) );
-
     AddCalendarAttr_Impl( rCalendar ); // adds to pAttrList
     AddStyleAttr_Impl( bLong );     // adds to pAttrList
 
-    xHandler->ignorableWhitespace( sWS );
-    xHandler->startElement( sElem, xAttrList );
-    xHandler->endElement( sElem );
-
-    pAttrList->Clear();
+    SvXMLElementExport aElem( rExport, XML_NAMESPACE_NUMBER, XML_DAY,
+                              sal_True, sal_False );
 }
 
 void SvXMLNumFmtExport::WriteMonthElement_Impl( const OUString& rCalendar, sal_Bool bLong, sal_Bool bText )
 {
     FinishTextElement_Impl();
 
-    OUString sElem = pNamespaceMap->GetQNameByKey( XML_NAMESPACE_NUMBER,
-                        GetXMLToken(XML_MONTH) );
-
     AddCalendarAttr_Impl( rCalendar ); // adds to pAttrList
     AddStyleAttr_Impl( bLong );     // adds to pAttrList
     AddTextualAttr_Impl( bText );   // adds to pAttrList
 
-    xHandler->ignorableWhitespace( sWS );
-    xHandler->startElement( sElem, xAttrList );
-    xHandler->endElement( sElem );
-
-    pAttrList->Clear();
+    SvXMLElementExport aElem( rExport, XML_NAMESPACE_NUMBER, XML_MONTH,
+                              sal_True, sal_False );
 }
 
 void SvXMLNumFmtExport::WriteYearElement_Impl( const OUString& rCalendar, sal_Bool bLong )
 {
     FinishTextElement_Impl();
 
-    OUString sElem = pNamespaceMap->GetQNameByKey( XML_NAMESPACE_NUMBER,
-                                                   GetXMLToken(XML_YEAR) );
-
     AddCalendarAttr_Impl( rCalendar ); // adds to pAttrList
     AddStyleAttr_Impl( bLong );     // adds to pAttrList
 
-    xHandler->ignorableWhitespace( sWS );
-    xHandler->startElement( sElem, xAttrList );
-    xHandler->endElement( sElem );
-
-    pAttrList->Clear();
+    SvXMLElementExport aElem( rExport, XML_NAMESPACE_NUMBER, XML_YEAR,
+                              sal_True, sal_False );
 }
 
 void SvXMLNumFmtExport::WriteEraElement_Impl( const OUString& rCalendar, sal_Bool bLong )
 {
     FinishTextElement_Impl();
 
-    OUString sElem = pNamespaceMap->GetQNameByKey( XML_NAMESPACE_NUMBER,
-                                                   GetXMLToken(XML_ERA) );
-
     AddCalendarAttr_Impl( rCalendar ); // adds to pAttrList
     AddStyleAttr_Impl( bLong );     // adds to pAttrList
 
-    xHandler->ignorableWhitespace( sWS );
-    xHandler->startElement( sElem, xAttrList );
-    xHandler->endElement( sElem );
-
-    pAttrList->Clear();
+    SvXMLElementExport aElem( rExport, XML_NAMESPACE_NUMBER, XML_ERA,
+                              sal_True, sal_False );
 }
 
 void SvXMLNumFmtExport::WriteDayOfWeekElement_Impl( const OUString& rCalendar, sal_Bool bLong )
 {
     FinishTextElement_Impl();
 
-    OUString sElem = pNamespaceMap->GetQNameByKey( XML_NAMESPACE_NUMBER,
-                                              GetXMLToken(XML_DAY_OF_WEEK) );
-
     AddCalendarAttr_Impl( rCalendar ); // adds to pAttrList
     AddStyleAttr_Impl( bLong );     // adds to pAttrList
 
-    xHandler->ignorableWhitespace( sWS );
-    xHandler->startElement( sElem, xAttrList );
-    xHandler->endElement( sElem );
-
-    pAttrList->Clear();
+    SvXMLElementExport aElem( rExport, XML_NAMESPACE_NUMBER, XML_DAY_OF_WEEK,
+                              sal_True, sal_False );
 }
 
 void SvXMLNumFmtExport::WriteWeekElement_Impl( const OUString& rCalendar )
 {
     FinishTextElement_Impl();
 
-    OUString sElem = pNamespaceMap->GetQNameByKey( XML_NAMESPACE_NUMBER,
-                                              GetXMLToken(XML_WEEK_OF_YEAR) );
-
     AddCalendarAttr_Impl( rCalendar ); // adds to pAttrList
 
-    xHandler->ignorableWhitespace( sWS );
-    xHandler->startElement( sElem, xAttrList );
-    xHandler->endElement( sElem );
+    SvXMLElementExport aElem( rExport, XML_NAMESPACE_NUMBER, XML_WEEK_OF_YEAR,
+                              sal_True, sal_False );
 }
 
 void SvXMLNumFmtExport::WriteQuarterElement_Impl( const OUString& rCalendar, sal_Bool bLong )
 {
     FinishTextElement_Impl();
 
-    OUString sElem = pNamespaceMap->GetQNameByKey( XML_NAMESPACE_NUMBER,
-                                                   GetXMLToken(XML_QUARTER) );
-
     AddCalendarAttr_Impl( rCalendar ); // adds to pAttrList
     AddStyleAttr_Impl( bLong );     // adds to pAttrList
 
-    xHandler->ignorableWhitespace( sWS );
-    xHandler->startElement( sElem, xAttrList );
-    xHandler->endElement( sElem );
-
-    pAttrList->Clear();
+    SvXMLElementExport aElem( rExport, XML_NAMESPACE_NUMBER, XML_QUARTER,
+                              sal_True, sal_False );
 }
 
 //  time elements
@@ -652,66 +569,43 @@ void SvXMLNumFmtExport::WriteHoursElement_Impl( sal_Bool bLong )
 {
     FinishTextElement_Impl();
 
-    OUString sElem = pNamespaceMap->GetQNameByKey( XML_NAMESPACE_NUMBER,
-                                                   GetXMLToken(XML_HOURS) );
-
     AddStyleAttr_Impl( bLong );     // adds to pAttrList
 
-    xHandler->ignorableWhitespace( sWS );
-    xHandler->startElement( sElem, xAttrList );
-    xHandler->endElement( sElem );
-
-    pAttrList->Clear();
+    SvXMLElementExport aElem( rExport, XML_NAMESPACE_NUMBER, XML_HOURS,
+                              sal_True, sal_False );
 }
 
 void SvXMLNumFmtExport::WriteMinutesElement_Impl( sal_Bool bLong )
 {
     FinishTextElement_Impl();
 
-    OUString sElem = pNamespaceMap->GetQNameByKey( XML_NAMESPACE_NUMBER,
-                                                   GetXMLToken(XML_MINUTES) );
-
     AddStyleAttr_Impl( bLong );     // adds to pAttrList
 
-    xHandler->ignorableWhitespace( sWS );
-    xHandler->startElement( sElem, xAttrList );
-    xHandler->endElement( sElem );
-
-    pAttrList->Clear();
+    SvXMLElementExport aElem( rExport, XML_NAMESPACE_NUMBER, XML_MINUTES,
+                              sal_True, sal_False );
 }
 
 void SvXMLNumFmtExport::WriteSecondsElement_Impl( sal_Bool bLong, sal_uInt16 nDecimals )
 {
     FinishTextElement_Impl();
 
-    OUString sElem = pNamespaceMap->GetQNameByKey( XML_NAMESPACE_NUMBER,
-                                                   GetXMLToken(XML_SECONDS) );
-
     AddStyleAttr_Impl( bLong );     // adds to pAttrList
     if ( nDecimals > 0 )
     {
-        OUString sAttrName = pNamespaceMap->GetQNameByKey( XML_NAMESPACE_NUMBER,
-                                                           GetXMLToken(XML_DECIMAL_PLACES) );
-        OUString sAttrValue = OUString::valueOf( (sal_Int32) nDecimals );
-        pAttrList->AddAttribute( sAttrName, sCDATA, sAttrValue );
+        rExport.AddAttribute( XML_NAMESPACE_NUMBER, XML_DECIMAL_PLACES,
+                              OUString::valueOf( (sal_Int32) nDecimals ) );
     }
 
-    xHandler->ignorableWhitespace( sWS );
-    xHandler->startElement( sElem, xAttrList );
-    xHandler->endElement( sElem );
-
-    pAttrList->Clear();
+    SvXMLElementExport aElem( rExport, XML_NAMESPACE_NUMBER, XML_SECONDS,
+                              sal_True, sal_False );
 }
 
 void SvXMLNumFmtExport::WriteAMPMElement_Impl()
 {
     FinishTextElement_Impl();
 
-    OUString sElem = pNamespaceMap->GetQNameByKey( XML_NAMESPACE_NUMBER,
-                                                   GetXMLToken(XML_AM_PM) );
-    xHandler->ignorableWhitespace( sWS );
-    xHandler->startElement( sElem, xAttrList );
-    xHandler->endElement( sElem );
+    SvXMLElementExport aElem( rExport, XML_NAMESPACE_NUMBER, XML_AM_PM,
+                              sal_True, sal_False );
 }
 
 //  numbers
@@ -722,49 +616,35 @@ void SvXMLNumFmtExport::WriteNumberElement_Impl(
 {
     FinishTextElement_Impl();
 
-    OUString sElem = pNamespaceMap->GetQNameByKey( XML_NAMESPACE_NUMBER,
-                                                   GetXMLToken(XML_NUMBER) );
-    OUString sAttrName, sAttrValue;
-
     //  decimals
     if ( nDecimals >= 0 )   // negative = automatic
     {
-        sAttrName = pNamespaceMap->GetQNameByKey( XML_NAMESPACE_NUMBER,
-                                                  GetXMLToken(XML_DECIMAL_PLACES) );
-        sAttrValue = OUString::valueOf( nDecimals );
-        pAttrList->AddAttribute( sAttrName, sCDATA, sAttrValue );
+        rExport.AddAttribute( XML_NAMESPACE_NUMBER, XML_DECIMAL_PLACES,
+                              OUString::valueOf( nDecimals ) );
     }
 
     //  integer digits
     if ( nInteger >= 0 )    // negative = automatic
     {
-        sAttrName = pNamespaceMap->GetQNameByKey( XML_NAMESPACE_NUMBER,
-                                                  GetXMLToken(XML_MIN_INTEGER_DIGITS) );
-        sAttrValue = OUString::valueOf( nInteger );
-        pAttrList->AddAttribute( sAttrName, sCDATA, sAttrValue );
+        rExport.AddAttribute( XML_NAMESPACE_NUMBER, XML_MIN_INTEGER_DIGITS,
+                              OUString::valueOf( nInteger ) );
     }
 
     //  decimal replacement (dashes)
     if ( rDashStr.getLength() )
     {
-        sAttrName = pNamespaceMap->GetQNameByKey( XML_NAMESPACE_NUMBER,
-                                                  GetXMLToken(XML_DECIMAL_REPLACEMENT) );
-        sAttrValue = rDashStr;
-        pAttrList->AddAttribute( sAttrName, sCDATA, sAttrValue );
+        rExport.AddAttribute( XML_NAMESPACE_NUMBER, XML_DECIMAL_REPLACEMENT,
+                              rDashStr );
     }
 
     //  (automatic) grouping separator
     if ( bGrouping )
     {
-        sAttrName = pNamespaceMap->GetQNameByKey( XML_NAMESPACE_NUMBER,
-                                                  GetXMLToken(XML_GROUPING) );
-        pAttrList->AddAttribute( sAttrName, sCDATA, GetXMLToken(XML_TRUE) );
+        rExport.AddAttribute( XML_NAMESPACE_NUMBER, XML_GROUPING, XML_TRUE );
     }
 
-    xHandler->ignorableWhitespace( sWS );
-    xHandler->startElement( sElem, xAttrList );
-    xHandler->endElement( sElem );
-    pAttrList->Clear();
+    SvXMLElementExport aElem( rExport, XML_NAMESPACE_NUMBER, XML_NUMBER,
+                              sal_True, sal_False );
 }
 
 void SvXMLNumFmtExport::WriteScientificElement_Impl(
@@ -773,49 +653,36 @@ void SvXMLNumFmtExport::WriteScientificElement_Impl(
 {
     FinishTextElement_Impl();
 
-    OUString sElem = pNamespaceMap->GetQNameByKey( XML_NAMESPACE_NUMBER,
-                                          GetXMLToken(XML_SCIENTIFIC_NUMBER) );
-    OUString sAttrName, sAttrValue;
-
     //  decimals
     if ( nDecimals >= 0 )   // negative = automatic
     {
-        sAttrName = pNamespaceMap->GetQNameByKey( XML_NAMESPACE_NUMBER,
-                                            GetXMLToken(XML_DECIMAL_PLACES) );
-        sAttrValue = OUString::valueOf( nDecimals );
-        pAttrList->AddAttribute( sAttrName, sCDATA, sAttrValue );
+        rExport.AddAttribute( XML_NAMESPACE_NUMBER, XML_DECIMAL_PLACES,
+                              OUString::valueOf( nDecimals ) );
     }
 
     //  integer digits
     if ( nInteger >= 0 )    // negative = automatic
     {
-        sAttrName = pNamespaceMap->GetQNameByKey( XML_NAMESPACE_NUMBER,
-                                         GetXMLToken(XML_MIN_INTEGER_DIGITS) );
-        sAttrValue = OUString::valueOf( nInteger );
-        pAttrList->AddAttribute( sAttrName, sCDATA, sAttrValue );
+        rExport.AddAttribute( XML_NAMESPACE_NUMBER, XML_MIN_INTEGER_DIGITS,
+                              OUString::valueOf( nInteger ) );
     }
 
     //  (automatic) grouping separator
     if ( bGrouping )
     {
-        sAttrName = pNamespaceMap->GetQNameByKey( XML_NAMESPACE_NUMBER,
-                                                  GetXMLToken(XML_GROUPING) );
-        pAttrList->AddAttribute( sAttrName, sCDATA, GetXMLToken(XML_TRUE) );
+        rExport.AddAttribute( XML_NAMESPACE_NUMBER, XML_GROUPING, XML_TRUE );
     }
 
     //  exponent digits
     if ( nExp >= 0 )
     {
-        sAttrName = pNamespaceMap->GetQNameByKey( XML_NAMESPACE_NUMBER,
-                                        GetXMLToken(XML_MIN_EXPONENT_DIGITS) );
-        sAttrValue = OUString::valueOf( nExp );
-        pAttrList->AddAttribute( sAttrName, sCDATA, sAttrValue );
+        rExport.AddAttribute( XML_NAMESPACE_NUMBER, XML_MIN_EXPONENT_DIGITS,
+                              OUString::valueOf( nExp ) );
     }
 
-    xHandler->ignorableWhitespace( sWS );
-    xHandler->startElement( sElem, xAttrList );
-    xHandler->endElement( sElem );
-    pAttrList->Clear();
+    SvXMLElementExport aElem( rExport,
+                              XML_NAMESPACE_NUMBER, XML_SCIENTIFIC_NUMBER,
+                              sal_True, sal_False );
 }
 
 void SvXMLNumFmtExport::WriteFractionElement_Impl(
@@ -824,49 +691,35 @@ void SvXMLNumFmtExport::WriteFractionElement_Impl(
 {
     FinishTextElement_Impl();
 
-    OUString sElem = pNamespaceMap->GetQNameByKey( XML_NAMESPACE_NUMBER,
-                                                   GetXMLToken(XML_FRACTION) );
-    OUString sAttrName, sAttrValue;
-
     //  integer digits
     if ( nInteger >= 0 )        // negative = default (no integer part)
     {
-        sAttrName = pNamespaceMap->GetQNameByKey( XML_NAMESPACE_NUMBER,
-                                         GetXMLToken(XML_MIN_INTEGER_DIGITS) );
-        sAttrValue = OUString::valueOf( nInteger );
-        pAttrList->AddAttribute( sAttrName, sCDATA, sAttrValue );
+        rExport.AddAttribute( XML_NAMESPACE_NUMBER, XML_MIN_INTEGER_DIGITS,
+                              OUString::valueOf( nInteger ) );
     }
 
     //  (automatic) grouping separator
     if ( bGrouping )
     {
-        sAttrName = pNamespaceMap->GetQNameByKey( XML_NAMESPACE_NUMBER,
-                                                  GetXMLToken(XML_GROUPING) );
-        pAttrList->AddAttribute( sAttrName, sCDATA, GetXMLToken(XML_TRUE) );
+        rExport.AddAttribute( XML_NAMESPACE_NUMBER, XML_GROUPING, XML_TRUE );
     }
 
     //  numerator digits
     if ( nNumerator >= 0 )
     {
-        sAttrName = pNamespaceMap->GetQNameByKey( XML_NAMESPACE_NUMBER,
-                                       GetXMLToken(XML_MIN_NUMERATOR_DIGITS) );
-        sAttrValue = OUString::valueOf( nNumerator );
-        pAttrList->AddAttribute( sAttrName, sCDATA, sAttrValue );
+        rExport.AddAttribute( XML_NAMESPACE_NUMBER, XML_MIN_NUMERATOR_DIGITS,
+                                 OUString::valueOf( nNumerator ) );
     }
 
     //  denominator digits
     if ( nDenominator >= 0 )
     {
-        sAttrName = pNamespaceMap->GetQNameByKey( XML_NAMESPACE_NUMBER,
-                                     GetXMLToken(XML_MIN_DENOMINATOR_DIGITS) );
-        sAttrValue = OUString::valueOf( nDenominator );
-        pAttrList->AddAttribute( sAttrName, sCDATA, sAttrValue );
+        rExport.AddAttribute( XML_NAMESPACE_NUMBER, XML_MIN_DENOMINATOR_DIGITS,
+                              OUString::valueOf( nDenominator ) );
     }
 
-    xHandler->ignorableWhitespace( sWS );
-    xHandler->startElement( sElem, xAttrList );
-    xHandler->endElement( sElem );
-    pAttrList->Clear();
+    SvXMLElementExport aElem( rExport, XML_NAMESPACE_NUMBER, XML_FRACTION,
+                              sal_True, sal_False );
 }
 
 //  mapping (condition)
@@ -880,10 +733,6 @@ void SvXMLNumFmtExport::WriteMapElement_Impl( sal_Int32 nOp, double fLimit,
     {
         // style namespace
 
-        OUString sElem = pNamespaceMap->GetQNameByKey( XML_NAMESPACE_STYLE,
-                                                       GetXMLToken(XML_MAP) );
-        OUString sAttrName, sAttrValue;
-
         OUStringBuffer aCondStr( 20L );
         aCondStr.appendAscii( "value()" );          //! define constant
         switch ( nOp )
@@ -901,20 +750,15 @@ void SvXMLNumFmtExport::WriteMapElement_Impl( sal_Int32 nOp, double fLimit,
         SolarMath::DoubleToString( aValStr, fLimit, 'A', INT_MAX, '.', TRUE );
         aCondStr.append( aValStr );
 
-        sAttrName = pNamespaceMap->GetQNameByKey( XML_NAMESPACE_STYLE,
-                       GetXMLToken(XML_CONDITION) );
-        sAttrValue = aCondStr.makeStringAndClear();
-        pAttrList->AddAttribute( sAttrName, sCDATA, sAttrValue );
+        rExport.AddAttribute( XML_NAMESPACE_STYLE, XML_CONDITION,
+                              aCondStr.makeStringAndClear() );
 
-        sAttrName = pNamespaceMap->GetQNameByKey( XML_NAMESPACE_STYLE,
-                       GetXMLToken(XML_APPLY_STYLE_NAME) );
-        sAttrValue = lcl_CreateStyleName( nKey, nPart, sal_False, sPrefix );
-        pAttrList->AddAttribute( sAttrName, sCDATA, sAttrValue );
+        rExport.AddAttribute( XML_NAMESPACE_STYLE, XML_APPLY_STYLE_NAME,
+                              lcl_CreateStyleName( nKey, nPart, sal_False,
+                                                   sPrefix ) );
 
-        xHandler->ignorableWhitespace( sWS );
-        xHandler->startElement( sElem, xAttrList );
-        xHandler->endElement( sElem );
-        pAttrList->Clear();
+        SvXMLElementExport aElem( rExport, XML_NAMESPACE_STYLE, XML_MAP,
+                                  sal_True, sal_False );
     }
 }
 
@@ -1164,7 +1008,7 @@ void SvXMLNumFmtExport::ExportPart_Impl( const SvNumberformat& rFormat, sal_uInt
     else if ( eBuiltIn == NF_TEXT )
         nFmtType = NUMBERFORMAT_TEXT;
 
-    OUString sType;
+    XMLTokenEnum eType = XML_TOKEN_INVALID;
     switch ( nFmtType )
     {
         // type is 0 if a format contains no recognized elements
@@ -1173,35 +1017,31 @@ void SvXMLNumFmtExport::ExportPart_Impl( const SvNumberformat& rFormat, sal_uInt
         case NUMBERFORMAT_NUMBER:
         case NUMBERFORMAT_SCIENTIFIC:
         case NUMBERFORMAT_FRACTION:
-            sType = GetXMLToken(XML_NUMBER_STYLE);
+            eType = XML_NUMBER_STYLE;
             break;
         case NUMBERFORMAT_PERCENT:
-            sType = GetXMLToken(XML_PERCENTAGE_STYLE);
+            eType = XML_PERCENTAGE_STYLE;
             break;
         case NUMBERFORMAT_CURRENCY:
-            sType = GetXMLToken(XML_CURRENCY_STYLE);
+            eType = XML_CURRENCY_STYLE;
             break;
         case NUMBERFORMAT_DATE:
         case NUMBERFORMAT_DATETIME:
-            sType = GetXMLToken(XML_DATE_STYLE);
+            eType = XML_DATE_STYLE;
             break;
         case NUMBERFORMAT_TIME:
-            sType = GetXMLToken(XML_TIME_STYLE);
+            eType = XML_TIME_STYLE;
             break;
         case NUMBERFORMAT_TEXT:
-            sType = GetXMLToken(XML_TEXT_STYLE);
+            eType = XML_TEXT_STYLE;
             break;
         case NUMBERFORMAT_LOGICAL:
-            sType = GetXMLToken(XML_BOOLEAN_STYLE);
+            eType = XML_BOOLEAN_STYLE;
             break;
     }
-    if (!sType.getLength())
-    {
-        DBG_ERROR("unknown format type");
-        return;
-    }
-    OUString sElem = pNamespaceMap->GetQNameByKey( XML_NAMESPACE_NUMBER, sType );
-    OUString sAttrName, sAttrValue;
+    DBG_ASSERT( eType != XML_TOKEN_INVALID, "unknown format type" );
+
+    OUString sAttrValue;
     sal_Bool bUserDef = ( ( rFormat.GetType() & NUMBERFORMAT_DEFINED ) != 0 );
 
     //
@@ -1209,12 +1049,11 @@ void SvXMLNumFmtExport::ExportPart_Impl( const SvNumberformat& rFormat, sal_uInt
     //
 
     //  format name (generated from key) - style namespace
-    sAttrName = pNamespaceMap->GetQNameByKey( XML_NAMESPACE_STYLE, GetXMLToken(XML_NAME) );
-    sAttrValue = lcl_CreateStyleName( nKey, nPart, bDefPart, sPrefix );
-    pAttrList->AddAttribute( sAttrName, sCDATA, sAttrValue );
-    sAttrName = pNamespaceMap->GetQNameByKey( XML_NAMESPACE_STYLE, GetXMLToken(XML_FAMILY));
-    sAttrValue = rtl::OUString(RTL_CONSTASCII_USTRINGPARAM(XML_STYLE_FAMILY_DATA_STYLE_NAME));
-    pAttrList->AddAttribute( sAttrName, sCDATA, sAttrValue );
+    rExport.AddAttribute( XML_NAMESPACE_STYLE, XML_NAME,
+                        lcl_CreateStyleName( nKey, nPart, bDefPart, sPrefix ) );
+    rExport.AddAttribute( XML_NAMESPACE_STYLE, XML_FAMILY,
+                          rtl::OUString(RTL_CONSTASCII_USTRINGPARAM(
+                              XML_STYLE_FAMILY_DATA_STYLE_NAME)) );
 
     //  language / country
     LanguageType nLang = rFormat.GetLanguage();
@@ -1225,8 +1064,7 @@ void SvXMLNumFmtExport::ExportPart_Impl( const SvNumberformat& rFormat, sal_uInt
     sAttrValue = rFormat.GetComment();
     if ( sAttrValue.getLength() && bUserDef && bDefPart )
     {
-        sAttrName = pNamespaceMap->GetQNameByKey( XML_NAMESPACE_NUMBER, GetXMLToken(XML_TITLE) );
-        pAttrList->AddAttribute( sAttrName, sCDATA, sAttrValue );
+        rExport.AddAttribute( XML_NAMESPACE_NUMBER, XML_TITLE, sAttrValue );
     }
 
     //  automatic ordering for currency and date formats
@@ -1246,9 +1084,8 @@ void SvXMLNumFmtExport::ExportPart_Impl( const SvNumberformat& rFormat, sal_uInt
         //  #85109# format type must be checked to avoid dtd errors if
         //  locale data contains other format types at the built-in positions
 
-        sAttrName = pNamespaceMap->GetQNameByKey( XML_NAMESPACE_NUMBER,
-                        GetXMLToken(XML_AUTOMATIC_ORDER) );
-        pAttrList->AddAttribute( sAttrName, sCDATA, GetXMLToken(XML_TRUE) );
+        rExport.AddAttribute( XML_NAMESPACE_NUMBER, XML_AUTOMATIC_ORDER,
+                              XML_TRUE );
     }
 
     //  format source (for date and time formats)
@@ -1266,9 +1103,8 @@ void SvXMLNumFmtExport::ExportPart_Impl( const SvNumberformat& rFormat, sal_uInt
         //  #85109# format type must be checked to avoid dtd errors if
         //  locale data contains other format types at the built-in positions
 
-        sAttrName = pNamespaceMap->GetQNameByKey( XML_NAMESPACE_NUMBER,
-                                              GetXMLToken(XML_FORMAT_SOURCE) );
-        pAttrList->AddAttribute( sAttrName, sCDATA, GetXMLToken(XML_LANGUAGE) );
+        rExport.AddAttribute( XML_NAMESPACE_NUMBER, XML_FORMAT_SOURCE,
+                              XML_LANGUAGE );
     }
 
     //  overflow for time formats as in [hh]:mm
@@ -1276,14 +1112,12 @@ void SvXMLNumFmtExport::ExportPart_Impl( const SvNumberformat& rFormat, sal_uInt
     //  default for truncate-on-overflow is true
     if ( nFmtType == NUMBERFORMAT_TIME && bThousand )
     {
-        sAttrName = pNamespaceMap->GetQNameByKey( XML_NAMESPACE_NUMBER,
-                        GetXMLToken(XML_TRUNCATE_ON_OVERFLOW) );
-        pAttrList->AddAttribute( sAttrName, sCDATA, GetXMLToken(XML_FALSE) );
+        rExport.AddAttribute( XML_NAMESPACE_NUMBER, XML_TRUNCATE_ON_OVERFLOW,
+                              XML_FALSE );
     }
 
-    xHandler->ignorableWhitespace( sWS );
-    xHandler->startElement( sElem, xAttrList );
-    pAttrList->Clear();
+    SvXMLElementExport aElem( rExport, XML_NAMESPACE_NUMBER, eType,
+                              sal_True, sal_True );
 
     //
     //  color (properties element)
@@ -1634,12 +1468,8 @@ void SvXMLNumFmtExport::ExportPart_Impl( const SvNumberformat& rFormat, sal_uInt
     if ( !bAnyContent )
     {
         //  for an empty format, write an empty text element
-
-        OUString sTextElem = pNamespaceMap->GetQNameByKey( XML_NAMESPACE_NUMBER,
-                                GetXMLToken(XML_TEXT) );
-        xHandler->ignorableWhitespace( sWS );
-        xHandler->startElement( sTextElem, xAttrList );
-        xHandler->endElement( sTextElem );
+        SvXMLElementExport aTElem( rExport, XML_NAMESPACE_NUMBER, XML_TEXT,
+                                   sal_True, sal_False );
     }
 
     //
@@ -1654,9 +1484,6 @@ void SvXMLNumFmtExport::ExportPart_Impl( const SvNumberformat& rFormat, sal_uInt
         WriteMapElement_Impl( eOp1, fLimit1, nKey, 0 );
         WriteMapElement_Impl( eOp2, fLimit2, nKey, 1 );
     }
-
-    xHandler->ignorableWhitespace( sWS );
-    xHandler->endElement( sElem );
 }
 
 //-------------------------------------------------------------------------
@@ -1686,13 +1513,11 @@ void SvXMLNumFmtExport::ExportFormat_Impl( const SvNumberformat& rFormat, sal_uI
 //  export method called by application
 //
 
-void SvXMLNumFmtExport::Export( const SvXMLNamespaceMap& rNamespaceMap, sal_Bool bIsAutoStyle )
+void SvXMLNumFmtExport::Export( sal_Bool bIsAutoStyle )
 {
     if ( !pFormatter )
         return;                         // no formatter -> no entries
 
-    pNamespaceMap = &rNamespaceMap;
-
     sal_uInt32 nKey;
     const SvNumberformat* pFormat = NULL;
     sal_Bool bNext(pUsedList->GetFirstUsed(nKey));
@@ -1733,8 +1558,6 @@ void SvXMLNumFmtExport::Export( const SvXMLNamespaceMap& rNamespaceMap, sal_Bool
         }
     }
     pUsedList->Export();
-
-    pNamespaceMap = NULL;
 }
 
 OUString SvXMLNumFmtExport::GetStyleName( sal_uInt32 nKey )
diff --git a/xmloff/source/style/xmltabe.cxx b/xmloff/source/style/xmltabe.cxx
index 8c22624b1aff..7491c856f520 100644
--- a/xmloff/source/style/xmltabe.cxx
+++ b/xmloff/source/style/xmltabe.cxx
@@ -2,9 +2,9 @@
  *
  *  $RCSfile: xmltabe.cxx,v $
  *
- *  $Revision: 1.9 $
+ *  $Revision: 1.10 $
  *
- *  last change: $Author: rt $ $Date: 2001-07-11 09:52:41 $
+ *  last change: $Author: dvo $ $Date: 2001-10-19 18:43:58 $
  *
  *  The Contents of this file are made available subject to the terms of
  *  either of the following licenses
@@ -84,6 +84,9 @@
 #ifndef _XMLOFF_XMLUCONV_HXX
 #include "xmluconv.hxx"
 #endif
+#ifndef _XMLOFF_XMLEXP_HXX
+#include "xmlexp.hxx"
+#endif
 
 #ifndef _XMLOFF_XMLTABE_HXX
 #include "xmltabe.hxx"
@@ -105,23 +108,23 @@ SvXMLEnumMapEntry pXML_tabstop_style[] =
 
 void SvxXMLTabStopExport::exportTabStop( const ::com::sun::star::style::TabStop* pTabStop )
 {
-    CheckAttrList();
+    SvXMLUnitConverter& rUnitConv = rExport.GetMM100UnitConverter();
 
     // text:level
     OUStringBuffer sBuffer;
 
     // position attribute
-    mrUnitConv.convertMeasure( sBuffer, pTabStop->Position );
-    AddAttribute( XML_NAMESPACE_STYLE, XML_POSITION,
-                  sBuffer.makeStringAndClear() );
+    rUnitConv.convertMeasure( sBuffer, pTabStop->Position );
+    rExport.AddAttribute( XML_NAMESPACE_STYLE, XML_POSITION,
+                           sBuffer.makeStringAndClear() );
 
     // type attribute
     if( style::TabAlign_LEFT != pTabStop->Alignment )
     {
-        mrUnitConv.convertEnum( sBuffer, pTabStop->Alignment,
+        rUnitConv.convertEnum( sBuffer, pTabStop->Alignment,
                                    pXML_tabstop_style );
-        AddAttribute( XML_NAMESPACE_STYLE, XML_TYPE,
-                      sBuffer.makeStringAndClear() );
+        rExport.AddAttribute( XML_NAMESPACE_STYLE, XML_TYPE,
+                               sBuffer.makeStringAndClear() );
     }
 
     // char
@@ -129,83 +132,35 @@ void SvxXMLTabStopExport::exportTabStop( const ::com::sun::star::style::TabStop*
         pTabStop->DecimalChar != 0 )
     {
         sBuffer.append( pTabStop->DecimalChar );
-        AddAttribute( XML_NAMESPACE_STYLE, XML_CHAR,
-                      sBuffer.makeStringAndClear() );
+        rExport.AddAttribute( XML_NAMESPACE_STYLE, XML_CHAR,
+                               sBuffer.makeStringAndClear() );
     }
 
     // leader-char
     if( ' ' != pTabStop->FillChar && 0 != pTabStop->FillChar )
     {
         sBuffer.append( pTabStop->FillChar );
-        AddAttribute( XML_NAMESPACE_STYLE, XML_LEADER_CHAR,
-                      sBuffer.makeStringAndClear() );
+        rExport.AddAttribute( XML_NAMESPACE_STYLE, XML_LEADER_CHAR,
+                               sBuffer.makeStringAndClear() );
     }
 
-    OUString sElem = GetQNameByKey( XML_NAMESPACE_STYLE, GetXMLToken(XML_TAB_STOP) );
-    mxHandler->ignorableWhitespace( msWS );
-    mxHandler->startElement( sElem, mxAttrList );
-    ClearAttrList();
-    mxHandler->ignorableWhitespace( msWS );
-    mxHandler->endElement( sElem );
-}
-
-OUString SvxXMLTabStopExport::GetQNameByKey( sal_uInt16 nKey,
-                                               const OUString& rLocalName ) const
-{
-    DBG_ASSERT( mpNamespaceMap,
-                "SvxXMLTabStopExport::GetQNameByKey: namespace map is missing" );
-    if( mpNamespaceMap )
-        return mpNamespaceMap->GetQNameByKey( nKey, rLocalName );
-    else
-        return rLocalName;
-}
-
-void SvxXMLTabStopExport::ClearAttrList()
-{
-    mpAttrList->Clear();
-}
-
-#ifndef PRODUCT
-void SvxXMLTabStopExport::CheckAttrList()
-{
-    DBG_ASSERT( !mpAttrList->getLength(),
-                "SvxXMLTabStopExport::CheckAttrList: list is not empty" );
+    SvXMLElementExport rElem( rExport, XML_NAMESPACE_STYLE, XML_TAB_STOP,
+                              sal_True, sal_True );
 }
-#endif
 
-void SvxXMLTabStopExport::AddAttribute( sal_uInt16 nPrefixKey, enum XMLTokenEnum eName,
-                                       const OUString& rValue )
-{
-    OUString sName( GetXMLToken( eName ) );
-
-    mpAttrList->AddAttribute( GetQNameByKey( nPrefixKey, sName ),
-                             msCDATA, rValue );
-}
 
-SvxXMLTabStopExport::SvxXMLTabStopExport( const uno::Reference< ::com::sun::star::xml::sax::XDocumentHandler > & rHandler,
-                                      const SvXMLUnitConverter& rUnitConverter )
-:   msCDATA( GetXMLToken( XML_CDATA ) ),
-    msWS( GetXMLToken( XML_WS ) ),
-    mpNamespaceMap( 0 ),
-    mrUnitConv( rUnitConverter ),
-    mpAttrList( new SvXMLAttributeList )
+SvxXMLTabStopExport::SvxXMLTabStopExport(
+    SvXMLExport& rExp)
+    : rExport( rExp )
 {
-    mxHandler = rHandler;
-    mxAttrList = mpAttrList;
 }
 
 SvxXMLTabStopExport::~SvxXMLTabStopExport()
 {
 }
 
-void SvxXMLTabStopExport::Export( const uno::Any& rAny,
-                                  const SvXMLNamespaceMap& rNamespaceMap )
+void SvxXMLTabStopExport::Export( const uno::Any& rAny )
 {
-    mpNamespaceMap = &rNamespaceMap;
-
-    CheckAttrList();
-
-
     uno::Sequence< ::com::sun::star::style::TabStop> aSeq;
     if(!(rAny >>= aSeq))
     {
@@ -214,29 +169,21 @@ void SvxXMLTabStopExport::Export( const uno::Any& rAny,
     else
     {
         const ::com::sun::star::style::TabStop* pTabs = aSeq.getConstArray();
-        const sal_uInt16 nTabs   = aSeq.getLength();
+        const sal_Int32 nTabs   = aSeq.getLength();
 
         // ignore default tab stop here
         //if( 1 == nTabs && style::TabAlign_DEFAULT == pTabs[0].Alignment )
         //  return;
 
-        OUString sElem = GetQNameByKey( XML_NAMESPACE_STYLE,
-                                        GetXMLToken(XML_TAB_STOPS) );
-        mxHandler->ignorableWhitespace( msWS );
-        mxHandler->startElement( sElem, mxAttrList );
-        ClearAttrList();
+        SvXMLElementExport rElem( rExport, XML_NAMESPACE_STYLE, XML_TAB_STOPS,
+                                  sal_True, sal_True );
 
-        for( sal_uInt16 nIndex = 0; nIndex < nTabs; nIndex++ )
+        for( sal_Int32 nIndex = 0; nIndex < nTabs; nIndex++ )
         {
             if( style::TabAlign_DEFAULT != pTabs[nIndex].Alignment )
                 exportTabStop( &(pTabs[nIndex]) );
         }
-
-        mxHandler->ignorableWhitespace( msWS );
-        mxHandler->endElement( sElem );
     }
-
-    mpNamespaceMap = 0;
 }
 
 
diff --git a/xmloff/source/text/txtdrope.cxx b/xmloff/source/text/txtdrope.cxx
index b7cd1bdc7ae8..d531bbfc9365 100644
--- a/xmloff/source/text/txtdrope.cxx
+++ b/xmloff/source/text/txtdrope.cxx
@@ -2,9 +2,9 @@
  *
  *  $RCSfile: txtdrope.cxx,v $
  *
- *  $Revision: 1.2 $
+ *  $Revision: 1.3 $
  *
- *  last change: $Author: dvo $ $Date: 2001-06-29 21:07:22 $
+ *  last change: $Author: dvo $ $Date: 2001-10-19 18:43:58 $
  *
  *  The Contents of this file are made available subject to the terms of
  *  either of the following licenses
@@ -74,16 +74,19 @@
 #ifndef _XMLOFF_XMLTOKEN_HXX
 #include "xmltoken.hxx"
 #endif
-#ifndef _XMLOFF_NMSPMAP_HXX
-#include "nmspmap.hxx"
-#endif
-#ifndef _XMLOFF_XMLNMSPE_HXX
-#include "xmlnmspe.hxx"
+
+#ifndef _XMLOFF_XMLEXP_HXX
+#include "xmlexp.hxx"
 #endif
+
 #ifndef _XMLOFF_XMLUCONV_HXX
 #include "xmluconv.hxx"
 #endif
 
+#ifndef _XMLOFF_XMLNMSPE_HXX
+#include "xmlnmspe.hxx"
+#endif
+
 #ifndef _XMLOFF_TXTDROPE_HXX
 #include "txtdrope.hxx"
 #endif
@@ -94,46 +97,10 @@ using namespace ::com::sun::star::uno;
 using namespace ::rtl;
 using namespace ::xmloff::token;
 
-OUString XMLTextDropCapExport::GetQNameByKey( sal_uInt16 nKey,
-                                               const OUString& rLocalName ) const
-{
-    if( pNamespaceMap )
-        return pNamespaceMap->GetQNameByKey( nKey, rLocalName );
-    else
-        return rLocalName;
-}
 
-void XMLTextDropCapExport::ClearAttrList()
+XMLTextDropCapExport::XMLTextDropCapExport( SvXMLExport& rExp ) :
+    rExport(rExp)
 {
-    pAttrList->Clear();
-}
-
-#ifndef PRODUCT
-void XMLTextDropCapExport::CheckAttrList()
-{
-    DBG_ASSERT( !pAttrList->getLength(),
-                "XMLTextDropCapExport::CheckAttrList: list is not empty" );
-}
-#endif
-
-void XMLTextDropCapExport::AddAttribute( sal_uInt16 nPrefixKey,
-                                         enum XMLTokenEnum eName,
-                                         const OUString& rValue )
-{
-    pAttrList->AddAttribute( GetQNameByKey( nPrefixKey, GetXMLToken(eName) ),
-                             sCDATA, rValue );
-}
-
-XMLTextDropCapExport::XMLTextDropCapExport(
-        const Reference< xml::sax::XDocumentHandler > & rHandler,
-        const SvXMLUnitConverter& rUnitConverter ) :
-    sCDATA( GetXMLToken( XML_CDATA ) ),
-    pNamespaceMap( 0 ),
-    rUnitConv( rUnitConverter ),
-    pAttrList( new SvXMLAttributeList )
-{
-    xHandler = rHandler;
-    xAttrList = pAttrList;
 }
 
 XMLTextDropCapExport::~XMLTextDropCapExport()
@@ -142,23 +109,20 @@ XMLTextDropCapExport::~XMLTextDropCapExport()
 
 void XMLTextDropCapExport::exportXML( const Any& rAny,
                                       sal_Bool bWholeWord,
-                                      const OUString& rStyleName,
-                                     const SvXMLNamespaceMap& rNamespaceMap )
+                                      const OUString& rStyleName )
 {
-    pNamespaceMap = &rNamespaceMap;
-
-    CheckAttrList();
-
     DropCapFormat aFormat;
     rAny >>= aFormat;
     OUString sValue;
     OUStringBuffer sBuffer;
     if( aFormat.Lines > 1 )
     {
+        SvXMLUnitConverter& rUnitConv = rExport.GetMM100UnitConverter();
+
         // style:lines
         rUnitConv.convertNumber( sBuffer, (sal_Int32)aFormat.Lines );
-        AddAttribute( XML_NAMESPACE_STYLE, XML_LINES,
-                      sBuffer.makeStringAndClear() );
+        rExport.AddAttribute( XML_NAMESPACE_STYLE, XML_LINES,
+                              sBuffer.makeStringAndClear() );
 
         // style:length
         if( bWholeWord )
@@ -171,29 +135,24 @@ void XMLTextDropCapExport::exportXML( const Any& rAny,
             sValue = sBuffer.makeStringAndClear();
         }
         if( sValue.getLength() )
-            AddAttribute( XML_NAMESPACE_STYLE, XML_LENGTH, sValue );
+            rExport.AddAttribute( XML_NAMESPACE_STYLE, XML_LENGTH, sValue );
 
         // style:distance
         if( aFormat.Distance > 0 )
         {
             rUnitConv.convertMeasure( sBuffer, aFormat.Distance );
-            AddAttribute( XML_NAMESPACE_STYLE, XML_DISTANCE,
-                          sBuffer.makeStringAndClear() );
+            rExport.AddAttribute( XML_NAMESPACE_STYLE, XML_DISTANCE,
+                                  sBuffer.makeStringAndClear() );
         }
 
         // style:style-name
         if( rStyleName.getLength() )
-            AddAttribute( XML_NAMESPACE_STYLE, XML_STYLE_NAME,
-                          rStyleName );
+            rExport.AddAttribute( XML_NAMESPACE_STYLE, XML_STYLE_NAME,
+                                  rStyleName );
     }
 
-    OUString sElem = GetQNameByKey( XML_NAMESPACE_STYLE,
-                                    GetXMLToken(XML_DROP_CAP) );
-    xHandler->startElement( sElem, xAttrList );
-    ClearAttrList();
-    xHandler->endElement( sElem );
-
-    pNamespaceMap = 0;
+    SvXMLElementExport aElem( rExport, XML_NAMESPACE_STYLE, XML_DROP_CAP,
+                              sal_False, sal_False );
 }
 
 
diff --git a/xmloff/source/text/txtdrope.hxx b/xmloff/source/text/txtdrope.hxx
index 6e0de91ca47b..0aa1594cb39e 100644
--- a/xmloff/source/text/txtdrope.hxx
+++ b/xmloff/source/text/txtdrope.hxx
@@ -2,9 +2,9 @@
  *
  *  $RCSfile: txtdrope.hxx,v $
  *
- *  $Revision: 1.2 $
+ *  $Revision: 1.3 $
  *
- *  last change: $Author: dvo $ $Date: 2001-06-29 21:07:22 $
+ *  last change: $Author: dvo $ $Date: 2001-10-19 18:43:58 $
  *
  *  The Contents of this file are made available subject to the terms of
  *  either of the following licenses
@@ -62,68 +62,23 @@
 #define _XMLOFF_TXTDROPE_HXX
 
 
-#ifndef _RTL_USTRING_HXX_
-#include <rtl/ustring.hxx>
-#endif
-
-#ifndef _XMLOFF_ATTRLIST_HXX
-#include "attrlist.hxx"
-#endif
-
-#ifndef _XMLOFF_XMLTOKEN_HXX
-#include "xmltoken.hxx"
-#endif
-
-class SvXMLNamespaceMap;
-class SvXMLUnitConverter;
+class SvXMLExport;
 namespace com { namespace sun { namespace star { namespace uno {
     class Any; } } } }
 namespace rtl { class OUString; }
 
 class XMLTextDropCapExport
 {
-    const ::rtl::OUString                               sCDATA;
+    SvXMLExport& rExport;
 
-    // the handlers
-    ::com::sun::star::uno::Reference<
-        ::com::sun::star::xml::sax::XDocumentHandler >  xHandler;
-
-    // a common attribute list
-    SvXMLAttributeList                                  *pAttrList;
-
-    // and an interface of it
-    ::com::sun::star::uno::Reference<
-        ::com::sun::star::xml::sax::XAttributeList >    xAttrList;
-
-    // the namepspace map
-    const SvXMLNamespaceMap                             *pNamespaceMap;
-    const SvXMLUnitConverter&                           rUnitConv;
-
-protected:
-
-    // Check if common attribute list is empty.
-#ifdef PRODUCT
-    void CheckAttrList() {}
-#else
-    void CheckAttrList();
-#endif
-    void ClearAttrList();
-    void AddAttribute( sal_uInt16 nPrefixKey,
-                       enum ::xmloff::token::XMLTokenEnum eName,
-                       const ::rtl::OUString& rValue );
-    ::rtl::OUString GetQNameByKey( sal_uInt16 nKey,
-                                   const ::rtl::OUString& rLocalName ) const;
 public:
 
-    XMLTextDropCapExport(
-        const ::com::sun::star::uno::Reference<
-                ::com::sun::star::xml::sax::XDocumentHandler > & rHandler,
-        const SvXMLUnitConverter& rUnitConverter );
+    XMLTextDropCapExport( SvXMLExport& rExport );
     ~XMLTextDropCapExport();
 
     void exportXML( const ::com::sun::star::uno::Any& rAny,
-                    sal_Bool bWholeWord, const ::rtl::OUString& rStyleName,
-                    const SvXMLNamespaceMap& rNamespMap );
+                    sal_Bool bWholeWord,
+                    const ::rtl::OUString& rStyleName );
 };
 
 
diff --git a/xmloff/source/text/txtexppr.cxx b/xmloff/source/text/txtexppr.cxx
index 27955fc2149d..25834da80005 100644
--- a/xmloff/source/text/txtexppr.cxx
+++ b/xmloff/source/text/txtexppr.cxx
@@ -2,9 +2,9 @@
  *
  *  $RCSfile: txtexppr.cxx,v $
  *
- *  $Revision: 1.15 $
+ *  $Revision: 1.16 $
  *
- *  last change: $Author: cl $ $Date: 2001-06-07 08:52:14 $
+ *  last change: $Author: dvo $ $Date: 2001-10-19 18:43:58 $
  *
  *  The Contents of this file are made available subject to the terms of
  *  either of the following licenses
@@ -122,13 +122,13 @@ void XMLTextExportPropertySetMapper::handleElementItem(
     {
     case CTF_DROPCAPFORMAT:
         pThis->maDropCapExport.exportXML( rProperty.maValue, bDropWholeWord,
-                                          sDropCharStyle, rNamespaceMap );
+                                          sDropCharStyle );
         pThis->bDropWholeWord = sal_False;
         pThis->sDropCharStyle = OUString();
         break;
 
     case CTF_TABSTOP:
-        pThis->maTabStopExport.Export( rProperty.maValue, rNamespaceMap );
+        pThis->maTabStopExport.Export( rProperty.maValue );
         break;
 
     case CTF_TEXTCOLUMNS:
@@ -237,8 +237,8 @@ XMLTextExportPropertySetMapper::XMLTextExportPropertySetMapper(
     SvXMLExportPropertyMapper( rMapper ),
     rExport( rExp ),
     bDropWholeWord( sal_False ),
-    maTabStopExport( rExp.GetDocHandler(), rExp.GetMM100UnitConverter() ),
-    maDropCapExport( rExp.GetDocHandler(), rExp.GetMM100UnitConverter() ),
+    maTabStopExport( rExp ),
+    maDropCapExport( rExp ),
     maTextColumnsExport( rExp ),
     maBackgroundImageExport( rExp )
 {