vcl/quartz/salgdi.cxx | 8 ++++++++ 1 file changed, 8 insertions(+) New commits: commit 4e1b526f35abe6a0a01edaa72f9134cb878d4945 Author: Tor Lillqvist <t...@collabora.com> AuthorDate: Tue Oct 2 18:26:41 2018 +0300 Commit: Tor Lillqvist <t...@iki.fi> CommitDate: Tue Oct 2 21:12:07 2018 +0300
We shouldn't call DrawTextLayout() without a context on iOS Change-Id: I3e72909ca1aa9f97721d982f16624f496152ae2d diff --git a/vcl/quartz/salgdi.cxx b/vcl/quartz/salgdi.cxx index 43ca506220c9..36569d626d3b 100644 --- a/vcl/quartz/salgdi.cxx +++ b/vcl/quartz/salgdi.cxx @@ -393,6 +393,14 @@ bool AquaSalGraphics::GetGlyphBoundRect(const GlyphItem& rGlyph, tools::Rectangl void AquaSalGraphics::DrawTextLayout(const GenericSalLayout& rLayout) { +#ifdef IOS + if (!CheckContext()) + { + SAL_WARN("vcl.cg", "AquaSalGraphics::DrawTextLayout() without context"); + return; + } +#endif + const CoreTextStyle& rStyle = *static_cast<const CoreTextStyle*>(&rLayout.GetFont()); const FontSelectPattern& rFontSelect = rStyle.GetFontSelectPattern(); if (rFontSelect.mnHeight == 0) _______________________________________________ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits