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

Stephan Bergmann sbergman at redhat.com
Fri Apr 25 08:06:54 PDT 2014


 vcl/source/outdev/outdev.cxx |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

New commits:
commit 6ee8e0eb5c80e3d79d3d2eed7a4a9a577f5e18ba
Author: Stephan Bergmann <sbergman at redhat.com>
Date:   Fri Apr 25 17:06:22 2014 +0200

    Fix OutputDevice::Pop
    
    Change-Id: Iaaf19c01dc4ec10c72a66dac35ac64e37766d08e

diff --git a/vcl/source/outdev/outdev.cxx b/vcl/source/outdev/outdev.cxx
index 270f4b3..3a9c3c1 100644
--- a/vcl/source/outdev/outdev.cxx
+++ b/vcl/source/outdev/outdev.cxx
@@ -347,7 +347,6 @@ void OutputDevice::Pop()
         mpMetaFile->AddAction( new MetaPopAction() );
 
     GDIMetaFile* pOldMetaFile = mpMetaFile;
-    OutDevState* pState = new OutDevState;
     mpMetaFile = NULL;
 
     if ( mpOutDevStateStack->empty() )
@@ -355,6 +354,7 @@ void OutputDevice::Pop()
         SAL_WARN( "vcl.gdi", "OutputDevice::Pop() without OutputDevice::Push()" );
         return;
     }
+    OutDevState* pState = mpOutDevStateStack->top();
 
     if( mpAlphaVDev )
         mpAlphaVDev->Pop();


More information about the Libreoffice-commits mailing list