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

[Armin Le Grand]

 canvas/source/cairo/cairo_devicehelper.cxx |    5 ++---
 1 file changed, 2 insertions(+), 3 deletions(-)

New commits:
commit 4edbfa892bfe6ca81c88363b2249e0b7d5eef31f
Author: Armin Le Grand <alg at apache.org>
Date:   Wed Jan 16 09:02:17 2013 +0000

    Related: #i121504# corrected error in canvas module when cairo is used
    
    (cherry picked from commit e811ac4450b81cc27d51c06e5a614cd016d6e587)
    
    Conflicts:
    	canvas/source/cairo/cairo_devicehelper.cxx
    
    Change-Id: I0419259723c3dfca22263af9b858bb07141b179e

diff --git a/canvas/source/cairo/cairo_devicehelper.cxx b/canvas/source/cairo/cairo_devicehelper.cxx
index bbe3585..ce14003 100644
--- a/canvas/source/cairo/cairo_devicehelper.cxx
+++ b/canvas/source/cairo/cairo_devicehelper.cxx
@@ -262,9 +262,8 @@ namespace cairocanvas
             const ::Point aEmptyPoint;
             bool bOldMap( mpRefDevice->IsMapModeEnabled() );
             mpRefDevice->EnableMapMode( sal_False );
-            WriteDIB(mpRefDevice->GetBitmap(aEmptyPoint,
-                                              mpRefDevice->GetOutputSizePixel()), aStream, false, true);
-
+            const ::Bitmap aTempBitmap(mpRefDevice->GetBitmap(aEmptyPoint, mpRefDevice->GetOutputSizePixel()));
+            WriteDIB(aTempBitmap, aStream, false, true);
             mpRefDevice->EnableMapMode( bOldMap );
 
             ++nFilePostfixCount;