[Libreoffice-commits] core.git: Branch 'distro/collabora/cp-6.4' - include/unotools

[Michael Stahl (via logerrit)]

 include/unotools/saveopt.hxx |    4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

New commits:
commit fa87499193bddd2bc8728532f62b1e2a91052a44
Author:     Michael Stahl <Michael.Stahl at cib.de>
AuthorDate: Wed Apr 22 20:18:09 2020 +0200
Commit:     Miklos Vajna <vmiklos at collabora.com>
CommitDate: Mon Dec 21 18:41:44 2020 +0100

    ODF export: fix wrong definition of ODFSVER_LATEST_EXTENDED
    
    The only real use of ODFSVER_LATEST_EXTENDED is as translated value of
    the default ODFVER_LATEST; it must match ODFSVER_012_EXTENDED
    which is larger than ODFSVER_LATEST | ODFSVER_EXTENDED because
    it *is* used in comparisons as the return value of
    GetODFSaneDefaultVersion().
    (Guess the comment means not to use it as literal in comparisons.)
    
    Change-Id: I6ac5e012f314e86acdcb7ac7d615c747cd7b8a52
    Reviewed-on: https://gerrit.libreoffice.org/c/core/+/92726
    Tested-by: Jenkins
    Reviewed-by: Eike Rathke <erack at redhat.com>
    (cherry picked from commit 9608f72347a8ec99f454802cc3cabc6e32d92370)
    Reviewed-on: https://gerrit.libreoffice.org/c/core/+/108106
    Tested-by: Jenkins CollaboraOffice <jenkinscollaboraoffice at gmail.com>
    Reviewed-by: Miklos Vajna <vmiklos at collabora.com>

diff --git a/include/unotools/saveopt.hxx b/include/unotools/saveopt.hxx
index 7c4d3adc0dc8..d97cd505aaf1 100644
--- a/include/unotools/saveopt.hxx
+++ b/include/unotools/saveopt.hxx
@@ -81,8 +81,8 @@ public:
         ODFSVER_013_EXTENDED = 13,  ///< ODF 1.3 extended
 
         // The latest defined standard. Adapt when a new one is published.
-        ODFSVER_LATEST = ODFSVER_012,                               ///< @internal DO NOT USE in comparisons
-        ODFSVER_LATEST_EXTENDED = ODFSVER_LATEST | ODFSVER_EXTENDED ///< @internal DO NOT USE in comparisons
+        ODFSVER_LATEST = ODFSVER_012,                   ///< @internal DO NOT USE in comparisons
+        ODFSVER_LATEST_EXTENDED = ODFSVER_012_EXTENDED  ///< @internal DO NOT USE in comparisons
     };
 
     SvtSaveOptions();