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>

3 files changed, 11 insertions, 11 deletions

diff --git a/sc/source/filter/xml/xmlexprt.cxx b/sc/source/filter/xml/xmlexprt.cxx
index e164766fa677..2e35f05367ca 100644
--- a/sc/source/filter/xml/xmlexprt.cxx
+++ b/sc/source/filter/xml/xmlexprt.cxx
@@ -3407,7 +3407,7 @@ void ScXMLExport::ExportShape(const uno::Reference < drawing::XShape >& xShape,
                                     if ( !sRanges.isEmpty() )
                                     {
                                         bIsChart = true;
-                                        rtl::Reference<SvXMLAttributeList> pAttrList = new SvXMLAttributeList();
+                                        rtl::Reference<comphelper::AttributeList> pAttrList = new comphelper::AttributeList();
                                         pAttrList->AddAttribute(
                                             GetNamespaceMap().GetQNameByKey( XML_NAMESPACE_DRAW, GetXMLToken( XML_NOTIFY_ON_UPDATE_OF_RANGES ) ), sRanges );
                                         GetShapeExport()->exportShape( xShape, SEF_DEFAULT, pPoint, pAttrList.get() );
@@ -3432,7 +3432,7 @@ void ScXMLExport::ExportShape(const uno::Reference < drawing::XShape >& xShape,
                                 bIsChart = true;
                                 uno::Sequence< OUString > aRepresentations(
                                     xReceiver->getUsedRangeRepresentations());
-                                rtl::Reference<SvXMLAttributeList> pAttrList;
+                                rtl::Reference<comphelper::AttributeList> pAttrList;
                                 try
                                 {
                                     if (aRepresentations.hasElements())
@@ -3442,7 +3442,7 @@ void ScXMLExport::ExportShape(const uno::Reference < drawing::XShape >& xShape,
                                         // load (when the chart is not yet loaded)
                                         uno::Reference< chart2::data::XRangeXMLConversion > xRangeConverter( xChartDoc->getDataProvider(), uno::UNO_QUERY );
                                         sRanges = lcl_RangeSequenceToString( aRepresentations, xRangeConverter );
-                                        pAttrList = new SvXMLAttributeList();
+                                        pAttrList = new comphelper::AttributeList();
                                         pAttrList->AddAttribute(
                                             GetNamespaceMap().GetQNameByKey( XML_NAMESPACE_DRAW, GetXMLToken(XML_NOTIFY_ON_UPDATE_OF_RANGES) ), sRanges );
                                     }
diff --git a/sc/source/filter/xml/xmlstyle.cxx b/sc/source/filter/xml/xmlstyle.cxx
index 2c4993778870..f434432c7671 100644
--- a/sc/source/filter/xml/xmlstyle.cxx
+++ b/sc/source/filter/xml/xmlstyle.cxx
@@ -511,7 +511,7 @@ void ScXMLCellExportPropertyMapper::ContextFilter(
 
 /** this method is called for every item that has the MID_FLAG_SPECIAL_ITEM_EXPORT flag set */
 void ScXMLCellExportPropertyMapper::handleSpecialItem(
-            SvXMLAttributeList& /* rAttrList */,
+            comphelper::AttributeList& /* rAttrList */,
             const XMLPropertyState& /* rProperty */,
             const SvXMLUnitConverter& /* rUnitConverter */,
             const SvXMLNamespaceMap& /* rNamespaceMap */,
@@ -575,7 +575,7 @@ ScXMLColumnExportPropertyMapper::~ScXMLColumnExportPropertyMapper()
 
 /** this method is called for every item that has the MID_FLAG_SPECIAL_ITEM_EXPORT flag set */
 void ScXMLColumnExportPropertyMapper::handleSpecialItem(
-            SvXMLAttributeList& /* rAttrList */,
+            comphelper::AttributeList& /* rAttrList */,
             const XMLPropertyState& /* rProperty */,
             const SvXMLUnitConverter& /* rUnitConverter */,
             const SvXMLNamespaceMap& /* rNamespaceMap */,
@@ -597,7 +597,7 @@ ScXMLTableExportPropertyMapper::~ScXMLTableExportPropertyMapper()
 
 /** this method is called for every item that has the MID_FLAG_SPECIAL_ITEM_EXPORT flag set */
 void ScXMLTableExportPropertyMapper::handleSpecialItem(
-            SvXMLAttributeList& /* rAttrList */,
+            comphelper::AttributeList& /* rAttrList */,
             const XMLPropertyState& /* rProperty */,
             const SvXMLUnitConverter& /* rUnitConverter */,
             const SvXMLNamespaceMap& /* rNamespaceMap */,
@@ -608,7 +608,7 @@ void ScXMLTableExportPropertyMapper::handleSpecialItem(
 }
 
 void ScXMLAutoStylePoolP::exportStyleAttributes(
-            SvXMLAttributeList& rAttrList,
+            comphelper::AttributeList& rAttrList,
             XmlStyleFamily nFamily,
             const ::std::vector< XMLPropertyState >& rProperties,
             const SvXMLExportPropertyMapper& rPropExp
diff --git a/sc/source/filter/xml/xmlstyle.hxx b/sc/source/filter/xml/xmlstyle.hxx
index 4636ff4c4cf6..ed7c569b3862 100644
--- a/sc/source/filter/xml/xmlstyle.hxx
+++ b/sc/source/filter/xml/xmlstyle.hxx
@@ -120,7 +120,7 @@ public:
 
     /** this method is called for every item that has the MID_FLAG_SPECIAL_ITEM_EXPORT flag set */
     virtual void handleSpecialItem(
-            SvXMLAttributeList& rAttrList,
+            comphelper::AttributeList& rAttrList,
             const XMLPropertyState& rProperty,
             const SvXMLUnitConverter& rUnitConverter,
             const SvXMLNamespaceMap& rNamespaceMap,
@@ -151,7 +151,7 @@ public:
 
     /** this method is called for every item that has the MID_FLAG_SPECIAL_ITEM_EXPORT flag set */
     virtual void handleSpecialItem(
-            SvXMLAttributeList& rAttrList,
+            comphelper::AttributeList& rAttrList,
             const XMLPropertyState& rProperty,
             const SvXMLUnitConverter& rUnitConverter,
             const SvXMLNamespaceMap& rNamespaceMap,
@@ -169,7 +169,7 @@ public:
 
     /** this method is called for every item that has the MID_FLAG_SPECIAL_ITEM_EXPORT flag set */
     virtual void handleSpecialItem(
-            SvXMLAttributeList& rAttrList,
+            comphelper::AttributeList& rAttrList,
             const XMLPropertyState& rProperty,
             const SvXMLUnitConverter& rUnitConverter,
             const SvXMLNamespaceMap& rNamespaceMap,
@@ -182,7 +182,7 @@ class ScXMLAutoStylePoolP : public SvXMLAutoStylePoolP
     ScXMLExport& rScXMLExport;
 
     virtual void exportStyleAttributes(
-            SvXMLAttributeList& rAttrList,
+            comphelper::AttributeList& rAttrList,
             XmlStyleFamily nFamily,
             const ::std::vector< XMLPropertyState >& rProperties,
             const SvXMLExportPropertyMapper& rPropExp,