diff options
author | Caolán McNamara <caolanm@redhat.com> | 2015-06-25 16:50:00 +0100 |
---|---|---|
committer | Caolán McNamara <caolanm@redhat.com> | 2015-06-25 16:50:00 +0100 |
commit | f1761903cdafd12d4b33d4e8733971a3d9ad8a10 (patch) | |
tree | 0770aad4a438694108eff078e4d9e4eb67645a7d /vcl/headless | |
parent | f47bff9d153b4f0dcbca1cca9ba6df6491805a62 (diff) |
try harder to hide this from android tinderbox
Change-Id: I586fea9f1570b68ed789da8b10a3b46216c42969
Diffstat (limited to 'vcl/headless')
-rw-r--r-- | vcl/headless/svpgdi.cxx | 17 |
1 files changed, 8 insertions, 9 deletions
diff --git a/vcl/headless/svpgdi.cxx b/vcl/headless/svpgdi.cxx index d29a956ecaf4..b111b0871ef6 100644 --- a/vcl/headless/svpgdi.cxx +++ b/vcl/headless/svpgdi.cxx @@ -138,16 +138,16 @@ void SvpSalGraphics::clipRegion(cairo_t* cr) bool SvpSalGraphics::drawAlphaRect(long nX, long nY, long nWidth, long nHeight, sal_uInt8 nTransparency) { -#if !ENABLE_CAIRO_CANVAS + bool bRet = false; (void)nX; (void)nY; (void)nWidth; (void)nHeight; (void)nTransparency; - return false; -#elif defined(CAIRO_VERSION) && defined(CAIRO_VERSION_ENCODE) && CAIRO_VERSION >= CAIRO_VERSION_ENCODE(1, 6, 0) +#if ENABLE_CAIRO_CANVAS +#if CAIRO_VERSION >= CAIRO_VERSION_ENCODE(1, 6, 0) if (m_bUseLineColor || !m_bUseFillColor) - return false; + return bRet; cairo_t* cr = createCairoContext(m_aDevice); if (!cr) - return false; + return bRet; if (!m_aDevice->isTopDown()) { @@ -193,11 +193,10 @@ bool SvpSalGraphics::drawAlphaRect(long nX, long nY, long nWidth, long nHeight, xDamageTracker->damaged(basegfx::B2IBox(extents.x, extents.y, extents.x + extents.width, extents.y + extents.height)); } - return true; -#else - (void)nX; (void)nY; (void)nWidth; (void)nHeight; (void)nTransparency; - return false; + bRet = true; +#endif #endif + return bRet; } SvpSalGraphics::SvpSalGraphics() : |