summaryrefslogtreecommitdiff
path: root/framework
diff options
context:
space:
mode:
Diffstat (limited to 'framework')
-rw-r--r--framework/inc/xml/saxnamespacefilter.hxx4
-rw-r--r--framework/source/fwe/xml/saxnamespacefilter.cxx8
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 )