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

[Tor Lillqvist (via logerrit)]

 vcl/quartz/salgdicommon.cxx |   14 --------------
 1 file changed, 14 deletions(-)

New commits:
commit 8d5164463a77f7957c26bc922689f45b394a2cf6
Author:     Tor Lillqvist <tml at collabora.com>
AuthorDate: Fri Mar 15 18:32:50 2019 +0200
Commit:     Noel Grandin <noel.grandin at collabora.co.uk>
CommitDate: Thu Jul 25 09:57:11 2019 +0200

    tdf#124042: Remove unnecessary code for iOS
    
    We don't need to pop the Core Graphics context state stack completely
    before releasing the context. The code that tried to do that failed
    anyway when the context was a "foreign" one (from doc_paintWindowDPI()
    in core's init.cxx) thad had already been released there.
    
    Also removed another apparently unnecessary ifndef for iOS.
    
    Change-Id: Idcd1e6edd06ab259ec850fd66fcbabc3df0ae3af
    Reviewed-on: https://gerrit.libreoffice.org/76263
    Tested-by: Jenkins
    Reviewed-by: Noel Grandin <noel.grandin at collabora.co.uk>

diff --git a/vcl/quartz/salgdicommon.cxx b/vcl/quartz/salgdicommon.cxx
index d4d9ef7c2231..eee568533259 100644
--- a/vcl/quartz/salgdicommon.cxx
+++ b/vcl/quartz/salgdicommon.cxx
@@ -1961,25 +1961,11 @@ void AquaSalGraphics::SetVirDevGraphics(CGLayerHolder const & rLayer, CGContextR
     mbPrinter = false;
     mbVirDev = true;
 
-#ifdef IOS
-    (void) nBitmapDepth;
-
-    if (!xContext)
-    {
-        // We will return early a few lines lower.
-        // Undo the "stack initialization" done at the initial call of
-        // this method, see end.
-        maContextHolder.restoreState();
-    }
-#endif
-
     // set graphics properties
     maLayer = rLayer;
     maContextHolder.set(xContext);
 
-#ifndef IOS
     mnBitmapDepth = nBitmapDepth;
-#endif
 
 #ifdef IOS
     mbForeignContext = xContext != NULL;