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

[Caolán McNamara]

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

New commits:
commit 5149e714c44182e22236d1f8daca719c318aad49
Author: Caolán McNamara <caolanm at redhat.com>
Date:   Wed Dec 10 14:29:20 2014 +0000

    Resolves: fdo#87189 don't draw negative canvas sizes
    
    Change-Id: Ia52bc54084883817ffdd8ade06c3079865d52f70
    (cherry picked from commit 6624484a608ed43fdeea1596f254915add671e08)
    (cherry picked from commit 63a2168a6ea783d2c3824cdde8983dbfad147417)
    Reviewed-on: https://gerrit.libreoffice.org/13414
    Reviewed-by: Miklos Vajna <vmiklos at collabora.co.uk>
    Tested-by: Miklos Vajna <vmiklos at collabora.co.uk>

diff --git a/drawinglayer/source/processor2d/vclprocessor2d.cxx b/drawinglayer/source/processor2d/vclprocessor2d.cxx
index 97e088c..310523e 100644
--- a/drawinglayer/source/processor2d/vclprocessor2d.cxx
+++ b/drawinglayer/source/processor2d/vclprocessor2d.cxx
@@ -830,7 +830,7 @@ namespace drawinglayer
             // Prepare target output size
             Size aDestSize(aDestRectView.GetSize());
 
-            if(aDestSize.getWidth() && aDestSize.getHeight())
+            if(aDestSize.getWidth() > 0 && aDestSize.getHeight() > 0)
             {
                 // Get preferred Metafile output size. When it's very equal to the output size, it's probably
                 // a rounding error somewhere, so correct it to get a 1:1 output without single pixel scalings