diff options
| author | Michael Stahl <Michael.Stahl@cib.de> | 2020-02-03 17:21:37 +0100 |
|---|---|---|
| committer | Michael Stahl <michael.stahl@cib.de> | 2020-02-04 16:15:42 +0100 |
| commit | d571a509aa324db9a425110a67ea142d157256b2 (patch) | |
| tree | 394123ae47a835dddd081c25a68c3aa150f9d8a3 /include | |
| parent | a2f85c062aafb3fd9dfb1c6c6e87e1e73e7545a3 (diff) | |
deb#949754: unotools,officecfg: don't ODF export using ODFVER_UNKNOWN
The problem was that commit ef39938dea14666a5835b6ae85091c1010f8ae8d
temporarily added ODF 1.3 version strings to the optsavepage.ui,
just to get translations for them; unfortunately the dialog itself
was not adapted to the new values, so when you select them the
result is 0, or ODFVER_UNKNOWN... fortunately this was reverted
before 6.4.0.3.
The value ODFVER_UNKNOWN is very dubious and without an obvious purpose;
http://specs.openoffice.org/appwide/odf/odf_1-2_migration.odt
mentions it but provides no details.
Hence let's interpret it the same as ODFVER_LATEST for export purposes.
Also add the value ODFVER_012_EXT_COMPAT to the configuration, because
this is actually used.
Also fix a copypasta in SvtSaveOptions_Impl::IsReadOnly(), where the
wrong flag is checked for OdfDefaultVersion.
Change-Id: Ie276f0ef3cead3ffa016ba939aede74581fb0257
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/87900
Tested-by: Jenkins
Reviewed-by: Eike Rathke <erack@redhat.com>
Reviewed-by: Michael Stahl <michael.stahl@cib.de>
Diffstat (limited to 'include')
| -rw-r--r-- | include/unotools/saveopt.hxx | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/include/unotools/saveopt.hxx b/include/unotools/saveopt.hxx index 7c4d3adc0dc8..7c189534d2da 100644 --- a/include/unotools/saveopt.hxx +++ b/include/unotools/saveopt.hxx @@ -58,7 +58,7 @@ public: */ enum ODFDefaultVersion { - ODFVER_UNKNOWN = 0, // unknown + ODFVER_UNKNOWN = 0, // unknown - very dubious, avoid using ODFVER_010 = 1, // ODF 1.0 ODFVER_011 = 2, // ODF 1.1 DO_NOT_USE = 3, // Do not use this, only here for compatibility with pre OOo 3.2 configuration |