[Libreoffice-commits] core.git: vcl/source

Julien Nabet (via logerrit) logerrit at kemper.freedesktop.org
Fri May 24 21:34:30 UTC 2019


 vcl/source/gdi/print2.cxx |    4 +---
 1 file changed, 1 insertion(+), 3 deletions(-)

New commits:
commit 7f3d3e74fdcffb55da7fd7f55ac4c1f85d35745c
Author:     Julien Nabet <serval2412 at yahoo.fr>
AuthorDate: Fri May 24 22:36:23 2019 +0200
Commit:     Julien Nabet <serval2412 at yahoo.fr>
CommitDate: Fri May 24 23:33:14 2019 +0200

    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 <serval2412 at yahoo.fr>

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


More information about the Libreoffice-commits mailing list