diff options
author | Pierre-André Jacquod <pjacquod@alumni.ethz.ch> | 2011-10-02 13:24:52 +0200 |
---|---|---|
committer | Pierre-André Jacquod <pjacquod@alumni.ethz.ch> | 2011-10-07 15:57:41 +0200 |
commit | 11f7014fe82493d24ef75cafa305047dd0f68812 (patch) | |
tree | f4dff9675529857f1548a6e6e4360ea0e5a94809 /editeng | |
parent | 3770392a0e142fddad40a40cfaf133d62db23a8e (diff) |
cppcheck reduce scope of var in editeng/..txtrange.cxx
Diffstat (limited to 'editeng')
-rw-r--r-- | editeng/source/misc/txtrange.cxx | 15 |
1 files changed, 6 insertions, 9 deletions
diff --git a/editeng/source/misc/txtrange.cxx b/editeng/source/misc/txtrange.cxx index 9afdb8642b81..2c6425c51579 100644 --- a/editeng/source/misc/txtrange.cxx +++ b/editeng/source/misc/txtrange.cxx @@ -416,15 +416,12 @@ void SvxBoundArgs::Calc( const PolyPolygon& rPoly ) { if( bInner ) { - long nTmpMin, nTmpMax; + long nTmpMin = nMin + 2 * nStart; + long nTmpMax = nMax - 2 * nEnd; + if( nTmpMin <= nTmpMax ) { - nTmpMin = nMin + 2 * nStart; - nTmpMax = nMax - 2 * nEnd; - if( nTmpMin <= nTmpMax ) - { - pLongArr->push_front(nTmpMax); - pLongArr->push_front(nTmpMin); - } + pLongArr->push_front(nTmpMax); + pLongArr->push_front(nTmpMin); } } else @@ -440,13 +437,13 @@ void SvxBoundArgs::Calc( const PolyPolygon& rPoly ) void SvxBoundArgs::Add() { - sal_uInt16 nLongIdx = 1; size_t nCount = aBoolArr.size(); if( nCount && ( !bInner || !pTextRanger->IsSimple() ) ) { sal_Bool bDelete = aBoolArr.front(); if( bInner ) bDelete = !bDelete; + sal_uInt16 nLongIdx = 1; for( size_t nBoolIdx = 1; nBoolIdx < nCount; ++nBoolIdx ) { if( bDelete ) |