diff options
| author | Michael Stahl <mstahl@redhat.com> | 2015-06-01 16:24:23 +0200 |
|---|---|---|
| committer | Andras Timar <andras.timar@collabora.com> | 2015-08-06 12:21:37 +0200 |
| commit | 1c740e838d54ed97846b723cced07ca234311b29 (patch) | |
| tree | 8df195929086937b8e5d97da614c6f40bc2deee6 /xmloff | |
| parent | 398909b2c8e2efe1d42b6da1be0727b654e4b51c (diff) | |
xmloff: don't add FIELD namespace twice
The first place already checks SvXMLExportFlags::CONTENT, so the second
Add is unnecessary (and for versions <= 1.2 it shouldn't be exported).
Change-Id: If2e471b50fcf21ad8977de48c433b628c5c03305
(cherry picked from commit 15cd958a8a5c0b8dbe8891e2ce47aea6c91ba914)
Diffstat (limited to 'xmloff')
| -rw-r--r-- | xmloff/source/core/xmlexp.cxx | 7 |
1 files changed, 1 insertions, 6 deletions
diff --git a/xmloff/source/core/xmlexp.cxx b/xmloff/source/core/xmlexp.cxx index d34e1fbe69c7..72cc29f77f20 100644 --- a/xmloff/source/core/xmlexp.cxx +++ b/xmloff/source/core/xmlexp.cxx @@ -336,7 +336,6 @@ void SvXMLExport::_InitCtor() mpNamespaceMap->Add( GetXMLToken(XML_NP_STYLE), GetXMLToken(XML_N_STYLE), XML_NAMESPACE_STYLE ); } - bool bAddFieldNM = false; // namespaces for documents if( getExportFlags() & (SvXMLExportFlags::STYLES|SvXMLExportFlags::AUTOSTYLES|SvXMLExportFlags::MASTERSTYLES|SvXMLExportFlags::CONTENT) ) { @@ -364,7 +363,7 @@ void SvXMLExport::_InitCtor() mpNamespaceMap->Add( GetXMLToken(XML_NP_LO_EXT), GetXMLToken(XML_N_LO_EXT), XML_NAMESPACE_LO_EXT); - bAddFieldNM = true; + mpNamespaceMap->Add( GetXMLToken(XML_NP_FIELD), GetXMLToken(XML_N_FIELD), XML_NAMESPACE_FIELD ); } } if( getExportFlags() & (SvXMLExportFlags::MASTERSTYLES|SvXMLExportFlags::CONTENT) ) @@ -383,12 +382,8 @@ void SvXMLExport::_InitCtor() mpNamespaceMap->Add( GetXMLToken(XML_NP_XSD), GetXMLToken(XML_N_XSD), XML_NAMESPACE_XSD ); mpNamespaceMap->Add( GetXMLToken(XML_NP_XSI), GetXMLToken(XML_N_XSI), XML_NAMESPACE_XSI ); mpNamespaceMap->Add( GetXMLToken(XML_NP_FORMX), GetXMLToken(XML_N_FORMX), XML_NAMESPACE_FORMX ); - bAddFieldNM = true; } - if (bAddFieldNM) - mpNamespaceMap->Add( GetXMLToken(XML_NP_FIELD), GetXMLToken(XML_N_FIELD), XML_NAMESPACE_FIELD ); - // RDFa: needed for content and header/footer styles if( getExportFlags() & (SvXMLExportFlags::STYLES|SvXMLExportFlags::AUTOSTYLES|SvXMLExportFlags::MASTERSTYLES|SvXMLExportFlags::CONTENT) ) { |