commit 709d75853105e4fd7e5981a37a6dd95e7b9620ee
author Mike Kaganski <mike.kaganski@collabora.com> Sat Nov 03 18:57:23 2018 +0300
committer Mike Kaganski <mike.kaganski@collabora.com> Sat Nov 03 17:56:04 2018 +0100
tree 7dc9ceb558fd9742e4dd6cbdfde3c8a7ac665fb4
parent 4284f618557992fdf12574f8fd014be76ec9fffc

tdf#120703 PVS: V547 Expression is always false

This resulted from commit 009e3f4841378f13a2764a2c84e147e401b70525
which failed to replace some of numeric sprm ids with mnemonic names.

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

writerfilter/source/dmapper/DomainMapper.cxx

diff --git a/writerfilter/source/dmapper/DomainMapper.cxx b/writerfilter/source/dmapper/DomainMapper.cxx
index d88785b..fce5cfe 100644
--- a/writerfilter/source/dmapper/DomainMapper.cxx
+++ b/writerfilter/source/dmapper/DomainMapper.cxx
@@ -1555,7 +1555,7 @@
                    uno::Any aStyleVal = m_pImpl->GetPropertyFromStyleSheet(ePropertyId);
                    if( !aStyleVal.hasValue() )
                    {
                        nIntValue = 0x83a == nSprmId ?
                        nIntValue = NS_ooxml::LN_EG_RPrBase_smallCaps == nSprmId ?
                            4 : 1;
                    }
                    else if(aStyleVal.getValueTypeClass() == uno::TypeClass_FLOAT )
@@ -1568,7 +1568,7 @@
                    else if((aStyleVal >>= nStyleValue) ||
                            (nStyleValue = static_cast<sal_Int16>(comphelper::getEnumAsINT32(aStyleVal))) >= 0 )
                    {
                        nIntValue = 0x83a == nSprmId ?
                        nIntValue = NS_ooxml::LN_EG_RPrBase_smallCaps == nSprmId ?
                            nStyleValue ? 0 : 4 :
                            nStyleValue ? 0 : 1;
                    }