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

[Libreoffice Gerrit user]

 editeng/source/uno/unoipset.cxx |    9 +++------
 1 file changed, 3 insertions(+), 6 deletions(-)

New commits:
commit b9d06c893df399e16572381d086db42be12186eb
Author:     Xisco Fauli <xiscofauli at libreoffice.org>
AuthorDate: Sat Oct 20 14:06:32 2018 +0200
Commit:     Caolán McNamara <caolanm at redhat.com>
CommitDate: Sun Oct 21 18:21:38 2018 +0200

    tdf#120703 (PVS): Recurring check.
    
    V571 This condition was already verified in line 224.
    
    Change-Id: I75a29c49c82c78d3afd1c900743b42af93817f84
    Reviewed-on: https://gerrit.libreoffice.org/62046
    Reviewed-by: Caolán McNamara <caolanm at redhat.com>
    Tested-by: Caolán McNamara <caolanm at redhat.com>

diff --git a/editeng/source/uno/unoipset.cxx b/editeng/source/uno/unoipset.cxx
index 456ac6358115..1f84b114a810 100644
--- a/editeng/source/uno/unoipset.cxx
+++ b/editeng/source/uno/unoipset.cxx
@@ -221,13 +221,10 @@ uno::Any SvxItemPropertySet::getPropertyValue( const SfxItemPropertySimpleEntry*
         }
     }
 
-    if( pMap->nMoreFlags & PropertyMoreFlags::METRIC_ITEM )
+    // check for needed metric translation
+    if(pMap->nMoreFlags & PropertyMoreFlags::METRIC_ITEM && eMapUnit != MapUnit::Map100thMM)
     {
-        // check for needed metric translation
-        if(pMap->nMoreFlags & PropertyMoreFlags::METRIC_ITEM && eMapUnit != MapUnit::Map100thMM)
-        {
-            SvxUnoConvertToMM( eMapUnit, aVal );
-        }
+        SvxUnoConvertToMM( eMapUnit, aVal );
     }
 
     if ( pMap->aType.getTypeClass() == uno::TypeClass_ENUM &&