[Libreoffice-commits] core.git: Branch 'libreoffice-5-0' - xmloff/source

[Michael Stahl]

 xmloff/source/core/xmlexp.cxx |   29 ++++++++++++++---------------
 1 file changed, 14 insertions(+), 15 deletions(-)

New commits:
commit 32a25a623347c038ec75c3c594d615419c4da7fc
Author: Michael Stahl <mstahl at redhat.com>
Date:   Tue Jan 12 23:01:34 2016 +0100

    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.
    
    (cherry picked from commit d277ac87455a599fbf4acd3c6401f09bc74d3dac)
    
    Change-Id: Ifeafad2b7af41f06356461adb7ae65dbf7bae11d
    Reviewed-on: https://gerrit.libreoffice.org/21475
    Tested-by: Jenkins <ci at libreoffice.org>
    Reviewed-by: Eike Rathke <erack at redhat.com>
    Tested-by: Eike Rathke <erack at redhat.com>

diff --git a/xmloff/source/core/xmlexp.cxx b/xmloff/source/core/xmlexp.cxx
index 72cc29f..7002fbe 100644
--- a/xmloff/source/core/xmlexp.cxx
+++ b/xmloff/source/core/xmlexp.cxx
@@ -1422,24 +1422,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 = 0;
-        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) );
     }
 
     {