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

Libreoffice Gerrit user logerrit at kemper.freedesktop.org
Fri Mar 15 16:44:33 UTC 2019


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

New commits:
commit 3140194a85fe4a6ac69c8cddc4d3b019430cd6e8
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 Mar 15 18:43:42 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

diff --git a/vcl/quartz/salgdicommon.cxx b/vcl/quartz/salgdicommon.cxx
index ab8065f9f401..772c538c7a5d 100644
--- a/vcl/quartz/salgdicommon.cxx
+++ b/vcl/quartz/salgdicommon.cxx
@@ -966,6 +966,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;


More information about the Libreoffice-commits mailing list