[Libreoffice-commits] core.git: Branch 'distro/collabora/cp-6.2' - vcl/quartz

[Tor Lillqvist (via logerrit)]

 vcl/quartz/salgdicommon.cxx |    5 +++++
 1 file changed, 5 insertions(+)

New commits:
commit 064a50f50a1cbbc4880ca5119d3535ed7b92d302
Author:     Tor Lillqvist <tml at collabora.com>
AuthorDate: Fri Mar 15 18:18:38 2019 +0200
Commit:     Tor Lillqvist <tml at collabora.com>
CommitDate: Fri Sep 20 12:05:27 2019 +0200

    tdf#124042: If mrContext is zero, calling Core Graphics APIs on it is futile
    
    If mrContext is zero, the CG calls using it won't do anything and will
    cause "invalid context" warnings when running under Xcode. So just
    return early. Such calls to drawPolyPolygon() are apparently not
    essential but accidental and of no real use. Possibly related to bogus
    "focus" indicator painting. Which does not make sense on iOS as we
    aren't drawing to any actual "windows" with "focus".
    
    Change-Id: Icc4a768d8b255c09a8972551443ce59f4ad56089
    (cherry picked from commit 7f0e669885fb1ac6efaceb5aea21c117825e3495)
    Reviewed-on: https://gerrit.libreoffice.org/79186
    Reviewed-by: Tor Lillqvist <tml at collabora.com>
    Tested-by: Tor Lillqvist <tml at collabora.com>

diff --git a/vcl/quartz/salgdicommon.cxx b/vcl/quartz/salgdicommon.cxx
index aaed9261064d..b5a22500873e 100644
--- a/vcl/quartz/salgdicommon.cxx
+++ b/vcl/quartz/salgdicommon.cxx
@@ -968,6 +968,11 @@ bool AquaSalGraphics::drawPolyPolygon(
     const basegfx::B2DPolyPolygon& rPolyPolygon,
     double fTransparency)
 {
+#ifdef IOS
+    if (!mrContext)
+        return true;
+#endif
+
     // short circuit if there is nothing to do
     if( rPolyPolygon.count() == 0 )
         return true;