From f2f008c52aaa88329c07f441de60d6fdfce9f0b3 Mon Sep 17 00:00:00 2001
From: Mike Kaganski <mike.kaganski@collabora.com>
Date: Sun, 15 Jan 2023 13:43:31 +0300
Subject: 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>
---
 lotuswordpro/source/filter/xfilter/xfsaxattrlist.cxx |  4 ++--
 lotuswordpro/source/filter/xfilter/xfsaxattrlist.hxx | 12 ++++++++++--
 2 files changed, 12 insertions(+), 4 deletions(-)

(limited to 'lotuswordpro')

diff --git a/lotuswordpro/source/filter/xfilter/xfsaxattrlist.cxx b/lotuswordpro/source/filter/xfilter/xfsaxattrlist.cxx
index aa175d8490ff..7c87d33404ea 100644
--- a/lotuswordpro/source/filter/xfilter/xfsaxattrlist.cxx
+++ b/lotuswordpro/source/filter/xfilter/xfsaxattrlist.cxx
@@ -58,10 +58,10 @@
  * Document object of the xml filter framework.
  ************************************************************************/
 #include "xfsaxattrlist.hxx"
-#include <xmloff/attrlist.hxx>
+#include <comphelper/attributelist.hxx>
 
 XFSaxAttrList::XFSaxAttrList()
-    : m_xSvAttrList(new SvXMLAttributeList())
+    : m_xSvAttrList(new comphelper::AttributeList())
 {
 }
 
diff --git a/lotuswordpro/source/filter/xfilter/xfsaxattrlist.hxx b/lotuswordpro/source/filter/xfilter/xfsaxattrlist.hxx
index 4a727727d353..81e820d80d1e 100644
--- a/lotuswordpro/source/filter/xfilter/xfsaxattrlist.hxx
+++ b/lotuswordpro/source/filter/xfilter/xfsaxattrlist.hxx
@@ -60,9 +60,17 @@
 #ifndef INCLUDED_LOTUSWORDPRO_SOURCE_FILTER_XFILTER_XFSAXATTRLIST_HXX
 #define INCLUDED_LOTUSWORDPRO_SOURCE_FILTER_XFILTER_XFSAXATTRLIST_HXX
 
+#include <sal/config.h>
+
+#include <com/sun/star/xml/sax/XAttributeList.hpp>
+
 #include <xfilter/ixfattrlist.hxx>
 #include <rtl/ref.hxx>
-#include <xmloff/attrlist.hxx>
+
+namespace comphelper
+{
+class AttributeList;
+}
 
 class XFSaxAttrList : public IXFAttrList
 {
@@ -82,7 +90,7 @@ public:
     friend class XFSaxStream;
 
 private:
-    rtl::Reference<SvXMLAttributeList> m_xSvAttrList;
+    rtl::Reference<comphelper::AttributeList> m_xSvAttrList;
 };
 
 #endif //XFSAXATTRLIST_INC
-- 
cgit