[Libreoffice-commits] core.git: vcl/headless

[Caolán McNamara]

 vcl/headless/svpgdi.cxx |   11 +++++------
 1 file changed, 5 insertions(+), 6 deletions(-)

New commits:
commit 3928a1514c9202a52d698570022c197ecc8703eb
Author: Caolán McNamara <caol...@redhat.com>
Date:   Thu Jun 25 13:41:58 2015 +0100

    error: missing binary operator before token '('
    
    Change-Id: Ieafb13245a11347cbda8a33e49ad618bf85d8a89

diff --git a/vcl/headless/svpgdi.cxx b/vcl/headless/svpgdi.cxx
index 957463b..f5dbaf4 100644
--- a/vcl/headless/svpgdi.cxx
+++ b/vcl/headless/svpgdi.cxx
@@ -138,7 +138,10 @@ void SvpSalGraphics::clipRegion(cairo_t* cr)
 
 bool SvpSalGraphics::drawAlphaRect(long nX, long nY, long nWidth, long 
nHeight, sal_uInt8 nTransparency)
 {
-#if ENABLE_CAIRO_CANVAS && CAIRO_VERSION >= CAIRO_VERSION_ENCODE(1, 6, 0)
+#if !ENABLE_CAIRO_CANVAS
+    (void)nX; (void)nY; (void)nWidth; (void)nHeight; (void)nTransparency;
+    return false;
+#elif CAIRO_VERSION >= CAIRO_VERSION_ENCODE(1, 6, 0)
     if (m_bUseLineColor || !m_bUseFillColor)
         return false;
 
@@ -192,11 +195,7 @@ bool SvpSalGraphics::drawAlphaRect(long nX, long nY, long 
nWidth, long nHeight,
     }
     return true;
 #else
-    (void)nX;
-    (void)nY;
-    (void)nWidth;
-    (void)nHeight;
-    (void)nTransparency;
+    (void)nX; (void)nY; (void)nWidth; (void)nHeight; (void)nTransparency;
     return false;
 #endif
 }

_______________________________________________
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits