diff options
| -rw-r--r-- | include/unotools/saveopt.hxx | 2 | ||||
| -rw-r--r-- | officecfg/registry/schema/org/openoffice/Office/Common.xcs | 5 | ||||
| -rw-r--r-- | unotools/source/config/saveopt.cxx | 6 |
3 files changed, 10 insertions, 3 deletions
diff --git a/include/unotools/saveopt.hxx b/include/unotools/saveopt.hxx index ca5cfcf8b05f..2f0460e21fbc 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 diff --git a/officecfg/registry/schema/org/openoffice/Office/Common.xcs b/officecfg/registry/schema/org/openoffice/Office/Common.xcs index d52f445b1338..712feb2b5eea 100644 --- a/officecfg/registry/schema/org/openoffice/Office/Common.xcs +++ b/officecfg/registry/schema/org/openoffice/Office/Common.xcs @@ -2463,6 +2463,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> diff --git a/unotools/source/config/saveopt.cxx b/unotools/source/config/saveopt.cxx index 6c8922edf706..169001b04f68 100644 --- a/unotools/source/config/saveopt.cxx +++ b/unotools/source/config/saveopt.cxx @@ -314,7 +314,7 @@ bool SvtSaveOptions_Impl::IsReadOnly( SvtSaveOptions::EOption eOption ) const bReadOnly = bROLoadDocPrinter; break; case SvtSaveOptions::EOption::OdfDefaultVersion : - bReadOnly = bROLoadDocPrinter; + bReadOnly = bROODFDefaultVersion; break; } return bReadOnly; @@ -920,7 +920,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 |