From c06b120b1813a79c82aed465c8ba5cf5373c45bb Mon Sep 17 00:00:00 2001 From: Caolán McNamara Date: Wed, 6 Feb 2019 14:51:25 +0000 Subject: nNumElemVert is already known to be >= 4 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit cause the outer if is... if ( pAny && ( *pAny >>= seqCoordinates ) && ( seqCoordinates.getLength() >= 4 ) ) { ... nNumElemVert = seqCoordinates.getLength(); } so this check is always true Change-Id: I512b9440969775224c04d8566401b63f819711aa Reviewed-on: https://gerrit.libreoffice.org/67464 Tested-by: Jenkins Reviewed-by: Caolán McNamara Tested-by: Caolán McNamara --- filter/source/msfilter/msdffimp.cxx | 9 ++++----- 1 file changed, 4 insertions(+), 5 deletions(-) (limited to 'filter') diff --git a/filter/source/msfilter/msdffimp.cxx b/filter/source/msfilter/msdffimp.cxx index 2a934272186a..45c8836f9d10 100644 --- a/filter/source/msfilter/msdffimp.cxx +++ b/filter/source/msfilter/msdffimp.cxx @@ -4541,11 +4541,10 @@ SdrObject* SvxMSDffManager::ImportShape( const DffRecordHeader& rHd, SvStream& r aXP[ static_cast(nPtNum) ] = aP; } aPolyBoundRect = aXP.GetBoundRect(); - if ( nNumElemVert >= 3 ) - { // arc first command is always wr -- clockwise arc - // the parameters are : (left,top),(right,bottom),start(x,y),end(x,y) - aStartPt = aXP[2]; - } + + // arc first command is always wr -- clockwise arc + // the parameters are : (left,top),(right,bottom),start(x,y),end(x,y) + aStartPt = aXP[2]; } else aPolyBoundRect = tools::Rectangle( -21600, 0, 21600, 43200 ); // defaulting -- cgit