[Libreoffice-commits] core.git: include/unotools

Stephan Bergmann sbergman at redhat.com
Mon Feb 22 11:55:28 UTC 2016


 include/unotools/textsearch.hxx |    4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

New commits:
commit b9c71ed6de669f9d8091b4d56745a3f26f65812c
Author: Stephan Bergmann <sbergman at redhat.com>
Date:   Mon Feb 22 12:55:00 2016 +0100

    Avoid -fsanitize=enum when using ScDocOptions::eSearchTypeUnknown
    
    Change-Id: I0ee0c2081b6babb8815d5ba00c5c551854c6a6e9

diff --git a/include/unotools/textsearch.hxx b/include/unotools/textsearch.hxx
index 07d2527..1847aab 100644
--- a/include/unotools/textsearch.hxx
+++ b/include/unotools/textsearch.hxx
@@ -47,7 +47,9 @@ namespace utl
 class UNOTOOLS_DLLPUBLIC SearchParam
 {
 public:
-    enum SearchType{ SRCH_NORMAL, SRCH_REGEXP, SRCH_LEVDIST, SRCH_WILDCARD };
+    enum SearchType: int { SRCH_NORMAL, SRCH_REGEXP, SRCH_LEVDIST, SRCH_WILDCARD };
+        // fix underlying type (as int, arbitrarily), so that
+        // ScDocOptions::eSearchTypeUnknown = -1 does not cause -fsanitize=enum
 
     /** Convert configuration and document boolean settings to SearchType.
         If bWildcard is true it takes precedence over rbRegExp.


More information about the Libreoffice-commits mailing list