From de07f40030bbd604bc42d58f0e954cca284a2646 Mon Sep 17 00:00:00 2001 From: Jochen Nitschke Date: Sat, 21 Apr 2018 07:50:54 +0200 Subject: cppcheck: identicalInnerCondition renamed temporary list in EnhancedCustomShape2d.cxx to avoid shadow of a local variable Change-Id: I17a2261dafd2067480fcc5314af4f48765d6b690 Reviewed-on: https://gerrit.libreoffice.org/53244 Tested-by: Jenkins Reviewed-by: Jochen Nitschke --- sw/source/core/text/itrform2.cxx | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) (limited to 'sw/source/core/text/itrform2.cxx') diff --git a/sw/source/core/text/itrform2.cxx b/sw/source/core/text/itrform2.cxx index 3e32430d1c36..92091f901bd8 100755 --- a/sw/source/core/text/itrform2.cxx +++ b/sw/source/core/text/itrform2.cxx @@ -486,10 +486,9 @@ void SwTextFormatter::BuildPortions( SwTextFormatInfo &rInf ) else if ( bHasGrid && pGrid->IsSnapToChars() && ! pGridKernPortion && ! pMulti && ! pPor->InTabGrp() ) { // insert a grid kerning portion - if ( ! pGridKernPortion ) - pGridKernPortion = pPor->IsKernPortion() ? - static_cast(pPor) : - new SwKernPortion( *m_pCurr ); + pGridKernPortion = pPor->IsKernPortion() ? + static_cast(pPor) : + new SwKernPortion( *m_pCurr ); // if we have a new GridKernPortion, we initially calculate // its size so that its ends on the grid -- cgit v1.2.3