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 --- framework/source/xml/imagesdocumenthandler.cxx | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) (limited to 'framework/source/xml') diff --git a/framework/source/xml/imagesdocumenthandler.cxx b/framework/source/xml/imagesdocumenthandler.cxx index cbcb0eb265df..f18df438ab4e 100644 --- a/framework/source/xml/imagesdocumenthandler.cxx +++ b/framework/source/xml/imagesdocumenthandler.cxx @@ -510,8 +510,7 @@ void SAL_CALL OReadImagesDocumentHandler::endElement(const OUString& aName) { if ( m_pExternalImages && !m_aImageList.pExternalImageList ) { - if ( !m_aImageList.pExternalImageList ) - m_aImageList.pExternalImageList.reset( m_pExternalImages ); + m_aImageList.pExternalImageList.reset( m_pExternalImages ); } m_bExternalImagesStartFound = false; -- cgit