#93467# remove calls on XDocumentHandler and change interfaces acordingly

21 files changed, 292 insertions, 224 deletions

diff --git a/xmloff/inc/XMLChartPropertySetMapper.hxx b/xmloff/inc/XMLChartPropertySetMapper.hxx
index f3d6cc926eb3..9d2e5c737869 100644
--- a/xmloff/inc/XMLChartPropertySetMapper.hxx
+++ b/xmloff/inc/XMLChartPropertySetMapper.hxx
@@ -2,9 +2,9 @@
  *
  *  $RCSfile: XMLChartPropertySetMapper.hxx,v $
  *
- *  $Revision: 1.5 $
+ *  $Revision: 1.6 $
  *
- *  last change: $Author: bm $ $Date: 2001-05-11 18:17:55 $
+ *  last change: $Author: dvo $ $Date: 2001-10-25 20:57:02 $
  *
  *  The Contents of this file are made available subject to the terms of
  *  either of the following licenses
@@ -124,9 +124,8 @@ protected:
 private:
     /// this method is called for every item that has the MID_FLAG_ELEMENT_EXPORT flag set
     virtual void handleElementItem(
-        const ::com::sun::star::uno::Reference< ::com::sun::star::xml::sax::XDocumentHandler > & rHandler,
-        const XMLPropertyState& rProperty, const SvXMLUnitConverter& rUnitConverter,
-        const SvXMLNamespaceMap& rNamespaceMap, sal_uInt16 nFlags,
+        SvXMLExport& rExport,
+        const XMLPropertyState& rProperty, sal_uInt16 nFlags,
         const ::std::vector< XMLPropertyState > *pProperties = 0,
         sal_uInt32 nIdx = 0  ) const;
 
diff --git a/xmloff/source/chart/PropertyMaps.cxx b/xmloff/source/chart/PropertyMaps.cxx
index 2db5128ece77..711e01ad88b7 100644
--- a/xmloff/source/chart/PropertyMaps.cxx
+++ b/xmloff/source/chart/PropertyMaps.cxx
@@ -2,9 +2,9 @@
  *
  *  $RCSfile: PropertyMaps.cxx,v $
  *
- *  $Revision: 1.32 $
+ *  $Revision: 1.33 $
  *
- *  last change: $Author: cl $ $Date: 2001-10-16 09:06:06 $
+ *  last change: $Author: dvo $ $Date: 2001-10-25 20:57:02 $
  *
  *  The Contents of this file are made available subject to the terms of
  *  either of the following licenses
@@ -297,9 +297,8 @@ void XMLChartExportPropertyMapper::ContextFilter(
 }
 
 void XMLChartExportPropertyMapper::handleElementItem(
-    const uno::Reference< xml::sax::XDocumentHandler > & rHandler,
-    const XMLPropertyState& rProperty, const SvXMLUnitConverter& rUnitConverter,
-    const SvXMLNamespaceMap& rNamespaceMap, sal_uInt16 nFlags,
+    SvXMLExport& rExport,
+    const XMLPropertyState& rProperty, sal_uInt16 nFlags,
     const ::std::vector< XMLPropertyState > *pProperties,
     sal_uInt32 nIdx ) const
 {
@@ -340,8 +339,8 @@ void XMLChartExportPropertyMapper::handleElementItem(
 
         default:
             // call parent
-            SvXMLExportPropertyMapper::handleElementItem( rHandler, rProperty,
-                                                          rUnitConverter, rNamespaceMap, nFlags, pProperties, nIdx );
+            SvXMLExportPropertyMapper::handleElementItem( rExport, rProperty,
+                                                          nFlags, pProperties, nIdx );
             break;
     }
 }
diff --git a/xmloff/source/chart/SchXMLAutoStylePoolP.cxx b/xmloff/source/chart/SchXMLAutoStylePoolP.cxx
index 67985cda25ba..a9c6e2cbafbd 100644
--- a/xmloff/source/chart/SchXMLAutoStylePoolP.cxx
+++ b/xmloff/source/chart/SchXMLAutoStylePoolP.cxx
@@ -2,9 +2,9 @@
  *
  *  $RCSfile: SchXMLAutoStylePoolP.cxx,v $
  *
- *  $Revision: 1.2 $
+ *  $Revision: 1.3 $
  *
- *  last change: $Author: dvo $ $Date: 2001-06-29 21:07:11 $
+ *  last change: $Author: dvo $ $Date: 2001-10-25 20:57:02 $
  *
  *  The Contents of this file are made available subject to the terms of
  *  either of the following licenses
@@ -81,6 +81,7 @@ using ::xmloff::token::GetXMLToken;
 using ::xmloff::token::XML_CDATA;
 
 SchXMLAutoStylePoolP::SchXMLAutoStylePoolP( SchXMLExport& rSchXMLExport ) :
+        SvXMLAutoStylePoolP( rSchXMLExport ),
         mrSchXMLExport( rSchXMLExport )
 {}
 
@@ -88,16 +89,26 @@ SchXMLAutoStylePoolP::~SchXMLAutoStylePoolP()
 {}
 
 void SchXMLAutoStylePoolP::exportStyleAttributes(
+#if SUPD < 650
     SvXMLAttributeList& rAttrList,
+#endif
     sal_Int32 nFamily,
     const ::std::vector< XMLPropertyState >& rProperties,
-    const SvXMLExportPropertyMapper& rPropExp,
-    const SvXMLUnitConverter& rUnitConverter,
-    const SvXMLNamespaceMap& rNamespaceMap ) const
+    const SvXMLExportPropertyMapper& rPropExp
+#if SUPD < 650
+    , const SvXMLUnitConverter& rUnitConverter,
+    const SvXMLNamespaceMap& rNamespaceMap
+#endif
+    ) const
 {
     const rtl::OUString sCDATA( GetXMLToken( XML_CDATA ));
+#if SUPD < 650
     SvXMLAutoStylePoolP::exportStyleAttributes( rAttrList, nFamily, rProperties,
                                                 rPropExp, rUnitConverter, rNamespaceMap );
+#else
+    SvXMLAutoStylePoolP::exportStyleAttributes( nFamily,
+                                                rProperties, rPropExp );
+#endif
 
     if( nFamily == XML_STYLE_FAMILY_SCH_CHART_ID )
     {
@@ -115,10 +126,10 @@ void SchXMLAutoStylePoolP::exportStyleAttributes(
                     rtl::OUString sAttrValue = mrSchXMLExport.getDataStyleName( nNumberFormat );
                     if( sAttrValue.getLength() )
                     {
-                        rtl::OUString sAttrName( rNamespaceMap.GetQNameByKey(
+                        mrSchXMLExport.AddAttribute(
                             aPropMapper->GetEntryNameSpace( iter->mnIndex ),
-                            aPropMapper->GetEntryXMLName( iter->mnIndex ) ));
-                        rAttrList.AddAttribute( sAttrName, sCDATA, sAttrValue );
+                            aPropMapper->GetEntryXMLName( iter->mnIndex ),
+                            sAttrValue );
                     }
                 }
             }
diff --git a/xmloff/source/chart/SchXMLAutoStylePoolP.hxx b/xmloff/source/chart/SchXMLAutoStylePoolP.hxx
index 4ca606a023fc..9ea93cceaa74 100644
--- a/xmloff/source/chart/SchXMLAutoStylePoolP.hxx
+++ b/xmloff/source/chart/SchXMLAutoStylePoolP.hxx
@@ -2,9 +2,9 @@
  *
  *  $RCSfile: SchXMLAutoStylePoolP.hxx,v $
  *
- *  $Revision: 1.1 $
+ *  $Revision: 1.2 $
  *
- *  last change: $Author: bm $ $Date: 2001-02-14 17:11:40 $
+ *  last change: $Author: dvo $ $Date: 2001-10-25 20:57:02 $
  *
  *  The Contents of this file are made available subject to the terms of
  *  either of the following licenses
@@ -73,12 +73,17 @@ protected:
     SchXMLExport& mrSchXMLExport;
 
     virtual void exportStyleAttributes(
+#if SUPD < 650
         SvXMLAttributeList& rAttrList,
+#endif
         sal_Int32 nFamily,
         const ::std::vector< XMLPropertyState >& rProperties,
-        const SvXMLExportPropertyMapper& rPropExp,
-        const SvXMLUnitConverter& rUnitConverter,
-        const SvXMLNamespaceMap& rNamespaceMap ) const;
+        const SvXMLExportPropertyMapper& rPropExp
+#if SUPD < 650
+        , const SvXMLUnitConverter& rUnitConverter,
+        const SvXMLNamespaceMap& rNamespaceMap
+#endif
+        ) const;
 
 public:
     SchXMLAutoStylePoolP( SchXMLExport& rSchXMLExport );
diff --git a/xmloff/source/chart/SchXMLExport.cxx b/xmloff/source/chart/SchXMLExport.cxx
index 3f32ac790bb2..e3516ed73cea 100644
--- a/xmloff/source/chart/SchXMLExport.cxx
+++ b/xmloff/source/chart/SchXMLExport.cxx
@@ -2,9 +2,9 @@
  *
  *  $RCSfile: SchXMLExport.cxx,v $
  *
- *  $Revision: 1.61 $
+ *  $Revision: 1.62 $
  *
- *  last change: $Author: bm $ $Date: 2001-10-25 15:09:47 $
+ *  last change: $Author: dvo $ $Date: 2001-10-25 20:57:02 $
  *
  *  The Contents of this file are made available subject to the terms of
  *  either of the following licenses
@@ -260,10 +260,13 @@ void SchXMLExportHelper::exportAutoStyles()
 
         // export chart auto styles
         mrAutoStylePool.exportXML(
-            XML_STYLE_FAMILY_SCH_CHART_ID,
-            mrExport.GetDocHandler(),
+            XML_STYLE_FAMILY_SCH_CHART_ID
+#if SUPD < 650
+            , mrExport.GetDocHandler(),
             mrExport.GetMM100UnitConverter(),
-            mrExport.GetNamespaceMap());
+            mrExport.GetNamespaceMap()
+#endif
+            );
 
         // export auto styles for additional shapes
         mrExport.GetShapeExport()->exportAutoStyles();
diff --git a/xmloff/source/core/xmlexp.cxx b/xmloff/source/core/xmlexp.cxx
index 26eeb6558d36..fac71b669684 100644
--- a/xmloff/source/core/xmlexp.cxx
+++ b/xmloff/source/core/xmlexp.cxx
@@ -2,9 +2,9 @@
  *
  *  $RCSfile: xmlexp.cxx,v $
  *
- *  $Revision: 1.91 $
+ *  $Revision: 1.92 $
  *
- *  last change: $Author: dvo $ $Date: 2001-10-19 18:43:57 $
+ *  last change: $Author: dvo $ $Date: 2001-10-25 20:57:02 $
  *
  *  The Contents of this file are made available subject to the terms of
  *  either of the following licenses
@@ -1310,7 +1310,7 @@ XMLShapeExport* SvXMLExport::CreateShapeExport()
 
 SvXMLAutoStylePoolP* SvXMLExport::CreateAutoStylePool()
 {
-    return new SvXMLAutoStylePoolP();
+    return new SvXMLAutoStylePoolP(*this);
 }
 
 XMLPageExport* SvXMLExport::CreatePageExport()
diff --git a/xmloff/source/draw/sdpropls.cxx b/xmloff/source/draw/sdpropls.cxx
index 195abba1cac4..4452b45c1951 100644
--- a/xmloff/source/draw/sdpropls.cxx
+++ b/xmloff/source/draw/sdpropls.cxx
@@ -2,9 +2,9 @@
  *
  *  $RCSfile: sdpropls.cxx,v $
  *
- *  $Revision: 1.53 $
+ *  $Revision: 1.54 $
  *
- *  last change: $Author: cl $ $Date: 2001-10-16 09:07:08 $
+ *  last change: $Author: dvo $ $Date: 2001-10-25 20:57:02 $
  *
  *  The Contents of this file are made available subject to the terms of
  *  either of the following licenses
@@ -1365,9 +1365,9 @@ void XMLShapeExportPropertyMapper::handleSpecialItem(
 }
 
 void XMLShapeExportPropertyMapper::handleElementItem(
-    const com::sun::star::uno::Reference< com::sun::star::xml::sax::XDocumentHandler > & rHandler,
-    const XMLPropertyState& rProperty, const SvXMLUnitConverter& rUnitConverter,
-    const SvXMLNamespaceMap& rNamespaceMap, sal_uInt16 nFlags,
+    SvXMLExport& rExport,
+    const XMLPropertyState& rProperty,
+    sal_uInt16 nFlags,
     const ::std::vector< XMLPropertyState > *pProperties,
     sal_uInt32 nIdx) const
 {
@@ -1386,7 +1386,7 @@ void XMLShapeExportPropertyMapper::handleElementItem(
             }
             break;
         default:
-            SvXMLExportPropertyMapper::handleElementItem( rHandler, rProperty, rUnitConverter, rNamespaceMap, nFlags, pProperties, nIdx );
+            SvXMLExportPropertyMapper::handleElementItem( rExport, rProperty, nFlags, pProperties, nIdx );
             break;
     }
 }
@@ -1499,9 +1499,9 @@ void XMLPageExportPropertyMapper::ContextFilter(
 }
 
 void XMLPageExportPropertyMapper::handleElementItem(
-    const com::sun::star::uno::Reference< com::sun::star::xml::sax::XDocumentHandler > & rHandler,
-    const XMLPropertyState& rProperty, const SvXMLUnitConverter& rUnitConverter,
-    const SvXMLNamespaceMap& rNamespaceMap, sal_uInt16 nFlags,
+    SvXMLExport& rExport,
+    const XMLPropertyState& rProperty,
+    sal_uInt16 nFlags,
     const ::std::vector< XMLPropertyState > *pProperties,
     sal_uInt32 nIdx) const
 {
@@ -1521,7 +1521,7 @@ void XMLPageExportPropertyMapper::handleElementItem(
             }
             break;
         default:
-            SvXMLExportPropertyMapper::handleElementItem( rHandler, rProperty, rUnitConverter, rNamespaceMap, nFlags, pProperties, nIdx );
+            SvXMLExportPropertyMapper::handleElementItem( rExport, rProperty, nFlags, pProperties, nIdx );
             break;
     }
 }
diff --git a/xmloff/source/draw/sdpropls.hxx b/xmloff/source/draw/sdpropls.hxx
index 27bb52e9058c..1a28630aaa81 100644
--- a/xmloff/source/draw/sdpropls.hxx
+++ b/xmloff/source/draw/sdpropls.hxx
@@ -2,9 +2,9 @@
  *
  *  $RCSfile: sdpropls.hxx,v $
  *
- *  $Revision: 1.24 $
+ *  $Revision: 1.25 $
  *
- *  last change: $Author: cl $ $Date: 2001-10-16 09:07:08 $
+ *  last change: $Author: dvo $ $Date: 2001-10-25 20:57:02 $
  *
  *  The Contents of this file are made available subject to the terms of
  *  either of the following licenses
@@ -277,10 +277,8 @@ public:
     virtual ~XMLShapeExportPropertyMapper();
 
     virtual void        handleElementItem(
-                            const ::com::sun::star::uno::Reference< ::com::sun::star::xml::sax::XDocumentHandler >& rHandler,
+                            SvXMLExport& rExport,
                             const XMLPropertyState& rProperty,
-                            const SvXMLUnitConverter& rUnitConverter,
-                            const SvXMLNamespaceMap& rNamespaceMap,
                             sal_uInt16 nFlags,
                             const ::std::vector< XMLPropertyState >* pProperties = 0,
                             sal_uInt32 nIdx = 0
@@ -323,10 +321,8 @@ public:
     virtual ~XMLPageExportPropertyMapper();
 
     virtual void        handleElementItem(
-                            const ::com::sun::star::uno::Reference< ::com::sun::star::xml::sax::XDocumentHandler >& rHandler,
+                            SvXMLExport& rExport,
                             const XMLPropertyState& rProperty,
-                            const SvXMLUnitConverter& rUnitConverter,
-                            const SvXMLNamespaceMap& rNamespaceMap,
                             sal_uInt16 nFlags,
                             const ::std::vector< XMLPropertyState >* pProperties = 0,
                             sal_uInt32 nIdx = 0
diff --git a/xmloff/source/draw/sdxmlexp.cxx b/xmloff/source/draw/sdxmlexp.cxx
index 461e3b2c1d41..9c9e3dd232db 100644
--- a/xmloff/source/draw/sdxmlexp.cxx
+++ b/xmloff/source/draw/sdxmlexp.cxx
@@ -2,9 +2,9 @@
  *
  *  $RCSfile: sdxmlexp.cxx,v $
  *
- *  $Revision: 1.76 $
+ *  $Revision: 1.77 $
  *
- *  last change: $Author: aw $ $Date: 2001-10-19 12:33:24 $
+ *  last change: $Author: dvo $ $Date: 2001-10-25 20:57:02 $
  *
  *  The Contents of this file are made available subject to the terms of
  *  either of the following licenses
@@ -2089,10 +2089,13 @@ void SdXMLExport::_ExportAutoStyles()
 
     // export draw-page styles
     GetAutoStylePool()->exportXML(
-        XML_STYLE_FAMILY_SD_DRAWINGPAGE_ID,
-        GetDocHandler(),
+        XML_STYLE_FAMILY_SD_DRAWINGPAGE_ID
+#if SUPD < 650
+        , GetDocHandler(),
         GetMM100UnitConverter(),
-        GetNamespaceMap());
+        GetNamespaceMap()
+#endif
+        );
 
     if( getExportFlags() & EXPORT_STYLES )
     {
diff --git a/xmloff/source/draw/shapeexport.cxx b/xmloff/source/draw/shapeexport.cxx
index 83fc2db5c406..187ebf0f2e34 100644
--- a/xmloff/source/draw/shapeexport.cxx
+++ b/xmloff/source/draw/shapeexport.cxx
@@ -2,9 +2,9 @@
  *
  *  $RCSfile: shapeexport.cxx,v $
  *
- *  $Revision: 1.42 $
+ *  $Revision: 1.43 $
  *
- *  last change: $Author: aw $ $Date: 2001-10-01 11:44:14 $
+ *  last change: $Author: dvo $ $Date: 2001-10-25 20:57:02 $
  *
  *  The Contents of this file are made available subject to the terms of
  *  either of the following licenses
@@ -774,20 +774,26 @@ void XMLShapeExport::exportAutoStyles()
 //  if(IsFamilyGraphicUsed())
     {
         GetExport().GetAutoStylePool()->exportXML(
-            XML_STYLE_FAMILY_SD_GRAPHICS_ID,
-            GetExport().GetDocHandler(),
+            XML_STYLE_FAMILY_SD_GRAPHICS_ID
+#if SUPD < 650
+            , GetExport().GetDocHandler(),
             GetExport().GetMM100UnitConverter(),
-            GetExport().GetNamespaceMap());
+            GetExport().GetNamespaceMap()
+#endif
+            );
     }
 
     // ...for presentation
 //  if(IsFamilyPresentationUsed())
     {
         GetExport().GetAutoStylePool()->exportXML(
-            XML_STYLE_FAMILY_SD_PRESENTATION_ID,
-            GetExport().GetDocHandler(),
+            XML_STYLE_FAMILY_SD_PRESENTATION_ID
+#if SUPD < 650
+            , GetExport().GetDocHandler(),
             GetExport().GetMM100UnitConverter(),
-            GetExport().GetNamespaceMap());
+            GetExport().GetNamespaceMap()
+#endif
+            );
     }
 }
 
diff --git a/xmloff/source/style/PageMasterExportPropMapper.cxx b/xmloff/source/style/PageMasterExportPropMapper.cxx
index 795ff5f3903e..00a048dd76a4 100644
--- a/xmloff/source/style/PageMasterExportPropMapper.cxx
+++ b/xmloff/source/style/PageMasterExportPropMapper.cxx
@@ -2,9 +2,9 @@
  *
  *  $RCSfile: PageMasterExportPropMapper.cxx,v $
  *
- *  $Revision: 1.10 $
+ *  $Revision: 1.11 $
  *
- *  last change: $Author: mib $ $Date: 2001-06-25 14:30:29 $
+ *  last change: $Author: dvo $ $Date: 2001-10-25 20:57:03 $
  *
  *  The Contents of this file are made available subject to the terms of
  *  either of the following licenses
@@ -259,10 +259,8 @@ XMLPageMasterExportPropMapper::~XMLPageMasterExportPropMapper()
 }
 
 void XMLPageMasterExportPropMapper::handleElementItem(
-        const uno::Reference< xml::sax::XDocumentHandler >& rHandler,
+        SvXMLExport& rExport,
         const XMLPropertyState& rProperty,
-        const SvXMLUnitConverter& rUnitConverter,
-        const SvXMLNamespaceMap& rNamespaceMap,
         sal_uInt16 nFlags,
         const ::std::vector< XMLPropertyState >* pProperties,
         sal_uInt32 nIdx ) const
diff --git a/xmloff/source/style/PageMasterExportPropMapper.hxx b/xmloff/source/style/PageMasterExportPropMapper.hxx
index 5cd0ae4b84c2..b36269ab035e 100644
--- a/xmloff/source/style/PageMasterExportPropMapper.hxx
+++ b/xmloff/source/style/PageMasterExportPropMapper.hxx
@@ -2,9 +2,9 @@
  *
  *  $RCSfile: PageMasterExportPropMapper.hxx,v $
  *
- *  $Revision: 1.5 $
+ *  $Revision: 1.6 $
  *
- *  last change: $Author: dvo $ $Date: 2001-02-21 19:28:48 $
+ *  last change: $Author: dvo $ $Date: 2001-10-25 20:57:03 $
  *
  *  The Contents of this file are made available subject to the terms of
  *  either of the following licenses
@@ -97,10 +97,8 @@ public:
     virtual             ~XMLPageMasterExportPropMapper();
 
     virtual void        handleElementItem(
-                            const ::com::sun::star::uno::Reference< ::com::sun::star::xml::sax::XDocumentHandler >& rHandler,
+                            SvXMLExport& rExport,
                             const XMLPropertyState& rProperty,
-                            const SvXMLUnitConverter& rUnitConverter,
-                            const SvXMLNamespaceMap& rNamespaceMap,
                             sal_uInt16 nFlags,
                             const ::std::vector< XMLPropertyState >* pProperties = 0,
                             sal_uInt32 nIdx = 0
diff --git a/xmloff/source/style/XMLPageExport.cxx b/xmloff/source/style/XMLPageExport.cxx
index e2e303b7c32e..1d63686c0ce3 100644
--- a/xmloff/source/style/XMLPageExport.cxx
+++ b/xmloff/source/style/XMLPageExport.cxx
@@ -2,9 +2,9 @@
  *
  *  $RCSfile: XMLPageExport.cxx,v $
  *
- *  $Revision: 1.9 $
+ *  $Revision: 1.10 $
  *
- *  last change: $Author: dvo $ $Date: 2001-06-29 21:07:17 $
+ *  last change: $Author: dvo $ $Date: 2001-10-25 20:57:03 $
  *
  *  The Contents of this file are made available subject to the terms of
  *  either of the following licenses
@@ -292,7 +292,10 @@ void XMLPageExport::exportStyles( sal_Bool bUsed, sal_Bool bAutoStyles )
 
 void XMLPageExport::exportAutoStyles()
 {
-    rExport.GetAutoStylePool()->exportXML(XML_STYLE_FAMILY_PAGE_MASTER,
-        rExport.GetDocHandler(), rExport.GetMM100UnitConverter(),
-        rExport.GetNamespaceMap());
+    rExport.GetAutoStylePool()->exportXML(XML_STYLE_FAMILY_PAGE_MASTER
+#if SUPD < 650
+        , rExport.GetDocHandler(), rExport.GetMM100UnitConverter(),
+        rExport.GetNamespaceMap()
+#endif
+        );
 }
diff --git a/xmloff/source/style/impastp4.cxx b/xmloff/source/style/impastp4.cxx
index 774a6f6bcb5b..c753d3aa9e2d 100644
--- a/xmloff/source/style/impastp4.cxx
+++ b/xmloff/source/style/impastp4.cxx
@@ -2,9 +2,9 @@
  *
  *  $RCSfile: impastp4.cxx,v $
  *
- *  $Revision: 1.9 $
+ *  $Revision: 1.10 $
  *
- *  last change: $Author: dvo $ $Date: 2001-06-29 21:07:17 $
+ *  last change: $Author: dvo $ $Date: 2001-10-25 20:57:03 $
  *
  *  The Contents of this file are made available subject to the terms of
  *  either of the following licenses
@@ -84,6 +84,9 @@
 #ifndef _XMLOFF_XMLEXPPR_HXX
 #include "xmlexppr.hxx"
 #endif
+#ifndef _XMLOFF_XMLEXP_HXX
+#include "xmlexp.hxx"
+#endif
 #ifndef _XMLOFF_FAMILIES_HXX_
 #include "families.hxx"
 #endif
@@ -106,13 +109,10 @@ using namespace ::xmloff::token;
 // ctor/dtor class SvXMLAutoStylePool_Impl
 //
 
-SvXMLAutoStylePoolP_Impl::SvXMLAutoStylePoolP_Impl()
-:   msCDATA( GetXMLToken(XML_CDATA) ),
-    msWS( GetXMLToken(XML_WS) ),
-    maFamilyList( 5, 5 )
+SvXMLAutoStylePoolP_Impl::SvXMLAutoStylePoolP_Impl( SvXMLExport& rExp)
+    :   rExport( rExp ),
+        maFamilyList( 5, 5 )
 {
-    mpAttrList = new SvXMLAttributeList();
-    mxAttrList = mpAttrList;
 }
 
 SvXMLAutoStylePoolP_Impl::~SvXMLAutoStylePoolP_Impl()
@@ -324,9 +324,11 @@ OUString SvXMLAutoStylePoolP_Impl::FindAndRemoveCached( sal_Int32 nFamily ) cons
 
 void SvXMLAutoStylePoolP_Impl::exportXML(
            sal_Int32 nFamily,
+#if SUPD < 650
         const uno::Reference< ::com::sun::star::xml::sax::XDocumentHandler > & rHandler,
         const SvXMLUnitConverter& rUnitConverter,
         const SvXMLNamespaceMap& rNamespaceMap,
+#endif
         const SvXMLAutoStylePoolP *pAntiImpl) const
 {
     sal_uInt32 nCount = 0;
@@ -398,34 +400,46 @@ void SvXMLAutoStylePoolP_Impl::exportXML(
 
             if( aExpStyles[i].mpProperties )
             {
-                OUString sName( rNamespaceMap.GetQNameByKey( XML_NAMESPACE_STYLE, GetXMLToken(XML_NAME) ) );
-                mpAttrList->AddAttribute( sName, msCDATA, aExpStyles[i].mpProperties->GetName() );
+                GetExport().AddAttribute(
+                    XML_NAMESPACE_STYLE, XML_NAME,
+                    aExpStyles[i].mpProperties->GetName() );
 
                 if( pFamily->bAsFamily )
                 {
-                    sName = rNamespaceMap.GetQNameByKey( XML_NAMESPACE_STYLE, GetXMLToken(XML_FAMILY) );
-                    mpAttrList->AddAttribute( sName, msCDATA, aStrFamilyName );
+                    GetExport().AddAttribute(
+                        XML_NAMESPACE_STYLE, XML_FAMILY, aStrFamilyName );
                 }
 
                 if( aExpStyles[i].mpParent->getLength() )
                 {
-                    sName = rNamespaceMap.GetQNameByKey( XML_NAMESPACE_STYLE, GetXMLToken(XML_PARENT_STYLE_NAME) );
-                    mpAttrList->AddAttribute( sName, msCDATA, *aExpStyles[i].mpParent );
+                    GetExport().AddAttribute(
+                        XML_NAMESPACE_STYLE, XML_PARENT_STYLE_NAME,
+                        *aExpStyles[i].mpParent );
                 }
 
+                OUString sName;
                 if( pFamily->bAsFamily )
-                    sName = rNamespaceMap.GetQNameByKey( XML_NAMESPACE_STYLE, GetXMLToken(XML_STYLE) );
+                    sName = GetXMLToken(XML_STYLE);
                 else
-                    sName = rNamespaceMap.GetQNameByKey( XML_NAMESPACE_STYLE, pFamily->maStrFamilyName );
+                    sName = pFamily->maStrFamilyName;
+
+                pAntiImpl->exportStyleAttributes(
+#if SUPD < 650
+                    GetExport().GetAttrList(),
+#endif
+                    nFamily,
+                    aExpStyles[i].mpProperties->GetProperties(),
+                    *pFamily->mxMapper.get()
+#if SUPD < 650
+                        , GetExport().GetMM100UnitConverter(),
+                        GetExport().GetNamespaceMap()
+#endif
+                    );
 
-                pAntiImpl->exportStyleAttributes( *mpAttrList, nFamily,
-                        aExpStyles[i].mpProperties->GetProperties(),
-                        *pFamily->mxMapper.get(),
-                        rUnitConverter, rNamespaceMap );
+                SvXMLElementExport aElem( GetExport(),
+                                          XML_NAMESPACE_STYLE, sName,
+                                          sal_True, sal_True );
 
-                rHandler->ignorableWhitespace( msWS );
-                rHandler->startElement( sName, mxAttrList );
-                mpAttrList->Clear();
                 sal_Int32 nStart(-1);
                 sal_Int32 nEnd(-1);
                 if (nFamily == XML_STYLE_FAMILY_PAGE_MASTER)
@@ -446,15 +460,23 @@ void SvXMLAutoStylePoolP_Impl::exportXML(
                         nEnd = nIndex;
                 }
 
-                pFamily->mxMapper->exportXML( rHandler, aExpStyles[i].mpProperties->GetProperties(), rUnitConverter,
-                                    rNamespaceMap, nStart, nEnd, XML_EXPORT_FLAG_IGN_WS );
-
-                pAntiImpl->exportStyleContent( rHandler, nFamily,
-                        aExpStyles[i].mpProperties->GetProperties(),
-                        *pFamily->mxMapper.get(), rUnitConverter, rNamespaceMap );
+                pFamily->mxMapper->exportXML(
+                    GetExport(),
+                    aExpStyles[i].mpProperties->GetProperties(),
+                    nStart, nEnd, XML_EXPORT_FLAG_IGN_WS );
 
-                rHandler->ignorableWhitespace( msWS );
-                rHandler->endElement( sName );
+                pAntiImpl->exportStyleContent(
+#if SUPD < 650
+                    GetExport().GetDocHandler(),
+#endif
+                    nFamily,
+                    aExpStyles[i].mpProperties->GetProperties(),
+                    *pFamily->mxMapper.get()
+#if SUPD < 650
+                    , GetExport().GetMM100UnitConverter(),
+                    GetExport().GetNamespaceMap()
+#endif
+                    );
             }
         }
 
diff --git a/xmloff/source/style/impastpl.hxx b/xmloff/source/style/impastpl.hxx
index ca750f1f569c..3e376a6489b4 100644
--- a/xmloff/source/style/impastpl.hxx
+++ b/xmloff/source/style/impastpl.hxx
@@ -2,9 +2,9 @@
  *
  *  $RCSfile: impastpl.hxx,v $
  *
- *  $Revision: 1.6 $
+ *  $Revision: 1.7 $
  *
- *  last change: $Author: sab $ $Date: 2001-05-29 15:38:59 $
+ *  last change: $Author: dvo $ $Date: 2001-10-25 20:57:03 $
  *
  *  The Contents of this file are made available subject to the terms of
  *  either of the following licenses
@@ -74,15 +74,18 @@
 #ifndef _RTL_USTRING_HXX_
 #include <rtl/ustring.hxx>
 #endif
-#ifndef __SGI_STL_VECTOR
 #include <vector>
-#endif
 #ifndef _COM_SUN_STAR_UNO_REFERENCE_H_
 #include <com/sun/star/uno/Reference.h>
 #endif
+#if SUPD < 650
 #ifndef _COM_SUN_STAR_XML_SAX_XATTRIBUTELIST_HPP_
 #include <com/sun/star/xml/sax/XAttributeList.hpp>
 #endif
+#ifndef _COM_SUN_STAR_XML_SAX_XDOCUMENTHANDLER_HPP_
+#include <com/sun/star/xml/sax/XDocumentHandler.hpp>
+#endif
+#endif
 
 #ifndef _XMLOFF_PROPMAPPINGTYPES_HXX
 #include <maptype.hxx>
@@ -96,6 +99,7 @@ class SvXMLAutoStylePoolParentsP_Impl;
 class SvXMLAutoStylePoolNamesP_Impl;
 class SvXMLAttributeList;
 class SvXMLExportPropertyMapper;
+class SvXMLExport;
 
 #define MAX_CACHE_SIZE 65536
 
@@ -217,18 +221,17 @@ DECLARE_CONTAINER_SORT_DEL( SvXMLAutoStylePoolParentsP_Impl,
 
 class SvXMLAutoStylePoolP_Impl
 {
-    const ::rtl::OUString       msCDATA;
-    const ::rtl::OUString       msWS;
-    SvXMLAttributeList*         mpAttrList;
-    ::com::sun::star::uno::Reference< ::com::sun::star::xml::sax::XAttributeList >  mxAttrList;
+    SvXMLExport& rExport;
 
     XMLFamilyDataList_Impl      maFamilyList;
 
 public:
 
-    SvXMLAutoStylePoolP_Impl();
+    SvXMLAutoStylePoolP_Impl( SvXMLExport& rExport );
     ~SvXMLAutoStylePoolP_Impl();
 
+    SvXMLExport& GetExport() const { return rExport; }
+
     void AddFamily( sal_Int32 nFamily, const ::rtl::OUString& rStrName,
         const UniReference < SvXMLExportPropertyMapper > & rMapper,
         const ::rtl::OUString& rStrPrefix, sal_Bool bAsFamily = sal_True );
@@ -249,9 +252,11 @@ public:
     ::rtl::OUString FindAndRemoveCached( sal_Int32 nFamily ) const;
 
     void exportXML( sal_Int32 nFamily,
+#if SUPD < 650
         const ::com::sun::star::uno::Reference< ::com::sun::star::xml::sax::XDocumentHandler > & rHandler,
         const SvXMLUnitConverter& rUnitConverter,
         const SvXMLNamespaceMap& rNamespaceMap,
+#endif
         const SvXMLAutoStylePoolP *pAntiImpl) const;
 
     void ClearEntries();
diff --git a/xmloff/source/style/styleexp.cxx b/xmloff/source/style/styleexp.cxx
index b34d4874a350..7e96cf859bd0 100644
--- a/xmloff/source/style/styleexp.cxx
+++ b/xmloff/source/style/styleexp.cxx
@@ -2,9 +2,9 @@
  *
  *  $RCSfile: styleexp.cxx,v $
  *
- *  $Revision: 1.10 $
+ *  $Revision: 1.11 $
  *
- *  last change: $Author: dvo $ $Date: 2001-06-29 21:07:17 $
+ *  last change: $Author: dvo $ $Date: 2001-10-25 20:57:03 $
  *
  *  The Contents of this file are made available subject to the terms of
  *  either of the following licenses
@@ -281,10 +281,8 @@ sal_Bool XMLStyleExport::exportStyle(
         // <style:properties>
         ::std::vector< XMLPropertyState > xPropStates =
             rPropMapper->Filter( xPropSet );
-        rPropMapper->exportXML( GetExport().GetDocHandler(), xPropStates,
-                                  GetExport().GetMM100UnitConverter(),
-                                     GetExport().GetNamespaceMap(),
-                                     XML_EXPORT_FLAG_IGN_WS );
+        rPropMapper->exportXML( GetExport(), xPropStates,
+                                XML_EXPORT_FLAG_IGN_WS );
         exportStyleContent( rStyle );
 
         // <script:events>, if they are supported by this style
@@ -321,9 +319,7 @@ sal_Bool XMLStyleExport::exportDefaultStyle(
         //  rPropMapper->FilterDefaults( xPropSet );
         ::std::vector< XMLPropertyState > xPropStates =
             rPropMapper->FilterDefaults( xPropSet );
-        rPropMapper->exportXML( GetExport().GetDocHandler(), xPropStates,
-                                  GetExport().GetMM100UnitConverter(),
-                                     GetExport().GetNamespaceMap(),
+        rPropMapper->exportXML( GetExport(), xPropStates,
                                      XML_EXPORT_FLAG_IGN_WS );
 //      exportStyleContent( rStyle );
     }
diff --git a/xmloff/source/style/xmlaustp.cxx b/xmloff/source/style/xmlaustp.cxx
index fe63f4997d3f..501d9581ae9e 100644
--- a/xmloff/source/style/xmlaustp.cxx
+++ b/xmloff/source/style/xmlaustp.cxx
@@ -2,9 +2,9 @@
  *
  *  $RCSfile: xmlaustp.cxx,v $
  *
- *  $Revision: 1.13 $
+ *  $Revision: 1.14 $
  *
- *  last change: $Author: dvo $ $Date: 2001-09-13 14:07:03 $
+ *  last change: $Author: dvo $ $Date: 2001-10-25 20:57:03 $
  *
  *  The Contents of this file are made available subject to the terms of
  *  either of the following licenses
@@ -72,18 +72,15 @@
 #ifndef _XMLOFF_FAMILIES_HXX_
 #include "families.hxx"
 #endif
-#ifndef _XMLOFF_ATTRLIST_HXX
-#include "attrlist.hxx"
-#endif
-#ifndef _XMLOFF_NMSPMAP_HXX
-#include "nmspmap.hxx"
-#endif
 #ifndef _XMLOFF_XMLNMSPE_HXX
 #include "xmlnmspe.hxx"
 #endif
 #ifndef _XMLOFF_XMLTOKEN_HXX
 #include "xmltoken.hxx"
 #endif
+#ifndef _XMLOFF_XMLEXP_HXX
+#include "xmlexp.hxx"
+#endif
 
 #ifndef _XMLOFF_PAGEMASTERSTYLEMAP_HXX
 #include "PageMasterStyleMap.hxx"
@@ -95,9 +92,6 @@
 #include "XMLBackgroundImageExport.hxx"
 #endif
 
-#ifndef _COM_SUN_STAR_XML_SAX_XATTRIBUTELIST_HPP_
-#include <com/sun/star/xml/sax/XAttributeList.hpp>
-#endif
 
 using namespace ::std;
 using namespace ::rtl;
@@ -106,12 +100,17 @@ using namespace ::xmloff::token;
 
 
 void SvXMLAutoStylePoolP::exportStyleAttributes(
+#if SUPD < 650
         SvXMLAttributeList& rAttrList,
+#endif
         sal_Int32 nFamily,
         const vector< XMLPropertyState >& rProperties,
-        const SvXMLExportPropertyMapper& rPropExp,
-        const SvXMLUnitConverter& rUnitConverter,
-        const SvXMLNamespaceMap& rNamespaceMap ) const
+        const SvXMLExportPropertyMapper& rPropExp
+#if SUPD < 650
+        , const SvXMLUnitConverter& rUnitConverter,
+        const SvXMLNamespaceMap& rNamespaceMap
+#endif
+        ) const
 {
     if (XML_STYLE_FAMILY_SD_GRAPHICS_ID == nFamily)
     {   // it's a graphics style
@@ -145,8 +144,10 @@ void SvXMLAutoStylePoolP::exportStyleAttributes(
                     DBG_ASSERT(sControlDataStyleName.getLength(), "SvXMLAutoStylePoolP::exportStyleAttributes: invalid property value for the data style name!");
 
                     // add the attribute
-                    rtl::OUString sAttrName( rNamespaceMap.GetQNameByKey( aPropertyMapper->GetEntryNameSpace(pProp->mnIndex), aPropertyMapper->GetEntryXMLName(pProp->mnIndex) ) );
-                    rAttrList.AddAttribute(sAttrName, ::xmloff::token::GetXMLToken(::xmloff::token::XML_CDATA), sControlDataStyleName);
+                    GetExport().AddAttribute(
+                        aPropertyMapper->GetEntryNameSpace(pProp->mnIndex),
+                        aPropertyMapper->GetEntryXMLName(pProp->mnIndex),
+                        sControlDataStyleName );
 
 #ifdef DBG_UTIL
                     // in a non-pro version, check if there is another property with the special context id we're handling here
@@ -174,13 +175,15 @@ void SvXMLAutoStylePoolP::exportStyleAttributes(
                 {
                     case CTF_PM_PAGEUSAGE:
                     {
-                        OUString sAttrName( rNamespaceMap.GetQNameByKey(
-                            aPropMapper->GetEntryNameSpace( nIndex ), aPropMapper->GetEntryXMLName( nIndex ) ) );
                         OUString sValue;
                         const XMLPropertyHandler* pPropHdl = aPropMapper->GetPropertyHandler( nIndex );
-                        if( pPropHdl && pPropHdl->exportXML( sValue, pProp->maValue, rUnitConverter ) &&
+                        if( pPropHdl &&
+                            pPropHdl->exportXML( sValue, pProp->maValue,
+                                                 GetExport().GetMM100UnitConverter() ) &&
                             ( ! IsXMLToken( sValue, XML_ALL ) ) )
-                            rAttrList.AddAttribute( sAttrName, GetXMLToken(XML_CDATA), sValue );
+                        {
+                            GetExport().AddAttribute( aPropMapper->GetEntryNameSpace( nIndex ), aPropMapper->GetEntryXMLName( nIndex ), sValue );
+                        }
                     }
                     break;
                 }
@@ -190,12 +193,17 @@ void SvXMLAutoStylePoolP::exportStyleAttributes(
 }
 
 void SvXMLAutoStylePoolP::exportStyleContent(
+#if SUPD < 650
         const ::com::sun::star::uno::Reference< ::com::sun::star::xml::sax::XDocumentHandler > & rHandler,
+#endif
         sal_Int32 nFamily,
         const vector< XMLPropertyState >& rProperties,
-        const SvXMLExportPropertyMapper& rPropExp,
-        const SvXMLUnitConverter& rUnitConverter,
-        const SvXMLNamespaceMap& rNamespaceMap ) const
+        const SvXMLExportPropertyMapper& rPropExp
+#if SUPD < 650
+        , const SvXMLUnitConverter& rUnitConverter,
+        const SvXMLNamespaceMap& rNamespaceMap
+#endif
+        ) const
 {
     if( nFamily == XML_STYLE_FAMILY_PAGE_MASTER )
     {
@@ -253,29 +261,41 @@ void SvXMLAutoStylePoolP::exportStyleContent(
         if (!bFooterEndIndex)
             nFooterEndIndex = nIndex;
 
-        uno::Reference< xml::sax::XAttributeList > xEmptyList = new SvXMLAttributeList();
-
-        OUString sNameHeader( rNamespaceMap.GetQNameByKey( XML_NAMESPACE_STYLE, GetXMLToken(XML_HEADER_STYLE) ) );
+        // export header style element
+        {
+            SvXMLElementExport aElem(
+                GetExport(), XML_NAMESPACE_STYLE, XML_HEADER_STYLE,
+                sal_True, sal_True );
 
-        rHandler->ignorableWhitespace( sWS );
-        rHandler->startElement( sNameHeader, xEmptyList );
-        rPropExp.exportXML(rHandler, rProperties, rUnitConverter, rNamespaceMap, nHeaderStartIndex, nHeaderEndIndex, XML_EXPORT_FLAG_IGN_WS);
-        rHandler->ignorableWhitespace( sWS );
-        rHandler->endElement( sNameHeader );
+            rPropExp.exportXML(
+                GetExport(), rProperties,
+                nHeaderStartIndex, nHeaderEndIndex, XML_EXPORT_FLAG_IGN_WS);
+        }
 
-        OUString sNameFooter( rNamespaceMap.GetQNameByKey( XML_NAMESPACE_STYLE, GetXMLToken(XML_FOOTER_STYLE) ) );
+        // export footer style
+        {
+            SvXMLElementExport aElem(
+                GetExport(), XML_NAMESPACE_STYLE, XML_FOOTER_STYLE,
+                sal_True, sal_True );
 
-        rHandler->ignorableWhitespace( sWS );
-        rHandler->startElement( sNameFooter, xEmptyList );
-        rPropExp.exportXML(rHandler, rProperties, rUnitConverter, rNamespaceMap, nFooterStartIndex, nFooterEndIndex, XML_EXPORT_FLAG_IGN_WS);
-        rHandler->ignorableWhitespace( sWS );
-        rHandler->endElement( sNameFooter );
+            rPropExp.exportXML(
+                GetExport(), rProperties,
+                nFooterStartIndex, nFooterEndIndex, XML_EXPORT_FLAG_IGN_WS);
+        }
     }
 }
 
+#if SUPD < 650
 SvXMLAutoStylePoolP::SvXMLAutoStylePoolP()
 {
-    pImpl = new SvXMLAutoStylePoolP_Impl;
+    DBG_ERROR("This constuctor is obsoleted and should not be used!");
+    pImpl = NULL;
+}
+#endif
+
+SvXMLAutoStylePoolP::SvXMLAutoStylePoolP( SvXMLExport& rExport )
+{
+    pImpl = new SvXMLAutoStylePoolP_Impl( rExport );
 }
 
 SvXMLAutoStylePoolP::~SvXMLAutoStylePoolP()
@@ -283,6 +303,11 @@ SvXMLAutoStylePoolP::~SvXMLAutoStylePoolP()
     delete pImpl;
 }
 
+SvXMLExport& SvXMLAutoStylePoolP::GetExport() const
+{
+    return pImpl->GetExport();
+}
+
 // TODO: romove this
 void SvXMLAutoStylePoolP::AddFamily(
         sal_Int32 nFamily,
@@ -384,13 +409,22 @@ OUString SvXMLAutoStylePoolP::FindAndRemoveCached( sal_Int32 nFamily ) const
 }
 
 
-void SvXMLAutoStylePoolP::exportXML( sal_Int32 nFamily,
-    const uno::Reference< ::com::sun::star::xml::sax::XDocumentHandler > & rHandler,
+void SvXMLAutoStylePoolP::exportXML( sal_Int32 nFamily
+
+#if SUPD < 650
+    , const uno::Reference< ::com::sun::star::xml::sax::XDocumentHandler > & rHandler,
     const SvXMLUnitConverter& rUnitConverter,
-    const SvXMLNamespaceMap& rNamespaceMap) const
+    const SvXMLNamespaceMap& rNamespaceMap
+#endif
+    ) const
 {
-    pImpl->exportXML( nFamily, rHandler, rUnitConverter,
-                      rNamespaceMap, this);
+    pImpl->exportXML( nFamily,
+#if SUPD < 650
+                      GetExport().GetDocHandler(),
+                      GetExport().GetMM100UnitConverter(),
+                      GetExport().GetNamespaceMap(),
+#endif
+                      this);
 }
 
 void SvXMLAutoStylePoolP::ClearEntries()
diff --git a/xmloff/source/style/xmlexppr.cxx b/xmloff/source/style/xmlexppr.cxx
index 3d89396c211e..5a53ef5e37df 100644
--- a/xmloff/source/style/xmlexppr.cxx
+++ b/xmloff/source/style/xmlexppr.cxx
@@ -2,9 +2,9 @@
  *
  *  $RCSfile: xmlexppr.cxx,v $
  *
- *  $Revision: 1.33 $
+ *  $Revision: 1.34 $
  *
- *  last change: $Author: dvo $ $Date: 2001-09-14 15:44:16 $
+ *  last change: $Author: dvo $ $Date: 2001-10-25 20:57:03 $
  *
  *  The Contents of this file are made available subject to the terms of
  *  either of the following licenses
@@ -109,6 +109,10 @@
 #include "xmlnmspe.hxx"
 #endif
 
+#ifndef _XMLOFF_XMLEXP_HXX
+#include "xmlexp.hxx"
+#endif
+
 #ifndef _XMLOFF_PROPERTYSETMAPPER_HXX
 #include "xmlprmap.hxx"
 #endif
@@ -857,48 +861,34 @@ void SvXMLExportPropertyMapper::exportXML( SvXMLAttributeList& rAttrList,
 }
 
 void SvXMLExportPropertyMapper::exportXML(
-           const uno::Reference< xml::sax::XDocumentHandler > & rHandler,
+        SvXMLExport& rExport,
         const ::std::vector< XMLPropertyState >& rProperties,
-        const SvXMLUnitConverter& rUnitConverter,
-        const SvXMLNamespaceMap& rNamespaceMap,
         sal_uInt16 nFlags ) const
 {
-    exportXML( rHandler, rProperties, rUnitConverter, rNamespaceMap,
-               -1, -1,  nFlags );
+    exportXML( rExport, rProperties, -1, -1,  nFlags );
 }
 
 void SvXMLExportPropertyMapper::exportXML(
-           const uno::Reference< xml::sax::XDocumentHandler > & rHandler,
+        SvXMLExport& rExport,
         const ::std::vector< XMLPropertyState >& rProperties,
-        const SvXMLUnitConverter& rUnitConverter,
-        const SvXMLNamespaceMap& rNamespaceMap,
         sal_Int32 nPropMapStartIdx, sal_Int32 nPropMapEndIdx,
         sal_uInt16 nFlags ) const
 {
-    SvXMLAttributeList *pAttrList = new SvXMLAttributeList();
-    uno::Reference< xml::sax::XAttributeList > xAttrList( pAttrList );
-
     SvUShorts aIndexArray;
 
-    _exportXML( *pAttrList, rProperties, rUnitConverter, rNamespaceMap,
+    _exportXML( rExport.GetAttrList(), rProperties,
+                rExport.GetMM100UnitConverter(), rExport.GetNamespaceMap(),
                 nFlags, &aIndexArray, nPropMapStartIdx, nPropMapEndIdx );
 
-    if( pAttrList->getLength() > 0L || (nFlags & XML_EXPORT_FLAG_EMPTY) != 0 ||
+    if( rExport.GetAttrList().getLength() > 0L ||
+        (nFlags & XML_EXPORT_FLAG_EMPTY) != 0 ||
         aIndexArray.Count() != 0 )
     {
-        if( (nFlags & XML_EXPORT_FLAG_IGN_WS) != 0 )
-        {
-            rHandler->ignorableWhitespace( GetXMLToken(XML_WS) );
-        }
-
-        OUString sName = rNamespaceMap.GetQNameByKey( XML_NAMESPACE_STYLE,
-                                                 GetXMLToken(XML_PROPERTIES) );
-        rHandler->startElement( sName, xAttrList );
+        SvXMLElementExport aElem( rExport, XML_NAMESPACE_STYLE, XML_PROPERTIES,
+                                  (nFlags & XML_EXPORT_FLAG_IGN_WS) != 0,
+                                  sal_False );
 
-        exportElementItems( rHandler, rUnitConverter, rNamespaceMap,
-                            rProperties, nFlags, aIndexArray );
-
-        rHandler->endElement( sName );
+        exportElementItems( rExport, rProperties, nFlags, aIndexArray );
     }
 }
 
@@ -921,19 +911,16 @@ void SvXMLExportPropertyMapper::handleSpecialItem(
 /** this method is called for every item that has the
     MID_FLAG_ELEMENT_EXPORT flag set */
 void SvXMLExportPropertyMapper::handleElementItem(
-        const uno::Reference< xml::sax::XDocumentHandler > & rHandler,
+        SvXMLExport& rExport,
         const XMLPropertyState& rProperty,
-        const SvXMLUnitConverter& rUnitConverter,
-        const SvXMLNamespaceMap& rNamespaceMap,
         sal_uInt16 nFlags,
         const ::std::vector< XMLPropertyState > *pProperties,
         sal_uInt32 nIdx ) const
 {
     OSL_ENSURE( mxNextMapper.is(), "element item not handled in xml export" );
     if( mxNextMapper.is() )
-        mxNextMapper->handleElementItem( rHandler, rProperty, rUnitConverter,
-                                           rNamespaceMap, nFlags, pProperties,
-                                        nIdx );
+        mxNextMapper->handleElementItem( rExport, rProperty, nFlags,
+                                         pProperties, nIdx );
 }
 
 ///////////////////////////////////////////////////////////////////////////////
@@ -1083,9 +1070,7 @@ void SvXMLExportPropertyMapper::_exportXML(
 }
 
 void SvXMLExportPropertyMapper::exportElementItems(
-        const uno::Reference< xml::sax::XDocumentHandler > & rHandler,
-        const SvXMLUnitConverter& rUnitConverter,
-        const SvXMLNamespaceMap& rNamespaceMap,
+        SvXMLExport& rExport,
         const ::std::vector< XMLPropertyState >& rProperties,
         sal_uInt16 nFlags,
         const SvUShorts& rIndexArray ) const
@@ -1102,12 +1087,12 @@ void SvXMLExportPropertyMapper::exportElementItems(
                 rProperties[nElement].mnIndex ) & MID_FLAG_ELEMENT_ITEM_EXPORT),
                 "wrong mid flag!" );
 
-        rHandler->ignorableWhitespace( sWS );
-        handleElementItem( rHandler, rProperties[nElement], rUnitConverter,
-                           rNamespaceMap, nFlags, &rProperties, nElement );
+        rExport.IgnorableWhitespace();
+        handleElementItem( rExport, rProperties[nElement],
+                           nFlags, &rProperties, nElement );
         bItemsExported = sal_True;
     }
 
     if( bItemsExported )
-        rHandler->ignorableWhitespace( sWS );
+        rExport.IgnorableWhitespace();
 }
diff --git a/xmloff/source/text/txtexppr.cxx b/xmloff/source/text/txtexppr.cxx
index 25834da80005..96a74506758f 100644
--- a/xmloff/source/text/txtexppr.cxx
+++ b/xmloff/source/text/txtexppr.cxx
@@ -2,9 +2,9 @@
  *
  *  $RCSfile: txtexppr.cxx,v $
  *
- *  $Revision: 1.16 $
+ *  $Revision: 1.17 $
  *
- *  last change: $Author: dvo $ $Date: 2001-10-19 18:43:58 $
+ *  last change: $Author: dvo $ $Date: 2001-10-25 20:57:03 $
  *
  *  The Contents of this file are made available subject to the terms of
  *  either of the following licenses
@@ -107,10 +107,8 @@ using namespace ::com::sun::star::text;
 using namespace ::com::sun::star::awt;
 
 void XMLTextExportPropertySetMapper::handleElementItem(
-        const Reference< xml::sax::XDocumentHandler > & rHandler,
+        SvXMLExport& rExport,
         const XMLPropertyState& rProperty,
-        const SvXMLUnitConverter& rUnitConverter,
-        const SvXMLNamespaceMap& rNamespaceMap,
         sal_uInt16 nFlags,
         const ::std::vector< XMLPropertyState > *pProperties,
         sal_uInt32 nIdx ) const
@@ -179,7 +177,7 @@ void XMLTextExportPropertySetMapper::handleElementItem(
         break;
 
     default:
-        SvXMLExportPropertyMapper::handleElementItem( rHandler, rProperty, rUnitConverter, rNamespaceMap, nFlags, pProperties, nIdx );
+        SvXMLExportPropertyMapper::handleElementItem( rExport, rProperty, nFlags, pProperties, nIdx );
         break;
     }
 }
diff --git a/xmloff/source/text/txtexppr.hxx b/xmloff/source/text/txtexppr.hxx
index af785dcc2e64..6be1f0db5557 100644
--- a/xmloff/source/text/txtexppr.hxx
+++ b/xmloff/source/text/txtexppr.hxx
@@ -2,9 +2,9 @@
  *
  *  $RCSfile: txtexppr.hxx,v $
  *
- *  $Revision: 1.4 $
+ *  $Revision: 1.5 $
  *
- *  last change: $Author: mib $ $Date: 2000-11-13 08:42:14 $
+ *  last change: $Author: dvo $ $Date: 2001-10-25 20:57:03 $
  *
  *  The Contents of this file are made available subject to the terms of
  *  either of the following licenses
@@ -121,10 +121,8 @@ public:
     virtual ~XMLTextExportPropertySetMapper();
 
     virtual void handleElementItem(
-        const ::com::sun::star::uno::Reference< ::com::sun::star::xml::sax::XDocumentHandler > & rHandler,
+        SvXMLExport& rExport,
         const XMLPropertyState& rProperty,
-        const SvXMLUnitConverter& rUnitConverter,
-        const SvXMLNamespaceMap& rNamespaceMap,
         sal_uInt16 nFlags,
         const ::std::vector< XMLPropertyState > *pProperties = 0,
         sal_uInt32 nIdx = 0 ) const;
diff --git a/xmloff/source/text/txtparae.cxx b/xmloff/source/text/txtparae.cxx
index 2970cbc0812c..f3a4570729cf 100644
--- a/xmloff/source/text/txtparae.cxx
+++ b/xmloff/source/text/txtparae.cxx
@@ -2,9 +2,9 @@
  *
  *  $RCSfile: txtparae.cxx,v $
  *
- *  $Revision: 1.94 $
+ *  $Revision: 1.95 $
  *
- *  last change: $Author: dvo $ $Date: 2001-09-24 13:40:55 $
+ *  last change: $Author: dvo $ $Date: 2001-10-25 20:57:03 $
  *
  *  The Contents of this file are made available subject to the terms of
  *  either of the following licenses
@@ -2911,6 +2911,7 @@ void XMLTextParagraphExport::recordTrackedChangesNoXText()
 
 void XMLTextParagraphExport::exportTextAutoStyles()
 {
+#if SUPD < 650
     GetAutoStylePool().exportXML( XML_STYLE_FAMILY_TEXT_PARAGRAPH,
                                    GetExport().GetDocHandler(),
                                    GetExport().GetMM100UnitConverter(),
@@ -2935,6 +2936,14 @@ void XMLTextParagraphExport::exportTextAutoStyles()
                                   GetExport().GetDocHandler(),
                                   GetExport().GetMM100UnitConverter(),
                                   GetExport().GetNamespaceMap() );
+#else
+    GetAutoStylePool().exportXML( XML_STYLE_FAMILY_TEXT_PARAGRAPH );
+    GetAutoStylePool().exportXML( XML_STYLE_FAMILY_TEXT_TEXT );
+    GetAutoStylePool().exportXML( XML_STYLE_FAMILY_TEXT_FRAME );
+    GetAutoStylePool().exportXML( XML_STYLE_FAMILY_TEXT_SECTION );
+    GetAutoStylePool().exportXML( XML_STYLE_FAMILY_TEXT_RUBY );
+#endif
+
     pListAutoPool->exportXML();
 }