tdf#120703 PVS: make ImplGet(Cleaned)FieldUnits return reference

V547 Expression 'pUnits' is always true.

Change-Id: I2bd31fcc31c36b43d14ff2a10a7143b9fbe86b3d
Reviewed-on: https://gerrit.libreoffice.org/63228
Tested-by: Jenkins
Reviewed-by: Mike Kaganski <mike.kaganski@collabora.com>

1 files changed, 9 insertions, 17 deletions

diff --git a/vcl/source/control/field.cxx b/vcl/source/control/field.cxx
index 23c6905548b6..8cf40c6e7682 100644
--- a/vcl/source/control/field.cxx
+++ b/vcl/source/control/field.cxx
@@ -999,15 +999,11 @@ static OUString ImplMetricGetUnitText(const OUString& rStr)
 
 static const OUString ImplMetricToString( FieldUnit rUnit )
 {
-    FieldUnitStringList* pList = ImplGetFieldUnits();
-    if( pList )
+    // return unit's default string (ie, the first one )
+    for (auto const& elem : ImplGetFieldUnits())
     {
-        // return unit's default string (ie, the first one )
-        for (auto const& elem : *pList)
-        {
-            if ( elem.second == rUnit )
-                return elem.first;
-        }
+        if (elem.second == rUnit)
+            return elem.first;
     }
 
     return OUString();
@@ -1015,16 +1011,12 @@ static const OUString ImplMetricToString( FieldUnit rUnit )
 
 FieldUnit MetricFormatter::StringToMetric(const OUString &rMetricString)
 {
-    FieldUnitStringList* pList = ImplGetCleanedFieldUnits();
-    if( pList )
+    // return FieldUnit
+    OUString aStr = rMetricString.toAsciiLowerCase().replaceAll(" ", "");
+    for (auto const& elem : ImplGetCleanedFieldUnits())
     {
-        // return FieldUnit
-        OUString aStr = rMetricString.toAsciiLowerCase().replaceAll(" ", "");
-        for (auto const& elem : *pList)
-        {
-            if ( elem.first == aStr )
-                return elem.second;
-        }
+        if ( elem.first == aStr )
+            return elem.second;
     }
 
     return FieldUnit::NONE;