diff options
| author | Tomoyuki Kubota <himajin100000@gmail.com> | 2020-05-17 04:31:01 +0900 |
|---|---|---|
| committer | Michael Stahl <michael.stahl@cib.de> | 2020-05-19 17:03:57 +0200 |
| commit | 96db6fb300473fc7ba2af22770f0a7bd7c4f780b (patch) | |
| tree | a462027e94899aff2a3420e82735c6a7823404d0 | |
| parent | d6ba23a7c0fbd4b59b8011012bbcaa002c5c84ca (diff) | |
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@cib.de>
| -rw-r--r-- | include/xmloff/xmlimp.hxx | 1 | ||||
| -rw-r--r-- | xmloff/source/core/xmlimp.cxx | 4 |
2 files changed, 5 insertions, 0 deletions
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); |