[Libreoffice-commits] core.git: i18nlangtag/source

Eike Rathke erack at redhat.com
Tue Apr 15 15:34:06 PDT 2014


 i18nlangtag/source/languagetag/languagetag.cxx |   10 ++++++++--
 1 file changed, 8 insertions(+), 2 deletions(-)

New commits:
commit e51ca506076a566bdd587f35cc0a8c58a50cdc2c
Author: Eike Rathke <erack at redhat.com>
Date:   Wed Apr 16 00:32:33 2014 +0200

    CID#1202769 comfort coverity
    
    Change-Id: I84214dde71883065f1ca3737180f0d739b49d8ee

diff --git a/i18nlangtag/source/languagetag/languagetag.cxx b/i18nlangtag/source/languagetag/languagetag.cxx
index 6541c90..3ae1f43 100644
--- a/i18nlangtag/source/languagetag/languagetag.cxx
+++ b/i18nlangtag/source/languagetag/languagetag.cxx
@@ -1976,10 +1976,16 @@ bool LanguageTagImpl::isIsoODF() const
     {
         const_cast<LanguageTagImpl*>(this)->synCanonicalize();
         if (!LanguageTag::isIsoScript( getScript()))
-            return ((meIsIsoODF = DECISION_NO) == DECISION_YES);
+        {
+            meIsIsoODF = DECISION_NO;
+            return false;
+        }
         // The usual case is lll-CC so simply check that first.
         if (isIsoLocale())
-            return ((meIsIsoODF = DECISION_YES) == DECISION_YES);
+        {
+            meIsIsoODF = DECISION_YES;
+            return true;
+        }
         // If this is not ISO locale for which script must not exist it can
         // still be ISO locale plus ISO script lll-Ssss-CC, but not ll-vvvv ...
         // ll-vvvvvvvv


More information about the Libreoffice-commits mailing list