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

[Caolán McNamara (via logerrit)]

 drawinglayer/source/processor2d/vclmetafileprocessor2d.cxx |    5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

New commits:
commit 10a6583fa96843457ae7aec21a9847a4cb62b16a
Author:     Caolán McNamara <caolanm at redhat.com>
AuthorDate: Mon Sep 7 15:05:16 2020 +0100
Commit:     Caolán McNamara <caolanm at redhat.com>
CommitDate: Mon Sep 7 17:27:50 2020 +0200

    fix warning of OutputDevice::Push calls != OutputDevice::Pop calls
    
    Change-Id: I8f6a3756d48b1727f9ac64c2e162be148e1c61d7
    Reviewed-on: https://gerrit.libreoffice.org/c/core/+/102183
    Tested-by: Jenkins
    Reviewed-by: Caolán McNamara <caolanm at redhat.com>

diff --git a/drawinglayer/source/processor2d/vclmetafileprocessor2d.cxx b/drawinglayer/source/processor2d/vclmetafileprocessor2d.cxx
index 1498ddae3158..0d7335b76aac 100644
--- a/drawinglayer/source/processor2d/vclmetafileprocessor2d.cxx
+++ b/drawinglayer/source/processor2d/vclmetafileprocessor2d.cxx
@@ -2413,8 +2413,11 @@ void VclMetafileProcessor2D::processPrimitive2DOnPixelProcessor(
         aBufferProcessor.process({ aRef });
         const BitmapEx aBmContent(pBufferDevice->GetBitmapEx(Point(), aSizePixel));
         mpOutputDevice->DrawBitmapEx(aRectLogic.TopLeft(), aRectLogic.GetSize(), aBmContent);
-        pBufferDevice.disposeAndClear();
+
+        // aBufferProcessor dtor pops state off pBufferDevice pushed on by its ctor, let
+        // pBufferDevice live past aBufferProcessor scope to avoid warnigns
     }
+    pBufferDevice.disposeAndClear();
 }
 
 } // end of namespace