ODFstudio/odfstudio
2
0
Fork 0
Code Issues Packages Activity

deb#949754: unotools,officecfg: don't ODF export using ODFVER_UNKNOWN

Browse Source 
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>
This commit is contained in:
Michael Stahl
2020-02-04 16:15:42 +01:00
committed by Michael Stahl
parent a2f85c062a
commit d571a509aa
3 changed files with 10 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files
include/unotools/saveopt.hxx
+1 -1
View File
@@ -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
officecfg/registry/schema/org/openoffice/Office/Common.xcs
+5
View File
@@ -2478,6 +2478,11 @@
<desc>ODFVER_012</desc>
</info>
</enumeration>
<enumeration oor:value="8">
<info>
<desc>ODFVER_012_EXT_COMPAT</desc>
</info>
</enumeration>
<enumeration oor:value="3">
<info>
<desc>ODFVER_LATEST</desc>
unotools/source/config/saveopt.cxx
+4 -2
View File
@@ -322,7 +322,7 @@ bool SvtSaveOptions_Impl::IsReadOnly( SvtSaveOptions::EOption eOption ) const
bReadOnly = bROLoadDocPrinter;
break;
case SvtSaveOptions::EOption::OdfDefaultVersion :
bReadOnly = bROLoadDocPrinter;
bReadOnly = bROODFDefaultVersion;
break;
}
return bReadOnly;
@@ -932,7 +932,9 @@ void SvtSaveOptions::SetODFDefaultVersion( SvtSaveOptions::ODFDefaultVersion eVe
SvtSaveOptions::ODFDefaultVersion SvtSaveOptions::GetODFDefaultVersion() const
{
return pImp->pSaveOpt->GetODFDefaultVersion();
auto const nRet = pImp->pSaveOpt->GetODFDefaultVersion();
SAL_WARN_IF(nRet == ODFVER_UNKNOWN, "unotools.config", "DefaultVersion is ODFVER_UNKNOWN?");
return (nRet == ODFVER_UNKNOWN) ? ODFVER_LATEST : nRet;
}
SvtSaveOptions::ODFSaneDefaultVersion SvtSaveOptions::GetODFSaneDefaultVersion() const