Merge SvXMLAttributeList to comphelper::AttributeList

And simplify the latter, to always use "CDATA" type (as the former did).
"CDATA" was used in all cases but one, where an empty string was used.

Change-Id: I1b3bfae40e29628e4094d9a6e58a69a66865874c
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/145526
Tested-by: Jenkins
Reviewed-by: Mike Kaganski <mike.kaganski@collabora.com>

29 files changed, 38 insertions, 232 deletions

diff --git a/xmloff/Library_xo.mk b/xmloff/Library_xo.mk
index 19c9db439e62..6a52570c6b9c 100644
--- a/xmloff/Library_xo.mk
+++ b/xmloff/Library_xo.mk
@@ -120,7 +120,6 @@ $(eval $(call gb_Library_add_exception_objects,xo,\
     xmloff/source/core/XMLBasicExportFilter \
     xmloff/source/core/XMLEmbeddedObjectExportFilter \
     xmloff/source/core/XMLEmbeddedObjectImportContext \
-    xmloff/source/core/attrlist \
     xmloff/source/core/i18nmap \
     xmloff/source/core/namespacemap \
     xmloff/source/core/unoatrcn \
diff --git a/xmloff/inc/SchXMLAutoStylePoolP.hxx b/xmloff/inc/SchXMLAutoStylePoolP.hxx
index 50f511eae1f8..c349a0905604 100644
--- a/xmloff/inc/SchXMLAutoStylePoolP.hxx
+++ b/xmloff/inc/SchXMLAutoStylePoolP.hxx
@@ -27,7 +27,7 @@ class SchXMLAutoStylePoolP final : public SvXMLAutoStylePoolP
     SchXMLExport& mrSchXMLExport;
 
     virtual void exportStyleAttributes(
-        SvXMLAttributeList& rAttrList,
+        comphelper::AttributeList& rAttrList,
         XmlStyleFamily nFamily,
         const ::std::vector< XMLPropertyState >& rProperties,
         const SvXMLExportPropertyMapper& rPropExp
diff --git a/xmloff/inc/XMLChartPropertySetMapper.hxx b/xmloff/inc/XMLChartPropertySetMapper.hxx
index 8b3d72d3e19d..835dd3cc9a6c 100644
--- a/xmloff/inc/XMLChartPropertySetMapper.hxx
+++ b/xmloff/inc/XMLChartPropertySetMapper.hxx
@@ -64,7 +64,7 @@ private:
 
     /// this method is called for every item that has the MID_FLAG_SPECIAL_ITEM_EXPORT flag set
     virtual void handleSpecialItem(
-        SvXMLAttributeList& rAttrList, const XMLPropertyState& rProperty,
+        comphelper::AttributeList& rAttrList, const XMLPropertyState& rProperty,
         const SvXMLUnitConverter& rUnitConverter, const SvXMLNamespaceMap& rNamespaceMap,
         const ::std::vector< XMLPropertyState > *pProperties,
         sal_uInt32 nIdx  ) const override;
diff --git a/xmloff/inc/pch/precompiled_xo.hxx b/xmloff/inc/pch/precompiled_xo.hxx
index a88a03364c9b..712f227fb41c 100644
--- a/xmloff/inc/pch/precompiled_xo.hxx
+++ b/xmloff/inc/pch/precompiled_xo.hxx
@@ -219,7 +219,6 @@
 #include <xmloff/ProgressBarHelper.hxx>
 #include <xmloff/XMLBase64ImportContext.hxx>
 #include <xmloff/XMLEventsImportContext.hxx>
-#include <xmloff/attrlist.hxx>
 #include <xmloff/dllapi.h>
 #include <xmloff/families.hxx>
 #include <xmloff/maptype.hxx>
diff --git a/xmloff/inc/pch/precompiled_xof.hxx b/xmloff/inc/pch/precompiled_xof.hxx
index 684dfc584b0e..293b041f066c 100644
--- a/xmloff/inc/pch/precompiled_xof.hxx
+++ b/xmloff/inc/pch/precompiled_xof.hxx
@@ -56,7 +56,6 @@
 #include <comphelper/diagnose_ex.hxx>
 #endif // PCH_LEVEL >= 3
 #if PCH_LEVEL >= 4
-#include <xmloff/attrlist.hxx>
 #include <xmloff/namespacemap.hxx>
 #include <xmloff/xmlimp.hxx>
 #include <xmloff/xmlnamespace.hxx>
diff --git a/xmloff/source/chart/PropertyMaps.cxx b/xmloff/source/chart/PropertyMaps.cxx
index 1b6d54ad1090..ea40bd4c7e6b 100644
--- a/xmloff/source/chart/PropertyMaps.cxx
+++ b/xmloff/source/chart/PropertyMaps.cxx
@@ -31,7 +31,7 @@
 #include <propimp0.hxx>
 
 #include <xmloff/EnumPropertyHdl.hxx>
-#include <xmloff/attrlist.hxx>
+#include <comphelper/attributelist.hxx>
 #include <xmloff/namespacemap.hxx>
 #include <xmloff/xmluconv.hxx>
 #include <xmloff/shapeimport.hxx>
@@ -683,7 +683,7 @@ OUString convertRange( const OUString & rRange, const uno::Reference< chart2::XC
 }
 
 void XMLChartExportPropertyMapper::handleSpecialItem(
-    SvXMLAttributeList& rAttrList, const XMLPropertyState& rProperty,
+    comphelper::AttributeList& rAttrList, const XMLPropertyState& rProperty,
     const SvXMLUnitConverter& rUnitConverter,
     const SvXMLNamespaceMap& rNamespaceMap,
     const ::std::vector< XMLPropertyState > *pProperties,
diff --git a/xmloff/source/chart/SchXMLAutoStylePoolP.cxx b/xmloff/source/chart/SchXMLAutoStylePoolP.cxx
index d60b3de72f9e..c893408ec3c0 100644
--- a/xmloff/source/chart/SchXMLAutoStylePoolP.cxx
+++ b/xmloff/source/chart/SchXMLAutoStylePoolP.cxx
@@ -33,7 +33,7 @@ SchXMLAutoStylePoolP::~SchXMLAutoStylePoolP()
 {}
 
 void SchXMLAutoStylePoolP::exportStyleAttributes(
-    SvXMLAttributeList& rAttrList,
+    comphelper::AttributeList& rAttrList,
     XmlStyleFamily nFamily,
     const ::std::vector< XMLPropertyState >& rProperties,
     const SvXMLExportPropertyMapper& rPropExp
diff --git a/xmloff/source/core/XMLEmbeddedObjectImportContext.cxx b/xmloff/source/core/XMLEmbeddedObjectImportContext.cxx
index 29c9f67c1274..7f68a11fed20 100644
--- a/xmloff/source/core/XMLEmbeddedObjectImportContext.cxx
+++ b/xmloff/source/core/XMLEmbeddedObjectImportContext.cxx
@@ -32,7 +32,6 @@
 #include <xmloff/xmlimp.hxx>
 #include <xmloff/xmlnamespace.hxx>
 #include <xmloff/xmltoken.hxx>
-#include <xmloff/attrlist.hxx>
 #include <xmloff/XMLFilterServiceNames.h>
 #include <XMLEmbeddedObjectImportContext.hxx>
 
diff --git a/xmloff/source/core/attrlist.cxx b/xmloff/source/core/attrlist.cxx
deleted file mode 100644
index 5d02d074bc9e..000000000000
--- a/xmloff/source/core/attrlist.cxx
+++ /dev/null
@@ -1,187 +0,0 @@
-/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
-/*
- * This file is part of the LibreOffice project.
- *
- * This Source Code Form is subject to the terms of the Mozilla Public
- * License, v. 2.0. If a copy of the MPL was not distributed with this
- * file, You can obtain one at http://mozilla.org/MPL/2.0/.
- *
- * This file incorporates work covered by the following license notice:
- *
- *   Licensed to the Apache Software Foundation (ASF) under one or more
- *   contributor license agreements. See the NOTICE file distributed
- *   with this work for additional information regarding copyright
- *   ownership. The ASF licenses this file to you under the Apache
- *   License, Version 2.0 (the "License"); you may not use this file
- *   except in compliance with the License. You may obtain a copy of
- *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
- */
-
-
-#include <vector>
-
-#include <o3tl/safeint.hxx>
-#include <osl/diagnose.h>
-#include <xmloff/xmltoken.hxx>
-#include <cppuhelper/implbase.hxx>
-
-#include <xmloff/attrlist.hxx>
-
-
-using namespace ::com::sun::star;
-using namespace ::xmloff::token;
-
-sal_Int16 SAL_CALL SvXMLAttributeList::getLength()
-{
-    return sal::static_int_cast< sal_Int16 >(vecAttribute.size());
-}
-
-
-SvXMLAttributeList::SvXMLAttributeList( const SvXMLAttributeList &r ) :
-    cppu::WeakImplHelper<css::xml::sax::XAttributeList, css::util::XCloneable>(r),
-    vecAttribute( r.vecAttribute )
-{
-}
-
-SvXMLAttributeList::SvXMLAttributeList( const uno::Reference< xml::sax::XAttributeList> & rAttrList )
-{
-    SvXMLAttributeList* pImpl = dynamic_cast<SvXMLAttributeList*>( rAttrList.get() );
-
-    if( pImpl )
-        vecAttribute = pImpl->vecAttribute;
-    else
-        AppendAttributeList( rAttrList );
-}
-
-OUString SAL_CALL SvXMLAttributeList::getNameByIndex(sal_Int16 i)
-{
-    assert( o3tl::make_unsigned(i) < vecAttribute.size() );
-    return ( o3tl::make_unsigned( i ) < vecAttribute.size() ) ? vecAttribute[i].sName : OUString();
-}
-
-
-OUString SAL_CALL SvXMLAttributeList::getTypeByIndex(sal_Int16)
-{
-    return "CDATA";
-}
-
-OUString SAL_CALL  SvXMLAttributeList::getValueByIndex(sal_Int16 i)
-{
-    assert( o3tl::make_unsigned(i) < vecAttribute.size() );
-    return ( o3tl::make_unsigned( i ) < vecAttribute.size() ) ? vecAttribute[i].sValue : OUString();
-}
-
-OUString SAL_CALL SvXMLAttributeList::getTypeByName( const OUString& )
-{
-    return "CDATA";
-}
-
-OUString SAL_CALL SvXMLAttributeList::getValueByName(const OUString& sName)
-{
-    auto ii = std::find_if(vecAttribute.begin(), vecAttribute.end(),
-        [&sName](SvXMLTagAttribute_Impl& rAttr) { return rAttr.sName == sName; });
-
-    if (ii != vecAttribute.end())
-        return (*ii).sValue;
-
-    return OUString();
-}
-
-
-uno::Reference< css::util::XCloneable >  SvXMLAttributeList::createClone()
-{
-    uno::Reference< css::util::XCloneable >  r = new SvXMLAttributeList( *this );
-    return r;
-}
-
-
-SvXMLAttributeList::SvXMLAttributeList()
-{
-    vecAttribute.reserve(20); // performance improvement during adding
-}
-
-
-SvXMLAttributeList::~SvXMLAttributeList()
-{
-}
-
-
-void SvXMLAttributeList::AddAttribute(  const OUString &sName ,
-                                        const OUString &sValue )
-{
-    assert( !sName.isEmpty() && "empty attribute name is invalid");
-    assert( std::count(sName.getStr(), sName.getStr() + sName.getLength(), u':') <= 1 && "too many colons");
-    vecAttribute.emplace_back( SvXMLTagAttribute_Impl { sName , sValue } );
-}
-
-void SvXMLAttributeList::Clear()
-{
-    vecAttribute.clear();
-}
-
-void SvXMLAttributeList::RemoveAttribute( const OUString& sName )
-{
-    auto ii = std::find_if(vecAttribute.begin(), vecAttribute.end(),
-        [&sName](SvXMLTagAttribute_Impl& rAttr) { return rAttr.sName == sName; });
-
-    if (ii != vecAttribute.end())
-        vecAttribute.erase( ii );
-}
-
-void SvXMLAttributeList::AppendAttributeList( const uno::Reference< css::xml::sax::XAttributeList >  &r )
-{
-    OSL_ASSERT( r.is() );
-
-    sal_Int16 nMax = r->getLength();
-    sal_Int16 nTotalSize = vecAttribute.size() + nMax;
-    vecAttribute.reserve( nTotalSize );
-
-    for( sal_Int16 i = 0 ; i < nMax ; ++i ) {
-        OUString sName = r->getNameByIndex( i );
-        assert( !sName.isEmpty() && "empty attribute name is invalid");
-        assert( std::count(sName.getStr(), sName.getStr() + sName.getLength(), u':') <= 1 && "too many colons");
-        vecAttribute.emplace_back(SvXMLTagAttribute_Impl { sName, r->getValueByIndex( i ) });
-    }
-
-    OSL_ASSERT( nTotalSize == getLength() );
-}
-
-void SvXMLAttributeList::SetValueByIndex( sal_Int16 i,
-        const OUString& rValue )
-{
-    assert( o3tl::make_unsigned(i) < vecAttribute.size() );
-    if( o3tl::make_unsigned( i ) < vecAttribute.size() )
-    {
-        vecAttribute[i].sValue = rValue;
-    }
-}
-
-void SvXMLAttributeList::RemoveAttributeByIndex( sal_Int16 i )
-{
-    assert( o3tl::make_unsigned(i) < vecAttribute.size() );
-    if( o3tl::make_unsigned( i ) < vecAttribute.size() )
-        vecAttribute.erase( vecAttribute.begin() + i );
-}
-
-void SvXMLAttributeList::RenameAttributeByIndex( sal_Int16 i,
-                                                 const OUString& rNewName )
-{
-    assert( o3tl::make_unsigned(i) < vecAttribute.size() );
-    if( o3tl::make_unsigned( i ) < vecAttribute.size() )
-    {
-        vecAttribute[i].sName = rNewName;
-    }
-}
-
-sal_Int16 SvXMLAttributeList::GetIndexByName( const OUString& rName ) const
-{
-    auto ii = std::find_if(vecAttribute.begin(), vecAttribute.end(),
-        [&rName](const SvXMLTagAttribute_Impl& rAttr) { return rAttr.sName == rName; });
-
-    if (ii != vecAttribute.end())
-        return static_cast<sal_Int16>(std::distance(vecAttribute.begin(), ii));
-
-    return -1;
-}
-
-/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/xmloff/source/core/xmlexp.cxx b/xmloff/source/core/xmlexp.cxx
index a6ae52092ec2..f98ad0540896 100644
--- a/xmloff/source/core/xmlexp.cxx
+++ b/xmloff/source/core/xmlexp.cxx
@@ -46,7 +46,6 @@
 #include <comphelper/processfactory.hxx>
 #include <comphelper/propertysetinfo.hxx>
 #include <comphelper/propertyvalue.hxx>
-#include <xmloff/attrlist.hxx>
 #include <xmloff/namespacemap.hxx>
 #include <xmloff/xmluconv.hxx>
 #include <xmloff/xmlnamespace.hxx>
@@ -441,7 +440,7 @@ SvXMLExport::SvXMLExport(
     const enum XMLTokenEnum eClass, SvXMLExportFlags nExportFlags )
 :   mpImpl( new SvXMLExport_Impl ),
     m_xContext(xContext), m_implementationName(std::move(implementationName)),
-    mxAttrList( new SvXMLAttributeList ),
+    mxAttrList( new comphelper::AttributeList ),
     mpNamespaceMap( new SvXMLNamespaceMap ),
     mpAuthorIDs( new SvtSecurityMapPersonalInfo ),
     maUnitConv(xContext, util::MeasureUnit::MM_100TH, eDefaultMeasureUnit, getSaneDefaultVersion()),
@@ -466,7 +465,7 @@ SvXMLExport::SvXMLExport(
     m_xContext(xContext), m_implementationName(std::move(implementationName)),
     mxHandler( rHandler ),
     mxExtHandler( rHandler, uno::UNO_QUERY ),
-    mxAttrList( new SvXMLAttributeList ),
+    mxAttrList( new comphelper::AttributeList ),
     msOrigFileName(std::move( fileName )),
     mpNamespaceMap( new SvXMLNamespaceMap ),
     mpAuthorIDs( new SvtSecurityMapPersonalInfo ),
@@ -500,7 +499,7 @@ SvXMLExport::SvXMLExport(
     mxHandler( rHandler ),
     mxExtHandler( rHandler, uno::UNO_QUERY ),
     mxNumberFormatsSupplier (rModel, uno::UNO_QUERY),
-    mxAttrList( new SvXMLAttributeList ),
+    mxAttrList( new comphelper::AttributeList ),
     msOrigFileName(std::move( fileName )),
     mpNamespaceMap( new SvXMLNamespaceMap ),
     mpAuthorIDs( new SvtSecurityMapPersonalInfo ),
diff --git a/xmloff/source/core/xmlimp.cxx b/xmloff/source/core/xmlimp.cxx
index 6d166def862b..3b6d79934a99 100644
--- a/xmloff/source/core/xmlimp.cxx
+++ b/xmloff/source/core/xmlimp.cxx
@@ -2124,7 +2124,7 @@ void SvXMLImportFastNamespaceHandler::addNSDeclAttributes( rtl::Reference < comp
             sDecl = "xmlns";
         else
             sDecl = "xmlns:" + rPrefix;
-        rAttrList->AddAttribute( sDecl, "CDATA", rNamespaceURI );
+        rAttrList->AddAttribute( sDecl, rNamespaceURI );
     }
     m_aNamespaceDefines.clear();
 }
diff --git a/xmloff/source/draw/sdpropls.cxx b/xmloff/source/draw/sdpropls.cxx
index 278e0c2bc179..de7030f8efff 100644
--- a/xmloff/source/draw/sdpropls.cxx
+++ b/xmloff/source/draw/sdpropls.cxx
@@ -1688,7 +1688,7 @@ void XMLShapeExportPropertyMapper::ContextFilter(
 }
 
 void XMLShapeExportPropertyMapper::handleSpecialItem(
-        SvXMLAttributeList& rAttrList,
+        comphelper::AttributeList& rAttrList,
         const XMLPropertyState& rProperty,
         const SvXMLUnitConverter& rUnitConverter,
         const SvXMLNamespaceMap& rNamespaceMap,
diff --git a/xmloff/source/draw/sdpropls.hxx b/xmloff/source/draw/sdpropls.hxx
index 2a2557a2b742..607fa3ace7a3 100644
--- a/xmloff/source/draw/sdpropls.hxx
+++ b/xmloff/source/draw/sdpropls.hxx
@@ -97,7 +97,7 @@ public:
     void SetAutoStyles( bool bIsInAutoStyles ) { mbIsInAutoStyles = bIsInAutoStyles; }
 
     virtual void handleSpecialItem(
-            SvXMLAttributeList& rAttrList,
+            comphelper::AttributeList& rAttrList,
             const XMLPropertyState& rProperty,
             const SvXMLUnitConverter& rUnitConverter,
             const SvXMLNamespaceMap& rNamespaceMap,
diff --git a/xmloff/source/draw/shapeexport.cxx b/xmloff/source/draw/shapeexport.cxx
index 51ee4c894250..39d9eabb5971 100644
--- a/xmloff/source/draw/shapeexport.cxx
+++ b/xmloff/source/draw/shapeexport.cxx
@@ -559,7 +559,7 @@ namespace
 void XMLShapeExport::exportShape(const uno::Reference< drawing::XShape >& xShape,
                                  XMLShapeExportFlags nFeatures /* = SEF_DEFAULT */,
                                  css::awt::Point* pRefPoint /* = NULL */,
-                                 SvXMLAttributeList* pAttrList /* = NULL */ )
+                                 comphelper::AttributeList* pAttrList /* = NULL */ )
 {
     SAL_INFO("xmloff", xShape->getShapeType());
     if( maCurrentShapesIter == maShapesInfos.end() )
@@ -583,7 +583,7 @@ void XMLShapeExport::exportShape(const uno::Reference< drawing::XShape >& xShape
     // Need to stash the attributes that are pre-loaded for the shape export
     // (otherwise they will become attributes of the draw:a element)
     uno::Reference<xml::sax::XAttributeList> xSaveAttribs(
-        new SvXMLAttributeList(GetExport().GetAttrList()));
+        new comphelper::AttributeList(GetExport().GetAttrList()));
     GetExport().ClearAttrList();
     if( xSet.is() && (GetExport().GetModelType() == SvtModuleOptions::EFactory::DRAW) )
     {
@@ -2576,7 +2576,7 @@ void XMLShapeExport::ImpExportGraphicObjectShape(
 void XMLShapeExport::ImpExportChartShape(
     const uno::Reference< drawing::XShape >& xShape,
     XmlShapeType eShapeType, XMLShapeExportFlags nFeatures, awt::Point* pRefPoint,
-    SvXMLAttributeList* pAttrList )
+    comphelper::AttributeList* pAttrList )
 {
     ImpExportOLE2Shape( xShape, eShapeType, nFeatures, pRefPoint, pAttrList );
 }
@@ -2920,7 +2920,7 @@ void XMLShapeExport::ImpExportMeasureShape(
 void XMLShapeExport::ImpExportOLE2Shape(
     const uno::Reference< drawing::XShape >& xShape,
     XmlShapeType eShapeType, XMLShapeExportFlags nFeatures /* = SEF_DEFAULT */, awt::Point* pRefPoint /* = NULL */,
-    SvXMLAttributeList* pAttrList /* = NULL */ )
+    comphelper::AttributeList* pAttrList /* = NULL */ )
 {
     uno::Reference< beans::XPropertySet > xPropSet(xShape, uno::UNO_QUERY);
     uno::Reference< container::XNamed > xNamed(xShape, uno::UNO_QUERY);
diff --git a/xmloff/source/draw/shapeimport.cxx b/xmloff/source/draw/shapeimport.cxx
index d28b2b03843a..a89b1ca840f3 100644
--- a/xmloff/source/draw/shapeimport.cxx
+++ b/xmloff/source/draw/shapeimport.cxx
@@ -35,7 +35,6 @@
 #include <xmloff/xmlnamespace.hxx>
 #include <xmloff/xmltoken.hxx>
 #include <xmloff/table/XMLTableImport.hxx>
-#include <xmloff/attrlist.hxx>
 #include "eventimp.hxx"
 #include "ximpshap.hxx"
 #include "sdpropls.hxx"
diff --git a/xmloff/source/draw/ximpshap.cxx b/xmloff/source/draw/ximpshap.cxx
index 8d6be9de1273..266135bad479 100644
--- a/xmloff/source/draw/ximpshap.cxx
+++ b/xmloff/source/draw/ximpshap.cxx
@@ -78,7 +78,6 @@
 #include <xmloff/xmlerror.hxx>
 #include <xmloff/table/XMLTableImport.hxx>
 #include <xmloff/ProgressBarHelper.hxx>
-#include <xmloff/attrlist.hxx>
 #include <basegfx/matrix/b2dhommatrix.hxx>
 #include <com/sun/star/drawing/XEnhancedCustomShapeDefaulter.hpp>
 #include <com/sun/star/container/XChild.hpp>
diff --git a/xmloff/source/forms/controlpropertymap.cxx b/xmloff/source/forms/controlpropertymap.cxx
index 2cbf621043bc..7e2bbdd5c5d5 100644
--- a/xmloff/source/forms/controlpropertymap.cxx
+++ b/xmloff/source/forms/controlpropertymap.cxx
@@ -106,7 +106,7 @@ namespace xmloff
     {
     }
 
-    void OFormComponentStyleExportMapper::handleSpecialItem( SvXMLAttributeList& _rAttrList, const XMLPropertyState& _rProperty, const SvXMLUnitConverter& _rUnitConverter,
+    void OFormComponentStyleExportMapper::handleSpecialItem( comphelper::AttributeList& _rAttrList, const XMLPropertyState& _rProperty, const SvXMLUnitConverter& _rUnitConverter,
         const SvXMLNamespaceMap& _rNamespaceMap, const ::std::vector< XMLPropertyState >* _pProperties,
         sal_uInt32 _nIdx ) const
     {
diff --git a/xmloff/source/forms/controlpropertymap.hxx b/xmloff/source/forms/controlpropertymap.hxx
index ff575c13797a..02bc81a078bf 100644
--- a/xmloff/source/forms/controlpropertymap.hxx
+++ b/xmloff/source/forms/controlpropertymap.hxx
@@ -37,7 +37,7 @@ namespace xmloff
         explicit OFormComponentStyleExportMapper( const rtl::Reference< XMLPropertySetMapper >& _rMapper );
 
         void handleSpecialItem(
-            SvXMLAttributeList&                         _rAttrList,
+            comphelper::AttributeList&                         _rAttrList,
             const XMLPropertyState&                     _rProperty,
             const SvXMLUnitConverter&                   _rUnitConverter,
             const SvXMLNamespaceMap&                    _rNamespaceMap,
diff --git a/xmloff/source/style/PageMasterExportPropMapper.cxx b/xmloff/source/style/PageMasterExportPropMapper.cxx
index 725ad6f9e510..1da95f35cdb7 100644
--- a/xmloff/source/style/PageMasterExportPropMapper.cxx
+++ b/xmloff/source/style/PageMasterExportPropMapper.cxx
@@ -345,7 +345,7 @@ void XMLPageMasterExportPropMapper::handleElementItem(
 }
 
 void XMLPageMasterExportPropMapper::handleSpecialItem(
-        SvXMLAttributeList&,
+        comphelper::AttributeList&,
         const XMLPropertyState&,
         const SvXMLUnitConverter&,
         const SvXMLNamespaceMap&,
diff --git a/xmloff/source/style/PageMasterExportPropMapper.hxx b/xmloff/source/style/PageMasterExportPropMapper.hxx
index 8aa2debc8654..71550443faca 100644
--- a/xmloff/source/style/PageMasterExportPropMapper.hxx
+++ b/xmloff/source/style/PageMasterExportPropMapper.hxx
@@ -52,7 +52,7 @@ public:
                             sal_uInt32 nIdx
                             ) const override;
     virtual void        handleSpecialItem(
-                            SvXMLAttributeList& rAttrList,
+                            comphelper::AttributeList& rAttrList,
                             const XMLPropertyState& rProperty,
                             const SvXMLUnitConverter& rUnitConverter,
                             const SvXMLNamespaceMap& rNamespaceMap,
diff --git a/xmloff/source/style/xmlaustp.cxx b/xmloff/source/style/xmlaustp.cxx
index 0aca31aabdf3..20d639c3b121 100644
--- a/xmloff/source/style/xmlaustp.cxx
+++ b/xmloff/source/style/xmlaustp.cxx
@@ -58,7 +58,7 @@ namespace
 }
 
 void SvXMLAutoStylePoolP::exportStyleAttributes(
-        SvXMLAttributeList&,
+        comphelper::AttributeList&,
         XmlStyleFamily nFamily,
         const vector< XMLPropertyState >& rProperties,
         const SvXMLExportPropertyMapper& rPropExp,
diff --git a/xmloff/source/style/xmlexppr.cxx b/xmloff/source/style/xmlexppr.cxx
index e81758bdce7c..b1a60aabb384 100644
--- a/xmloff/source/style/xmlexppr.cxx
+++ b/xmloff/source/style/xmlexppr.cxx
@@ -38,7 +38,6 @@
 #include <utility>
 #include <xmloff/xmlexppr.hxx>
 #include <xmloff/xmltoken.hxx>
-#include <xmloff/attrlist.hxx>
 #include <xmloff/namespacemap.hxx>
 #include <xmloff/xmlnamespace.hxx>
 #include <xmloff/xmlexp.hxx>
@@ -856,7 +855,7 @@ void SvXMLExportPropertyMapper::exportXML(
 /** this method is called for every item that has the
     MID_FLAG_SPECIAL_ITEM_EXPORT flag set */
 void SvXMLExportPropertyMapper::handleSpecialItem(
-        SvXMLAttributeList& rAttrList,
+        comphelper::AttributeList& rAttrList,
         const XMLPropertyState& rProperty,
         const SvXMLUnitConverter& rUnitConverter,
         const SvXMLNamespaceMap& rNamespaceMap,
@@ -888,7 +887,7 @@ void SvXMLExportPropertyMapper::handleElementItem(
 /** fills the given attribute list with the items in the given set */
 void SvXMLExportPropertyMapper::_exportXML(
         sal_uInt16 nPropType, sal_uInt16& rPropTypeFlags,
-        SvXMLAttributeList& rAttrList,
+        comphelper::AttributeList& rAttrList,
         const ::std::vector< XMLPropertyState >& rProperties,
         const SvXMLUnitConverter& rUnitConverter,
         const SvXMLNamespaceMap& rNamespaceMap,
@@ -958,7 +957,7 @@ sal_Int8 CheckExtendedNamespace(std::u16string_view sXMLAttributeName, std::u16s
 }
 
 void SvXMLExportPropertyMapper::_exportXML(
-        SvXMLAttributeList& rAttrList,
+        comphelper::AttributeList& rAttrList,
         const XMLPropertyState& rProperty,
         const SvXMLUnitConverter& rUnitConverter,
         const SvXMLNamespaceMap& rNamespaceMap,
diff --git a/xmloff/source/table/XMLTableExport.cxx b/xmloff/source/table/XMLTableExport.cxx
index 0b8fd95aadda..3bc2adba5cee 100644
--- a/xmloff/source/table/XMLTableExport.cxx
+++ b/xmloff/source/table/XMLTableExport.cxx
@@ -163,7 +163,7 @@ public:
     using SvXMLExportPropertyMapper::SvXMLExportPropertyMapper;
     /** this method is called for every item that has the
     MID_FLAG_SPECIAL_ITEM_EXPORT flag set */
-    virtual void handleSpecialItem(SvXMLAttributeList&, const XMLPropertyState&, const SvXMLUnitConverter&,
+    virtual void handleSpecialItem(comphelper::AttributeList&, const XMLPropertyState&, const SvXMLUnitConverter&,
         const SvXMLNamespaceMap&, const std::vector<XMLPropertyState>*, sal_uInt32) const override
     {
         // the SpecialItem NumberFormat must not be handled by this method
diff --git a/xmloff/source/text/XMLTextFrameContext.cxx b/xmloff/source/text/XMLTextFrameContext.cxx
index ad7ca31254bc..ad0754acfca2 100644
--- a/xmloff/source/text/XMLTextFrameContext.cxx
+++ b/xmloff/source/text/XMLTextFrameContext.cxx
@@ -55,7 +55,6 @@
 #include <xmloff/XMLEventsImportContext.hxx>
 #include <XMLImageMapContext.hxx>
 #include "XMLTextFrameContext.hxx"
-#include <xmloff/attrlist.hxx>
 #include <basegfx/polygon/b2dpolygon.hxx>
 #include <basegfx/polygon/b2dpolygontools.hxx>
 #include <basegfx/polygon/b2dpolypolygon.hxx>
diff --git a/xmloff/source/text/txtexppr.cxx b/xmloff/source/text/txtexppr.cxx
index 8d73fe303304..a5e0d94b74cd 100644
--- a/xmloff/source/text/txtexppr.cxx
+++ b/xmloff/source/text/txtexppr.cxx
@@ -143,7 +143,7 @@ void XMLTextExportPropertySetMapper::handleElementItem(
 }
 
 void XMLTextExportPropertySetMapper::handleSpecialItem(
-        SvXMLAttributeList& rAttrList,
+        comphelper::AttributeList& rAttrList,
         const XMLPropertyState& rProperty,
         const SvXMLUnitConverter& rUnitConverter,
         const SvXMLNamespaceMap& rNamespaceMap,
diff --git a/xmloff/source/text/txtexppr.hxx b/xmloff/source/text/txtexppr.hxx
index bb7e3c230a2c..878ca9a9389d 100644
--- a/xmloff/source/text/txtexppr.hxx
+++ b/xmloff/source/text/txtexppr.hxx
@@ -78,7 +78,7 @@ public:
         sal_uInt32 nIdx ) const override;
 
     virtual void handleSpecialItem(
-        SvXMLAttributeList& rAttrList,
+        comphelper::AttributeList& rAttrList,
         const XMLPropertyState& rProperty,
         const SvXMLUnitConverter& rUnitConverter,
         const SvXMLNamespaceMap& rNamespaceMap,
diff --git a/xmloff/source/transform/MutableAttrList.cxx b/xmloff/source/transform/MutableAttrList.cxx
index 65da52e91f9d..6798721b4cdc 100644
--- a/xmloff/source/transform/MutableAttrList.cxx
+++ b/xmloff/source/transform/MutableAttrList.cxx
@@ -17,7 +17,9 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-#include <xmloff/attrlist.hxx>
+#include <sal/config.h>
+
+#include <comphelper/attributelist.hxx>
 #include <comphelper/servicehelper.hxx>
 #include "MutableAttrList.hxx"
 
@@ -26,11 +28,11 @@ using namespace ::com::sun::star::uno;
 using namespace ::com::sun::star::lang;
 using namespace ::com::sun::star::util;
 
-SvXMLAttributeList *XMLMutableAttributeList::GetMutableAttrList()
+comphelper::AttributeList* XMLMutableAttributeList::GetMutableAttrList()
 {
     if( !m_pMutableAttrList )
     {
-        m_pMutableAttrList = new SvXMLAttributeList( m_xAttrList );
+        m_pMutableAttrList = new comphelper::AttributeList( m_xAttrList );
         m_xAttrList = m_pMutableAttrList;
     }
 
@@ -38,14 +40,14 @@ SvXMLAttributeList *XMLMutableAttributeList::GetMutableAttrList()
 }
 
 XMLMutableAttributeList::XMLMutableAttributeList() :
-    m_pMutableAttrList( new SvXMLAttributeList )
+    m_pMutableAttrList( new comphelper::AttributeList )
 {
     m_xAttrList = m_pMutableAttrList;
 }
 
 XMLMutableAttributeList::XMLMutableAttributeList( const Reference<
         XAttributeList> & rAttrList, bool bClone ) :
-    m_xAttrList( rAttrList.is() ? rAttrList : new SvXMLAttributeList )
+    m_xAttrList( rAttrList.is() ? rAttrList : new comphelper::AttributeList )
 {
     if( bClone )
         GetMutableAttrList();
@@ -95,7 +97,7 @@ OUString SAL_CALL XMLMutableAttributeList::getValueByName(
 Reference< XCloneable > XMLMutableAttributeList::createClone()
 {
     // A cloned list will be a read only list!
-    Reference< XCloneable >  r = new SvXMLAttributeList( m_xAttrList );
+    Reference< XCloneable >  r = new comphelper::AttributeList( m_xAttrList );
     return r;
 }
 
diff --git a/xmloff/source/transform/MutableAttrList.hxx b/xmloff/source/transform/MutableAttrList.hxx
index d3405a3fe96a..79bf36bf9603 100644
--- a/xmloff/source/transform/MutableAttrList.hxx
+++ b/xmloff/source/transform/MutableAttrList.hxx
@@ -25,7 +25,7 @@
 #include <cppuhelper/implbase.hxx>
 #include <rtl/ref.hxx>
 
-class SvXMLAttributeList;
+namespace comphelper { class AttributeList; }
 
 class XMLMutableAttributeList : public ::cppu::WeakImplHelper<
         css::xml::sax::XAttributeList,
@@ -33,9 +33,9 @@ class XMLMutableAttributeList : public ::cppu::WeakImplHelper<
 {
     css::uno::Reference< css::xml::sax::XAttributeList> m_xAttrList;
 
-    rtl::Reference<SvXMLAttributeList> m_pMutableAttrList;
+    rtl::Reference<comphelper::AttributeList> m_pMutableAttrList;
 
-    SvXMLAttributeList *GetMutableAttrList();
+    comphelper::AttributeList *GetMutableAttrList();
 
 public:
     XMLMutableAttributeList();
diff --git a/xmloff/source/xforms/xformsexport.cxx b/xmloff/source/xforms/xformsexport.cxx
index 75f6bc51027e..e88ac4b6e21a 100644
--- a/xmloff/source/xforms/xformsexport.cxx
+++ b/xmloff/source/xforms/xformsexport.cxx
@@ -347,7 +347,7 @@ void exportXFormsBinding( SvXMLExport& rExport,
                 rMap.GetNameByKey( nKey ) != sURI )
             {
                 // add declaration if it doesn't already exist
-                SvXMLAttributeList& rAttrList = rExport.GetAttrList();
+                comphelper::AttributeList& rAttrList = rExport.GetAttrList();
                 OUString sName = "xmlns:" + rPrefix;
                 sal_Int16 nFound = rAttrList.GetIndexByName(sName);
                 // duplicate xmlns:script, http://openoffice.org/2000/script seen