[Libreoffice-commits] .: drawinglayer/source

[Radek Doulík]

 drawinglayer/source/processor2d/vclpixelprocessor2d.cxx |    6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

New commits:
commit 229df81b920ddee5a1b057af75db7b293f88e3bd
Author: Radek Doulik <rodo at novell.com>
Date:   Wed Feb 9 16:04:29 2011 +0100

    restrict metafile decomposition (fixes n#650049)
    
     - do not use metafile decomposition on metafiles which need
       canvas renderer (right now, these containing EMF+)

diff --git a/drawinglayer/source/processor2d/vclpixelprocessor2d.cxx b/drawinglayer/source/processor2d/vclpixelprocessor2d.cxx
index dfa3983..ca594c0 100644
--- a/drawinglayer/source/processor2d/vclpixelprocessor2d.cxx
+++ b/drawinglayer/source/processor2d/vclpixelprocessor2d.cxx
@@ -229,7 +229,9 @@ namespace drawinglayer
                         mpOutputDevice->SetAntialiasing(nOldAntiAliase | ANTIALIASING_PIXELSNAPHAIRLINE);
                     }
 
-                    static bool bTestMetaFilePrimitiveDecomposition(true);
+                    const primitive2d::MetafilePrimitive2D& rMetafilePrimitive( static_cast< const primitive2d::MetafilePrimitive2D& >(rCandidate) );
+
+                    static bool bTestMetaFilePrimitiveDecomposition( !rMetafilePrimitive.getMetaFile().GetUseCanvas() );
                     if(bTestMetaFilePrimitiveDecomposition)
                     {
                         // use new Metafile decomposition
@@ -238,7 +240,7 @@ namespace drawinglayer
                     else
                     {
                         // direct draw of MetaFile
-                        RenderMetafilePrimitive2D(static_cast< const primitive2d::MetafilePrimitive2D& >(rCandidate));
+                        RenderMetafilePrimitive2D( rMetafilePrimitive );
                     }
                     
                     if(bForceLineSnap)