[Libreoffice-commits] core.git: Branch 'libreoffice-5-4' - drawinglayer/source

[Caolán McNamara]

 drawinglayer/source/processor2d/vclmetafileprocessor2d.cxx |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

New commits:
commit 96886d7e09fc52d7a2099bf5296d74829a97febc
Author: Caolán McNamara <caolanm at redhat.com>
Date:   Thu Sep 7 21:02:13 2017 +0100

    gerrit cherry-pick mismerge left Pop in wrong block
    
    Change-Id: I5928dc6778124006e08754f1dad51ffe1f3f7b63
    Reviewed-on: https://gerrit.libreoffice.org/42084
    Tested-by: Jenkins <ci at libreoffice.org>
    Reviewed-by: Adolfo Jayme Barrientos <fitojb at ubuntu.com>

diff --git a/drawinglayer/source/processor2d/vclmetafileprocessor2d.cxx b/drawinglayer/source/processor2d/vclmetafileprocessor2d.cxx
index 88616b2517b7..ee1f8dcf13d2 100644
--- a/drawinglayer/source/processor2d/vclmetafileprocessor2d.cxx
+++ b/drawinglayer/source/processor2d/vclmetafileprocessor2d.cxx
@@ -1728,6 +1728,7 @@ namespace drawinglayer
                         impEndSvtGraphicFill(pSvtGraphicFill);
                     }
 
+                    mpOutputDevice->Pop();
                     break;
                 }
                 case PRIMITIVE2D_ID_METAFILEPRIMITIVE2D :
@@ -1747,7 +1748,6 @@ namespace drawinglayer
                         RenderMetafilePrimitive2D(aMetafile);
                     }
 
-                    mpOutputDevice->Pop();
                     break;
                 }
                 case PRIMITIVE2D_ID_MASKPRIMITIVE2D :