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

Caolán McNamara (via logerrit) logerrit at kemper.freedesktop.org
Sun Oct 6 20:37:11 UTC 2019


 vcl/headless/svpinst.cxx |    6 ++++++
 1 file changed, 6 insertions(+)

New commits:
commit b03c6bc011d05f33522537ed37fe01c30444be0f
Author:     Caolán McNamara <caolanm at redhat.com>
AuthorDate: Sun Oct 6 21:19:15 2019 +0100
Commit:     Caolán McNamara <caolanm at redhat.com>
CommitDate: Sun Oct 6 22:35:46 2019 +0200

    fix android build
    
    Change-Id: Ied0e3affd81ea6072d1852dac73ef08f96760271
    Reviewed-on: https://gerrit.libreoffice.org/80328
    Reviewed-by: Caolán McNamara <caolanm at redhat.com>
    Tested-by: Caolán McNamara <caolanm at redhat.com>

diff --git a/vcl/headless/svpinst.cxx b/vcl/headless/svpinst.cxx
index 617ac21fa884..31b9f4558e44 100644
--- a/vcl/headless/svpinst.cxx
+++ b/vcl/headless/svpinst.cxx
@@ -247,10 +247,16 @@ std::unique_ptr<SalVirtualDevice> SvpSalInstance::CreateVirtualDevice(SalGraphic
 {
     SvpSalGraphics *pSvpSalGraphics = dynamic_cast<SvpSalGraphics*>(pGraphics);
     assert(pSvpSalGraphics);
+#if defined(UNX)
     // tdf#127529 normally pPreExistingTarget is null and we are a true virtualdevice drawing to a backing buffer.
     // Occasionally, for canvas/slideshow, pPreExistingTarget is pre-provided as a hack to use the vcl drawing
     // apis to render onto a preexisting cairo surface. The necessity for that precedes the use of cairo in vcl proper
     cairo_surface_t* pPreExistingTarget = pGd ? static_cast<cairo_surface_t*>(pGd->pSurface) : nullptr;
+#else
+    //ANDROID case
+    (void)pGd;
+    cairo_surface_t* pPreExistingTarget = nullptr;
+#endif
     std::unique_ptr<SalVirtualDevice> pNew(new SvpSalVirtualDevice(eFormat, pSvpSalGraphics->getSurface(), pPreExistingTarget));
     pNew->SetSize( nDX, nDY );
     return pNew;


More information about the Libreoffice-commits mailing list