writerfilter/source/dmapper/DomainMapper.cxx | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
New commits:
commit 709d75853105e4fd7e5981a37a6dd95e7b9620ee
Author: Mike Kaganski <mike.kagan...@collabora.com>
AuthorDate: Sat Nov 3 18:57:23 2018 +0300
Commit: Mike Kaganski <mike.kagan...@collabora.com>
CommitDate: Sat Nov 3 17:56:04 2018 +0100
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.kagan...@collabora.com>
diff --git a/writerfilter/source/dmapper/DomainMapper.cxx
b/writerfilter/source/dmapper/DomainMapper.cxx
index d88785b3196a..fce5cfe28b49 100644
--- a/writerfilter/source/dmapper/DomainMapper.cxx
+++ b/writerfilter/source/dmapper/DomainMapper.cxx
@@ -1555,7 +1555,7 @@ void DomainMapper::sprmWithProps( Sprm& rSprm, const
PropertyMapPtr& rContext )
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 @@ void DomainMapper::sprmWithProps( Sprm& rSprm, const
PropertyMapPtr& rContext )
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;
}
_______________________________________________
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
