diff options
Diffstat (limited to 'linguistic/source')
-rw-r--r-- | linguistic/source/dicimp.cxx | 5 | ||||
-rw-r--r-- | linguistic/source/dlistimp.cxx | 5 | ||||
-rw-r--r-- | linguistic/source/misc.cxx | 4 |
3 files changed, 3 insertions, 11 deletions
diff --git a/linguistic/source/dicimp.cxx b/linguistic/source/dicimp.cxx index 4eac9e2a958f..266ab5a9f7a8 100644 --- a/linguistic/source/dicimp.cxx +++ b/linguistic/source/dicimp.cxx @@ -130,10 +130,7 @@ sal_Int16 ReadDicVersion( SvStreamPtr &rpStream, sal_uInt16 &nLng, bool &bNeg ) // type: negative / positive if (getTag(aLine, "type: ", aTagValue)) { - if (aTagValue == "negative") - bNeg = true; - else - bNeg = false; + bNeg = aTagValue == "negative"; } if (aLine.indexOf("---") != -1) // end of header diff --git a/linguistic/source/dlistimp.cxx b/linguistic/source/dlistimp.cxx index 05b6c81ee741..64bd279a95aa 100644 --- a/linguistic/source/dlistimp.cxx +++ b/linguistic/source/dlistimp.cxx @@ -834,10 +834,7 @@ static bool IsVers2OrNewer( const OUString& rFileURL, sal_uInt16& nLng, bool& bN SvStreamPtr pStream = SvStreamPtr( utl::UcbStreamHelper::CreateStream( xStream ) ); int nDicVersion = ReadDicVersion(pStream, nLng, bNeg); - if (2 == nDicVersion || nDicVersion >= 5) - return true; - - return false; + return 2 == nDicVersion || nDicVersion >= 5; } diff --git a/linguistic/source/misc.cxx b/linguistic/source/misc.cxx index 86dfb831ab2d..f2c9e901e3aa 100644 --- a/linguistic/source/misc.cxx +++ b/linguistic/source/misc.cxx @@ -110,9 +110,7 @@ bool LinguIsUnspecified( const OUString & rBcp47 ) { if (rBcp47.getLength() != 3) return false; - if (rBcp47 == "zxx" || rBcp47 == "und" || rBcp47 == "mul") - return true; - return false; + return rBcp47 == "zxx" || rBcp47 == "und" || rBcp47 == "mul"; } static inline sal_Int32 Minimum( sal_Int32 n1, sal_Int32 n2, sal_Int32 n3 ) |