diff options
| author | Mike Kaganski <mike.kaganski@collabora.com> | 2019-04-28 10:23:17 +0300 |
|---|---|---|
| committer | Mike Kaganski <mike.kaganski@collabora.com> | 2019-04-28 10:15:36 +0200 |
| commit | 364b59dc479091ed8f763609c67783036652a090 (patch) | |
| tree | e8673f404e2b5bf55d1f8f41b3d380fe569a0883 | |
| parent | 8e475035a77b47001ad09ca0c333d3eabe82bf27 (diff) | |
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.kaganski@collabora.com>
| -rw-r--r-- | sw/source/core/text/wrong.cxx | 4 | ||||
| -rw-r--r-- | sw/source/filter/ww8/ww8par.cxx | 5 |
2 files changed, 3 insertions, 6 deletions
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) { |