summaryrefslogtreecommitdiff
path: root/vcl
diff options
context:
space:
mode:
authorCaolán McNamara <caolanm@redhat.com>2015-06-25 13:41:58 +0100
committerAshod Nakashian <ashod.nakashian@collabora.co.uk>2016-02-07 23:03:44 -0500
commit38adab11a9401db9c80eac70b7cd9014b794439e (patch)
treebe74ac12dacd1a412c69bcff2d082974186991ee /vcl
parent7e0992ac1b58e463566bcb9e6955f7f8513d54b6 (diff)
error: missing binary operator before token '('
(cherry picked from commit 3928a1514c9202a52d698570022c197ecc8703eb) Change-Id: Ieafb13245a11347cbda8a33e49ad618bf85d8a89
Diffstat (limited to 'vcl')
-rw-r--r--vcl/headless/svpgdi.cxx13
1 files changed, 5 insertions, 8 deletions
diff --git a/vcl/headless/svpgdi.cxx b/vcl/headless/svpgdi.cxx
index 5804cde0affd..44916f3d1ce0 100644
--- a/vcl/headless/svpgdi.cxx
+++ b/vcl/headless/svpgdi.cxx
@@ -185,9 +185,10 @@ namespace
bool SvpSalGraphics::drawAlphaRect(long nX, long nY, long nWidth, long nHeight, sal_uInt8 nTransparency)
{
bool bRet = false;
+#if !ENABLE_CAIRO_CANVAS
(void)nX; (void)nY; (void)nWidth; (void)nHeight; (void)nTransparency;
-#if ENABLE_CAIRO_CANVAS
-#if CAIRO_VERSION >= CAIRO_VERSION_ENCODE(1, 10, 0)
+ return false;
+#elif CAIRO_VERSION >= CAIRO_VERSION_ENCODE(1, 6, 0)
if (m_bUseLineColor || !m_bUseFillColor)
{
SAL_WARN("vcl.gdi", "unsupported SvpSalGraphics::drawAlphaRect case");
@@ -229,12 +230,8 @@ bool SvpSalGraphics::drawAlphaRect(long nX, long nY, long nWidth, long nHeight,
extents.y + extents.height));
}
bRet = true;
-#endif
- (void)nX;
- (void)nY;
- (void)nWidth;
- (void)nHeight;
- (void)nTransparency;
+#else
+ (void)nX; (void)nY; (void)nWidth; (void)nHeight; (void)nTransparency;
#endif
return bRet;
}