sw/source/core/text/wrong.cxx | 4 +---
sw/source/filter/ww8/ww8par.cxx | 5 ++---
2 files changed, 3 insertions(+), 6 deletions(-)
New commits:
commit 364b59dc479091ed8f763609c67783036652a090
Author: Mike Kaganski <mike.kagan...@collabora.com>
AuthorDate: Sun Apr 28 10:23:17 2019 +0300
Commit: Mike Kaganski <mike.kagan...@collabora.com>
CommitDate: Sun Apr 28 10:15:36 2019 +0200
tdf#120703 PVS: V581 ifs with identical conditions
V581 The conditional expressions of the 'if' statements situated
alongside each other are identical.
Change-Id: I99117fa7c04a5de565833be7bdc001d97e635d61
Reviewed-on: https://gerrit.libreoffice.org/71453
Tested-by: Jenkins
Reviewed-by: Mike Kaganski <mike.kagan...@collabora.com>
diff --git a/sw/source/core/text/wrong.cxx b/sw/source/core/text/wrong.cxx
index b57bc99e72f2..6865884b34a8 100644
--- a/sw/source/core/text/wrong.cxx
+++ b/sw/source/core/text/wrong.cxx
@@ -491,9 +491,7 @@ void SwWrongList::JoinList( SwWrongList* pNext, sal_Int32
nInsertPos )
if (pNext)
{
OSL_ENSURE( GetWrongListType() == pNext->GetWrongListType(), "type
mismatch with next list" );
- }
- if( pNext )
- {
+
sal_uInt16 nCnt = Count();
pNext->Move( 0, nInsertPos );
Insert(nCnt, pNext->maList.begin(), pNext->maList.end());
diff --git a/sw/source/filter/ww8/ww8par.cxx b/sw/source/filter/ww8/ww8par.cxx
index bef9cc9cd8a3..e74e05ebb01f 100644
--- a/sw/source/filter/ww8/ww8par.cxx
+++ b/sw/source/filter/ww8/ww8par.cxx
@@ -799,10 +799,9 @@ SdrObject* SwMSDffManager::ProcessObj(SvStream& rSt,
SvxMSDffShapeInfo& rInfo = **it;
pImpRec->bReplaceByFly = rInfo.bReplaceByFly;
}
- }
- if( bIsSimpleDrawingTextBox )
- ApplyAttributes( rSt, aSet, rObjData );
+ ApplyAttributes(rSt, aSet, rObjData);
+ }
if (GetPropertyValue(DFF_Prop_FitTextToShape, 0) & 2)
{
_______________________________________________
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
