[Libreoffice-commits] core.git: 5 commits - sc/qa sd/qa sw/qa vcl/headless

[Caolán McNamara]

 sc/qa/unit/data/xls/fail/EDB-39398-1.xlsx |binary
 sd/qa/unit/data/ppt/pass/EDB-39395-1.ppt  |binary
 sd/qa/unit/data/ppt/pass/EDB-39397-1.ppt  |binary
 sw/qa/core/data/ww8/pass/EDB-39396-1.doc  |binary
 vcl/headless/svpgdi.cxx                   |   27 +++++++--------------------
 5 files changed, 7 insertions(+), 20 deletions(-)

New commits:
commit afcd01bdd9e90321bd42e6b5a513758386ecccc4
Author: Caolán McNamara <caolanm at redhat.com>
Date:   Wed Feb 3 09:52:38 2016 +0000

    add EDB-39395-1 test-case
    
    Change-Id: I3e611a3a647245d40ba808fdef7b64b877285fdc

diff --git a/sd/qa/unit/data/ppt/pass/EDB-39395-1.ppt b/sd/qa/unit/data/ppt/pass/EDB-39395-1.ppt
new file mode 100644
index 0000000..6404323
Binary files /dev/null and b/sd/qa/unit/data/ppt/pass/EDB-39395-1.ppt differ
commit 066e79288b6ad1afe5f896c4cd41e73d947bfee2
Author: Caolán McNamara <caolanm at redhat.com>
Date:   Wed Feb 3 09:50:22 2016 +0000

    add EDB-39396-1 test-case
    
    Change-Id: I8afd1db3859b99cf09d0d52e999bbd95cd88ed10

diff --git a/sw/qa/core/data/ww8/pass/EDB-39396-1.doc b/sw/qa/core/data/ww8/pass/EDB-39396-1.doc
new file mode 100644
index 0000000..ae7c7ae
Binary files /dev/null and b/sw/qa/core/data/ww8/pass/EDB-39396-1.doc differ
commit eea4639dd70de591239e7fb12de7f9e347a5bc27
Author: Caolán McNamara <caolanm at redhat.com>
Date:   Wed Feb 3 09:47:33 2016 +0000

    add EDB-39397-1 test-case
    
    Change-Id: I08b8d0247625745665aa9f048bf3fae028c7c36f

diff --git a/sd/qa/unit/data/ppt/pass/EDB-39397-1.ppt b/sd/qa/unit/data/ppt/pass/EDB-39397-1.ppt
new file mode 100644
index 0000000..091fb65
Binary files /dev/null and b/sd/qa/unit/data/ppt/pass/EDB-39397-1.ppt differ
commit 3b33d4fdffee687f8e087bfc78f12543d722ee0b
Author: Caolán McNamara <caolanm at redhat.com>
Date:   Wed Feb 3 09:44:54 2016 +0000

    add EDB-39398-1 test-case
    
    Change-Id: I69ac97c391d1d4a1ec72751b3efdbdd68a2f6090

diff --git a/sc/qa/unit/data/xls/fail/EDB-39398-1.xlsx b/sc/qa/unit/data/xls/fail/EDB-39398-1.xlsx
new file mode 100644
index 0000000..dd0de64
Binary files /dev/null and b/sc/qa/unit/data/xls/fail/EDB-39398-1.xlsx differ
commit 6884f53ac490c11b98a77e747033f4971cc285f5
Author: Caolán McNamara <caolanm at redhat.com>
Date:   Wed Feb 3 09:14:33 2016 +0000

    default B2DRange ctor doesn't do what I thought it did
    
    Change-Id: Idfe49de429c08d1dd7663ca3fcced8f326e46d15

diff --git a/vcl/headless/svpgdi.cxx b/vcl/headless/svpgdi.cxx
index edd230d..bebf53e 100644
--- a/vcl/headless/svpgdi.cxx
+++ b/vcl/headless/svpgdi.cxx
@@ -337,7 +337,7 @@ bool SvpSalGraphics::drawAlphaRect(long nX, long nY, long nWidth, long nHeight,
 
     const double fTransparency = (100 - nTransparency) * (1.0/100);
 
-    basegfx::B2DRange extents;
+    basegfx::B2DRange extents(0, 0, 0, 0);
 
     cairo_rectangle(cr, nX, nY, nWidth, nHeight);
 
@@ -744,7 +744,7 @@ bool SvpSalGraphics::drawPolyLine(
     cairo_set_miter_limit(cr, 15.0);
 
 
-    basegfx::B2DRange extents;
+    basegfx::B2DRange extents(0, 0, 0, 0);
 
     if (!bNoJoin)
     {
@@ -824,7 +824,7 @@ bool SvpSalGraphics::drawPolyPolygon(const basegfx::B2DPolyPolygon& rPolyPoly, d
 
     setupPolyPolygon(cr, rPolyPoly);
 
-    basegfx::B2DRange extents;
+    basegfx::B2DRange extents(0, 0, 0, 0);
 
     if (m_aFillColor != SALCOLOR_NONE)
     {
@@ -879,7 +879,7 @@ void SvpSalGraphics::drawPolyPolygon(const basegfx::B2DPolyPolygon& rPolyPoly)
 
     setupPolyPolygon(cr, rPolyPoly);
 
-    basegfx::B2DRange extents;
+    basegfx::B2DRange extents(0, 0, 0, 0);
 
     if (m_aFillColor != SALCOLOR_NONE)
     {
@@ -1128,7 +1128,7 @@ void SvpSalGraphics::invert(const basegfx::B2DPolygon &rPoly, SalInvert nFlags)
     cairo_t* cr = getCairoContext(false);
     clipRegion(cr);
 
-    basegfx::B2DRange extents;
+    basegfx::B2DRange extents(0, 0, 0, 0);
 
     AddPolygonToPath(cr, rPoly, true, !getAntiAliasB2DDraw(), false);
 
@@ -1271,21 +1271,8 @@ cairo_user_data_key_t* SvpSalGraphics::getDamageKey()
 
 void SvpSalGraphics::releaseCairoContext(cairo_t* cr, bool bXorModeAllowed, const basegfx::B2DRange& rExtents) const
 {
-    sal_Int32 nExtentsLeft;
-    sal_Int32 nExtentsTop;
-    sal_Int32 nExtentsRight;
-    sal_Int32 nExtentsBottom;
-    if (rExtents.isEmpty()) {
-        nExtentsLeft = 0;
-        nExtentsTop = 0;
-        nExtentsRight = 0;
-        nExtentsBottom = 0;
-    } else {
-        nExtentsLeft = rExtents.getMinX();
-        nExtentsTop = rExtents.getMinY();
-        nExtentsRight = rExtents.getMaxX();
-        nExtentsBottom = rExtents.getMaxY();
-    }
+    sal_Int32 nExtentsLeft(rExtents.getMinX()), nExtentsTop(rExtents.getMinY());
+    sal_Int32 nExtentsRight(rExtents.getMaxX()), nExtentsBottom(rExtents.getMaxY());
     sal_Int32 nWidth = cairo_image_surface_get_width(m_pSurface);
     sal_Int32 nHeight = cairo_image_surface_get_height(m_pSurface);
     nExtentsLeft = std::max<sal_Int32>(nExtentsLeft, 0);