diff options
| author | Eike Rathke <erack@redhat.com> | 2016-03-15 13:34:42 +0100 |
|---|---|---|
| committer | Eike Rathke <erack@redhat.com> | 2016-03-15 13:49:12 +0100 |
| commit | 4d857425e0a149f88d3036bdb19b72c7f267efa4 (patch) | |
| tree | 9b07b79c492675ebcde63d8cfa933a334e186bf5 /unotools | |
| parent | b78fa03d34734925167112d8ceb6a8b53d6d7735 (diff) | |
define ODFSVER_LATEST at a central place
It's already enough to have to adapt the
SvtSaveOptions::GetODFSaneDefaultVersion() mapping for new
ODFDefaultVersion values, get rid of the
SvXMLExport::getSaneDefaultVersion() place.
In the hope that DO NOT USE is taken seriously..
Change-Id: I1eeae698249f68cc375b22cc4cc799107bc14e41
Diffstat (limited to 'unotools')
| -rw-r--r-- | unotools/source/config/saveopt.cxx | 6 |
1 files changed, 2 insertions, 4 deletions
diff --git a/unotools/source/config/saveopt.cxx b/unotools/source/config/saveopt.cxx index 809522f40bd4..0b4f7a752dda 100644 --- a/unotools/source/config/saveopt.cxx +++ b/unotools/source/config/saveopt.cxx @@ -1017,8 +1017,6 @@ SvtSaveOptions::ODFDefaultVersion SvtSaveOptions::GetODFDefaultVersion() const SvtSaveOptions::ODFSaneDefaultVersion SvtSaveOptions::GetODFSaneDefaultVersion() const { - const ODFSaneDefaultVersion NOW_CURRENT_LATEST = ODFSVER_012_EXTENDED; - switch (pImp->pSaveOpt->GetODFDefaultVersion()) { default: @@ -1026,7 +1024,7 @@ SvtSaveOptions::ODFSaneDefaultVersion SvtSaveOptions::GetODFSaneDefaultVersion() break; case ODFVER_UNKNOWN: case ODFVER_LATEST: - return NOW_CURRENT_LATEST; + return ODFSVER_LATEST_EXTENDED; case ODFVER_010: return ODFSVER_010; case ODFVER_011: @@ -1036,7 +1034,7 @@ SvtSaveOptions::ODFSaneDefaultVersion SvtSaveOptions::GetODFSaneDefaultVersion() case ODFVER_012_EXT_COMPAT: return ODFSVER_012_EXT_COMPAT; } - return NOW_CURRENT_LATEST; + return ODFSVER_LATEST_EXTENDED; } bool SvtSaveOptions::IsUseSHA1InODF12() const |