diff options
| author | Noel Grandin <noel.grandin@collabora.co.uk> | 2020-09-07 15:27:11 +0200 |
|---|---|---|
| committer | Noel Grandin <noel.grandin@collabora.co.uk> | 2020-09-07 22:15:23 +0200 |
| commit | db37d8b625807103c95326286ff085f79bf3d971 (patch) | |
| tree | 39583bae951c3de9e5e875a4b9c3931ef151dc00 /framework | |
| parent | 4461d49c6cfce22c2c96185b0a1d07bfe9709268 (diff) | |
loplugin:singlevalfields
Change-Id: Ib3c8dc4e98ca46026ec9a8171bae4066bcec7b22
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/102176
Tested-by: Jenkins
Reviewed-by: Noel Grandin <noel.grandin@collabora.co.uk>
Diffstat (limited to 'framework')
| -rw-r--r-- | framework/inc/xml/saxnamespacefilter.hxx | 4 | ||||
| -rw-r--r-- | framework/source/fwe/xml/saxnamespacefilter.cxx | 8 |
2 files changed, 3 insertions, 9 deletions
diff --git a/framework/inc/xml/saxnamespacefilter.hxx b/framework/inc/xml/saxnamespacefilter.hxx index 1ed4c34dd44f..157b20eb7a3c 100644 --- a/framework/inc/xml/saxnamespacefilter.hxx +++ b/framework/inc/xml/saxnamespacefilter.hxx @@ -70,10 +70,6 @@ class SaxNamespaceFilter final : public SaxNamespaceFilter_Base css::uno::Reference< css::xml::sax::XLocator > m_xLocator; css::uno::Reference< css::xml::sax::XDocumentHandler> xDocumentHandler; NamespaceStack m_aNamespaceStack; - - OUString m_aXMLAttributeNamespace; - OUString m_aXMLAttributeType; - }; } diff --git a/framework/source/fwe/xml/saxnamespacefilter.cxx b/framework/source/fwe/xml/saxnamespacefilter.cxx index bf464c663cac..6649ed21b98d 100644 --- a/framework/source/fwe/xml/saxnamespacefilter.cxx +++ b/framework/source/fwe/xml/saxnamespacefilter.cxx @@ -36,9 +36,7 @@ using namespace ::com::sun::star::uno; namespace framework{ SaxNamespaceFilter::SaxNamespaceFilter( Reference< XDocumentHandler > const & rSax1DocumentHandler ) : - xDocumentHandler( rSax1DocumentHandler ), - m_aXMLAttributeNamespace( "xmlns" ), - m_aXMLAttributeType( "CDATA" ) + xDocumentHandler( rSax1DocumentHandler ) { } @@ -70,7 +68,7 @@ void SAL_CALL SaxNamespaceFilter::startElement( for ( sal_Int16 i=0; i< xAttribs->getLength(); i++ ) { OUString aName = xAttribs->getNameByIndex( i ); - if ( aName.startsWith( m_aXMLAttributeNamespace ) ) + if ( aName.startsWith( "xmlns" ) ) aXMLNamespaces.addNamespace( aName, xAttribs->getValueByIndex( i )); else aAttributeIndexes.push_back( i ); @@ -88,7 +86,7 @@ void SAL_CALL SaxNamespaceFilter::startElement( OUString aAttributeName = xAttribs->getNameByIndex(attributeIndex); OUString aValue = xAttribs->getValueByIndex(attributeIndex); OUString aNamespaceAttributeName = aXMLNamespaces.applyNSToAttributeName( aAttributeName ); - pNewList->AddAttribute( aNamespaceAttributeName, m_aXMLAttributeType, aValue ); + pNewList->AddAttribute( aNamespaceAttributeName, "CDATA", aValue ); } } catch ( SAXException& e ) |