diff options
| author | Jochen Nitschke <j.nitschke+logerrit@ok.de> | 2018-04-21 07:50:54 +0200 |
|---|---|---|
| committer | Jochen Nitschke <j.nitschke+logerrit@ok.de> | 2018-04-21 11:02:29 +0200 |
| commit | de07f40030bbd604bc42d58f0e954cca284a2646 (patch) | |
| tree | d16090c7008b533b8af295b68701681012ba7608 /sw/source/core/text/itrform2.cxx | |
| parent | 3322661414a558d29146c40c0cd5e9db0a7b21dd (diff) | |
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 <ci@libreoffice.org>
Reviewed-by: Jochen Nitschke <j.nitschke+logerrit@ok.de>
Diffstat (limited to 'sw/source/core/text/itrform2.cxx')
| -rwxr-xr-x | sw/source/core/text/itrform2.cxx | 7 |
1 files changed, 3 insertions, 4 deletions
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<SwKernPortion*>(pPor) : - new SwKernPortion( *m_pCurr ); + pGridKernPortion = pPor->IsKernPortion() ? + static_cast<SwKernPortion*>(pPor) : + new SwKernPortion( *m_pCurr ); // if we have a new GridKernPortion, we initially calculate // its size so that its ends on the grid |