diff options
| author | Mike Kaganski <mike.kaganski@collabora.com> | 2023-01-15 13:43:31 +0300 |
|---|---|---|
| committer | Mike Kaganski <mike.kaganski@collabora.com> | 2023-01-15 12:32:29 +0000 |
| commit | f2f008c52aaa88329c07f441de60d6fdfce9f0b3 (patch) | |
| tree | e5676badaa6361adcc2b5d91e9f9cdc6aa645c1c /writerperfect/source | |
| parent | 9d2355b674d103fe8a73d2db716389980bb69e55 (diff) | |
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>
Diffstat (limited to 'writerperfect/source')
| -rw-r--r-- | writerperfect/source/common/DocumentHandler.cxx | 5 | ||||
| -rw-r--r-- | writerperfect/source/writer/EPUBPackage.cxx | 4 |
2 files changed, 4 insertions, 5 deletions
diff --git a/writerperfect/source/common/DocumentHandler.cxx b/writerperfect/source/common/DocumentHandler.cxx index 6b5ffe58ad9e..bfa9bb53a5d2 100644 --- a/writerperfect/source/common/DocumentHandler.cxx +++ b/writerperfect/source/common/DocumentHandler.cxx @@ -14,8 +14,7 @@ #include <com/sun/star/uno/Reference.hxx> #include <com/sun/star/xml/sax/XDocumentHandler.hpp> #include <com/sun/star/xml/sax/XAttributeList.hpp> - -#include <xmloff/attrlist.hxx> +#include <comphelper/attributelist.hxx> #include <xmloff/xmlimp.hxx> namespace writerperfect @@ -126,7 +125,7 @@ void DocumentHandler::endDocument() { mxHandler->endDocument(); } void DocumentHandler::startElement(const char* psName, const librevenge::RVNGPropertyList& xPropList) { - rtl::Reference<SvXMLAttributeList> pAttrList = new SvXMLAttributeList(); + rtl::Reference<comphelper::AttributeList> pAttrList = new comphelper::AttributeList(); librevenge::RVNGPropertyList::Iter i(xPropList); for (i.rewind(); i.next();) { diff --git a/writerperfect/source/writer/EPUBPackage.cxx b/writerperfect/source/writer/EPUBPackage.cxx index 727a8ed7e3de..c08b60ad70ed 100644 --- a/writerperfect/source/writer/EPUBPackage.cxx +++ b/writerperfect/source/writer/EPUBPackage.cxx @@ -18,9 +18,9 @@ #include <com/sun/star/embed/XHierarchicalStorageAccess.hpp> #include <sal/log.hxx> +#include <comphelper/attributelist.hxx> #include <comphelper/storagehelper.hxx> #include <unotools/mediadescriptor.hxx> -#include <xmloff/attrlist.hxx> using namespace com::sun::star; @@ -80,7 +80,7 @@ void EPUBPackage::openElement(const char* pName, const librevenge::RVNGPropertyL { assert(mxOutputWriter.is()); - rtl::Reference<SvXMLAttributeList> pAttributeList(new SvXMLAttributeList()); + rtl::Reference<comphelper::AttributeList> pAttributeList(new comphelper::AttributeList()); librevenge::RVNGPropertyList::Iter it(rAttributes); for (it.rewind(); it.next();) |