[Libreoffice-commits] core.git: include/xmloff xmloff/source

[Tomoyuki Kubota (via logerrit)]

 include/xmloff/xmlimp.hxx     |    1 +
 xmloff/source/core/xmlimp.cxx |    4 ++++
 2 files changed, 5 insertions(+)

New commits:
commit 96db6fb300473fc7ba2af22770f0a7bd7c4f780b
Author:     Tomoyuki Kubota <himajin100000 at gmail.com>
AuthorDate: Sun May 17 04:31:01 2020 +0900
Commit:     Michael Stahl <michael.stahl at cib.de>
CommitDate: Tue May 19 17:03:57 2020 +0200

    xmloff: ODF import: Silence "unknown LO version: 7000"
    
    Change-Id: I56cf3b03274cc24f66bbfc9d3615fa57521a6cd1
    Reviewed-on: https://gerrit.libreoffice.org/c/core/+/94368
    Tested-by: Jenkins
    Reviewed-by: Michael Stahl <michael.stahl at cib.de>

diff --git a/include/xmloff/xmlimp.hxx b/include/xmloff/xmlimp.hxx
index 39990af79d7a..351a05887ebd 100644
--- a/include/xmloff/xmlimp.hxx
+++ b/include/xmloff/xmlimp.hxx
@@ -558,6 +558,7 @@ public:
     /// @ATTENTION: when adding a new value more specific than "6x", grep for
     /// all current uses and adapt them!!!
     static const sal_uInt16 LO_6x = 60 | LO_flag;
+    static const sal_uInt16 LO_7x = 70 | LO_flag;
     static const sal_uInt16 ProductVersionUnknown = SAL_MAX_UINT16;
 
     /** depending on whether the generator version indicates LO, compare
diff --git a/xmloff/source/core/xmlimp.cxx b/xmloff/source/core/xmlimp.cxx
index 78c967fa72fc..36550f1f8192 100644
--- a/xmloff/source/core/xmlimp.cxx
+++ b/xmloff/source/core/xmlimp.cxx
@@ -198,6 +198,10 @@ public:
                     {
                         mnGeneratorVersion = SvXMLImport::LO_6x;
                     }
+                    else if ('7' == loVersion[0])
+                    {
+                        mnGeneratorVersion = SvXMLImport::LO_7x;
+                    }
                     else
                     {
                         SAL_INFO("xmloff.core", "unknown LO version: " << loVersion);