diff options
| author | Tomoyuki Kubota <himajin100000@gmail.com> | 2020-05-17 04:31:01 +0900 |
|---|---|---|
| committer | Jan Holesovsky <kendy@collabora.com> | 2021-01-07 16:32:56 +0100 |
| commit | 4be7d7f8d1329c0cc7dc3f4eb72fda0ac12cc960 (patch) | |
| tree | 5a18fe3b5b9b0bbb705770bbab10a10cda037bf1 | |
| parent | tdf#89475 xmloff: ODF import/export: continue fixing draw:angle (diff) | |
| download | core-4be7d7f8d1329c0cc7dc3f4eb72fda0ac12cc960.tar.gz core-4be7d7f8d1329c0cc7dc3f4eb72fda0ac12cc960.zip | |
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 93c986f9f5bd..68a5a8a4aa8a 100644 --- a/include/xmloff/xmlimp.hxx +++ b/include/xmloff/xmlimp.hxx @@ -550,6 +550,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 f4e07e8b5288..b700dde5106f 100644 --- a/xmloff/source/core/xmlimp.cxx +++ b/xmloff/source/core/xmlimp.cxx @@ -194,6 +194,10 @@ public: { mnGeneratorVersion = SvXMLImport::LO_6x; } + else if ('7' == loVersion[0]) + { + mnGeneratorVersion = SvXMLImport::LO_7x; + } else { SAL_INFO("xmloff.core", "unknown LO version: " << loVersion); |