From 7f3d3e74fdcffb55da7fd7f55ac4c1f85d35745c Mon Sep 17 00:00:00 2001 From: Julien Nabet Date: Fri, 24 May 2019 22:36:23 +0200 Subject: tdf#125472: fix RemoveTransparenciesFromMetaFile(vcl/gdi) Regression from: https://cgit.freedesktop.org/libreoffice/core/commit/?id=3ff0c23b54ba4e7a534693ba25a3ffb27d1c18e1 + some slight simplification Change-Id: Ifa9d4d7d27e80217f778f3625ef4437828600dd3 Reviewed-on: https://gerrit.libreoffice.org/72922 Tested-by: Jenkins Reviewed-by: Julien Nabet --- vcl/source/gdi/print2.cxx | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) (limited to 'vcl/source') diff --git a/vcl/source/gdi/print2.cxx b/vcl/source/gdi/print2.cxx index 1ca7014778f5..2aec6add9634 100644 --- a/vcl/source/gdi/print2.cxx +++ b/vcl/source/gdi/print2.cxx @@ -917,8 +917,6 @@ bool OutputDevice::RemoveTransparenciesFromMetaFile( const GDIMetaFile& rInMtf, bTreatSpecial = true; } - ConnectedComponentsList::iterator aCurrCC; - const ConnectedComponentsList::iterator aLastCC( aCCList.end() ); bool bSomeComponentsChanged; // now, this is unfortunate: since changing anyone of @@ -934,7 +932,7 @@ bool OutputDevice::RemoveTransparenciesFromMetaFile( const GDIMetaFile& rInMtf, bSomeComponentsChanged = false; // iterate over all current members of aCCList - for( aCurrCC=aCCList.begin(); aCurrCC != aLastCC; ) + for( auto aCurrCC=aCCList.begin(); aCurrCC != aCCList.end(); ) { // first check if current element's bounds are // empty. This ensures that empty actions are not -- cgit