From 920d4463f6e59b815852c173e2974ffc7b4bb284 Mon Sep 17 00:00:00 2001 From: Noel Grandin Date: Thu, 23 Jun 2016 13:13:28 +0200 Subject: loplugin:singlevalfields in vcl(part1) Change-Id: I0031199937cc95793951a070c4b3d8910933e69f Reviewed-on: https://gerrit.libreoffice.org/26595 Tested-by: Jenkins Reviewed-by: Noel Grandin --- vcl/source/filter/graphicfilter.cxx | 9 --------- 1 file changed, 9 deletions(-) (limited to 'vcl/source/filter') diff --git a/vcl/source/filter/graphicfilter.cxx b/vcl/source/filter/graphicfilter.cxx index 36c05eb10fac..38e72dc5e837 100644 --- a/vcl/source/filter/graphicfilter.cxx +++ b/vcl/source/filter/graphicfilter.cxx @@ -1163,7 +1163,6 @@ void GraphicFilter::ImplInit() } pErrorEx = new FilterErrorEx; - bAbort = false; } sal_uLong GraphicFilter::ImplSetError( sal_uLong nError, const SvStream* pStm ) @@ -1392,7 +1391,6 @@ sal_uInt16 GraphicFilter::ImportGraphic( Graphic& rGraphic, const OUString& rPat else nStreamBegin = rIStream.Tell(); - bAbort = false; nStatus = ImpTestOrFindFormat( rPath, rIStream, nFormat ); // if pending, return GRFILTER_OK in order to request more bytes if( rIStream.GetError() == ERRCODE_IO_PENDING ) @@ -1786,9 +1784,6 @@ sal_uInt16 GraphicFilter::ImportGraphic( Graphic& rGraphic, const OUString& rPat // Set error code or try to set native buffer if( nStatus != GRFILTER_OK ) { - if( bAbort ) - nStatus = GRFILTER_ABORT; - ImplSetError( nStatus, &rIStream ); rIStream.Seek( nStreamBegin ); rGraphic.Clear(); @@ -1880,7 +1875,6 @@ sal_uInt16 GraphicFilter::ExportGraphic( const Graphic& rGraphic, const OUString #ifndef DISABLE_DYNLOADING OUString aExternalFilterName(pConfig->GetExternalFilterName(nFormat, true)); #endif - bAbort = false; sal_uInt16 nStatus = GRFILTER_OK; GraphicType eType; Graphic aGraphic( rGraphic ); @@ -2150,9 +2144,6 @@ sal_uInt16 GraphicFilter::ExportGraphic( const Graphic& rGraphic, const OUString } if( nStatus != GRFILTER_OK ) { - if( bAbort ) - nStatus = GRFILTER_ABORT; - ImplSetError( nStatus, &rOStm ); } return nStatus; -- cgit v1.2.3