summaryrefslogtreecommitdiff
path: root/xmloff/source
diff options
context:
space:
mode:
authorMichael Stahl <mstahl@redhat.com>2016-01-12 23:01:34 +0100
committerMichael Stahl <mstahl@redhat.com>2016-01-12 23:24:57 +0100
commitd277ac87455a599fbf4acd3c6401f09bc74d3dac (patch)
treed0952006928acb7c18d54d21561bdd9321ca3e85 /xmloff/source
parent8d6c1b6981f01bbc0057234f53fd139e87a5f010 (diff)
xmloff: there is no reason why office:version should be omitted
... if a document contains foreign elements or attributes. In fact since ODF 1.2 the office:version attribute is mandatory and any document that omits it is therefore invalid, while "extended conforming" documents are allowed to contain foreign elements and attributes. This mysterious check was there since CVS initial import, but without any justification. Change-Id: Ifeafad2b7af41f06356461adb7ae65dbf7bae11d
Diffstat (limited to 'xmloff/source')
-rw-r--r--xmloff/source/core/xmlexp.cxx29
1 files changed, 14 insertions, 15 deletions
diff --git a/xmloff/source/core/xmlexp.cxx b/xmloff/source/core/xmlexp.cxx
index ff8db668221b..012190e81fb4 100644
--- a/xmloff/source/core/xmlexp.cxx
+++ b/xmloff/source/core/xmlexp.cxx
@@ -1414,24 +1414,23 @@ sal_uInt32 SvXMLExport::exportDoc( enum ::xmloff::token::XMLTokenEnum eClass )
}
// office:version = ...
- if( !mbExtended )
+ const sal_Char* pVersion = nullptr;
+ switch (getDefaultVersion())
{
- const sal_Char* pVersion = nullptr;
- switch( getDefaultVersion() )
- {
- case SvtSaveOptions::ODFVER_LATEST: pVersion = sXML_1_2; break;
- case SvtSaveOptions::ODFVER_012_EXT_COMPAT: pVersion = sXML_1_2; break;
- case SvtSaveOptions::ODFVER_012: pVersion = sXML_1_2; break;
- case SvtSaveOptions::ODFVER_011: pVersion = sXML_1_1; break;
- case SvtSaveOptions::ODFVER_010: break;
+ case SvtSaveOptions::ODFVER_LATEST: pVersion = sXML_1_2; break;
+ case SvtSaveOptions::ODFVER_012_EXT_COMPAT: pVersion = sXML_1_2; break;
+ case SvtSaveOptions::ODFVER_012: pVersion = sXML_1_2; break;
+ case SvtSaveOptions::ODFVER_011: pVersion = sXML_1_1; break;
+ case SvtSaveOptions::ODFVER_010: break;
- default:
- SAL_WARN("xmloff.core", "xmloff::SvXMLExport::exportDoc(), unexpected odf default version!");
- }
+ default:
+ SAL_WARN("xmloff.core", "xmloff::SvXMLExport::exportDoc(), unexpected odf default version!");
+ }
- if( pVersion )
- AddAttribute( XML_NAMESPACE_OFFICE, XML_VERSION,
- OUString::createFromAscii(pVersion) );
+ if (pVersion)
+ {
+ AddAttribute( XML_NAMESPACE_OFFICE, XML_VERSION,
+ OUString::createFromAscii(pVersion) );
}
{