diff options
| author | Stephan Bergmann <sbergman@redhat.com> | 2016-04-14 15:37:55 +0200 |
|---|---|---|
| committer | Stephan Bergmann <sbergman@redhat.com> | 2016-04-14 17:32:17 +0200 |
| commit | ac93d8475e89e9f02980999b4f8d1f2591ffcf81 (patch) | |
| tree | 164a066b667b433e54102737dbd7176cfe47fc6f /sc | |
| parent | 1e752272d9448694778a251c09137e4fbd2c83dc (diff) | |
-Werror=logical-op (GCC 6)
"logical ‘or’ of equal expressions", as RTL_TEXTENCODING_DONTKNOW is defined to
be zero
Change-Id: I1df1579734a3b9b5ecce5a072916cd57dbcd1458
Diffstat (limited to 'sc')
| -rw-r--r-- | sc/source/core/data/global.cxx | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/sc/source/core/data/global.cxx b/sc/source/core/data/global.cxx index 0e2256620ffe..e764bfe8e4c8 100644 --- a/sc/source/core/data/global.cxx +++ b/sc/source/core/data/global.cxx @@ -662,7 +662,7 @@ rtl_TextEncoding ScGlobal::GetCharsetValue( const OUString& rCharSet ) if ( CharClass::isAsciiNumeric( rCharSet ) ) { sal_Int32 nVal = rCharSet.toInt32(); - if ( !nVal || nVal == RTL_TEXTENCODING_DONTKNOW ) + if ( nVal == RTL_TEXTENCODING_DONTKNOW ) return osl_getThreadTextEncoding(); return (rtl_TextEncoding) nVal; } |