[Libreoffice-commits] core.git: Branch 'libreoffice-4-1' - cppcanvas/source

[Andrzej Hunt]

 cppcanvas/source/mtfrenderer/emfplus.cxx |    4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

New commits:
commit 215499e74fccb1809105d458b6076992be9d049c
Author: Andrzej Hunt <andrzej.hunt at collabora.com>
Date:   Thu Dec 26 18:57:28 2013 +0000

    EMF+: Integer coordinate values are signed.
    
    Previously any coordinates with negative values would not be rendered
    (as they would incorrectly appear to be outside the visible area).
    
    (cherry picked from commit d8dedc775cedf0e9daf9284bc7e3a0331ccd2963)
    
    Change-Id: I5babcec50d48dc2a6288a01685db61fbb7058680
    Reviewed-on: https://gerrit.libreoffice.org/7247
    Reviewed-by: Caolán McNamara <caolanm at redhat.com>
    Tested-by: Caolán McNamara <caolanm at redhat.com>

diff --git a/cppcanvas/source/mtfrenderer/emfplus.cxx b/cppcanvas/source/mtfrenderer/emfplus.cxx
index a11dc8b..01a77d6 100644
--- a/cppcanvas/source/mtfrenderer/emfplus.cxx
+++ b/cppcanvas/source/mtfrenderer/emfplus.cxx
@@ -169,8 +169,8 @@ namespace cppcanvas
             {
                 for (int i = 0; i < nPoints; i ++) {
                     if (pathFlags & 0x4000) {
-                        // points are stored in short 16bit integer format
-                        sal_uInt16 x, y;
+                        // points are stored in signed short 16bit integer format
+                        sal_Int16 x, y;
 
                         s >> x >> y;
                         SAL_INFO ("cppcanvas.emf", "EMF+\tpoint [x,y]: " << x << "," << y);