diff options
| author | Michael Stahl <mstahl@redhat.com> | 2015-11-18 14:12:53 +0100 |
|---|---|---|
| committer | Miklos Vajna <vmiklos@collabora.co.uk> | 2015-11-19 15:08:08 +0000 |
| commit | 22f51321902af18ed8cc6b128cc8fa1e7470f797 (patch) | |
| tree | d473fa2f129e17fbd15b2ab34ab0e5c98b95717b | |
| parent | de7a50d627250fb9bb6c15f6b601d846566040d5 (diff) | |
xmloff: add meta:generator constants LO_43x and LO_44x
Change-Id: I1d962ad637f19b02855616edebcedbad719689c5
(cherry picked from commit ee655627ad2ba66a8160b4cbdaeb1dd52d047a1d)
Reviewed-on: https://gerrit.libreoffice.org/20053
Tested-by: Jenkins <ci@libreoffice.org>
Reviewed-by: Miklos Vajna <vmiklos@collabora.co.uk>
| -rw-r--r-- | include/xmloff/xmlimp.hxx | 6 | ||||
| -rw-r--r-- | xmloff/source/core/xmlimp.cxx | 21 |
2 files changed, 18 insertions, 9 deletions
diff --git a/include/xmloff/xmlimp.hxx b/include/xmloff/xmlimp.hxx index 2939f6e10bea..82949d318a3c 100644 --- a/include/xmloff/xmlimp.hxx +++ b/include/xmloff/xmlimp.hxx @@ -480,9 +480,11 @@ public: static const sal_uInt16 LO_3x = 30 | LO_flag; static const sal_uInt16 LO_41x = 41 | LO_flag; static const sal_uInt16 LO_42x = 42 | LO_flag; - /// @ATTENTION: when adding a new value more specific than "4x", grep for + static const sal_uInt16 LO_43x = 43 | LO_flag; + static const sal_uInt16 LO_44x = 44 | LO_flag; + /// @ATTENTION: when adding a new value more specific than "5x", grep for /// all current uses and adapt them!!! - static const sal_uInt16 LO_4x = 43 | LO_flag; + static const sal_uInt16 LO_5x = 50 | 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 339e5ddb4b34..46fdae84d368 100644 --- a/xmloff/source/core/xmlimp.cxx +++ b/xmloff/source/core/xmlimp.cxx @@ -190,24 +190,31 @@ getBuildIdsProperty(uno::Reference<beans::XPropertySet> const& xImportInfo) { mnGeneratorVersion = SvXMLImport::LO_3x; } - else + else if ('4' == loVersion[0]) { - SAL_INFO_IF('4' != loVersion[0], "xmloff.core", "unknown LO version: " << loVersion); - if ('4' == loVersion[0] && loVersion.getLength() > 1 + if (loVersion.getLength() > 1 && (loVersion[1] == '0' || loVersion[1] == '1')) { mnGeneratorVersion = SvXMLImport::LO_41x; // 4.0/4.1 } - else if ('4' == loVersion[0] - && loVersion.getLength() > 1 && loVersion[1] == '2') + else if (loVersion.getLength() > 1 && '2' == loVersion[1]) { mnGeneratorVersion = SvXMLImport::LO_42x; // 4.2 } - else + else if (loVersion.getLength() > 1 && '3' == loVersion[1]) + { + mnGeneratorVersion = SvXMLImport::LO_43x; // 4.3 + } + else if (loVersion.getLength() > 1 && '4' == loVersion[1]) { - mnGeneratorVersion = SvXMLImport::LO_4x; + mnGeneratorVersion = SvXMLImport::LO_44x; // 4.4 } } + else + { + SAL_INFO_IF('5' != loVersion[0], "xmloff.core", "unknown LO version: " << loVersion); + mnGeneratorVersion = SvXMLImport::LO_5x; + } return; // ignore buildIds } } |