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

Tor Lillqvist tml at collabora.com
Mon Mar 31 13:11:47 PDT 2014


 vcl/inc/headless/svpgdi.hxx |    6 ++----
 vcl/inc/quartz/salgdi.h     |    2 --
 2 files changed, 2 insertions(+), 6 deletions(-)

New commits:
commit 17e2d6982cee17888f97e1d268186e297a6c5dbd
Author: Tor Lillqvist <tml at collabora.com>
Date:   Mon Mar 31 23:10:05 2014 +0300

    Need to define mnContextStackDepth always it seems
    
    Change-Id: I25d86e2765aae353fa5586244f33728cd5b55bbc

diff --git a/vcl/inc/headless/svpgdi.hxx b/vcl/inc/headless/svpgdi.hxx
index 987c2e4..028d71c 100644
--- a/vcl/inc/headless/svpgdi.hxx
+++ b/vcl/inc/headless/svpgdi.hxx
@@ -89,10 +89,8 @@ public:
     CGLayerRef                              mxLayer;
     // mirror AquaSalVirtualDevice::mbForeignContext for SvpSalGraphics objects related to such
     bool mbForeignContext;
-    CGContextRef                         mrContext;
-#if OSL_DEBUG_LEVEL > 0
-    int                                  mnContextStackDepth;
-#endif
+    CGContextRef                            mrContext;
+    int                                     mnContextStackDepth;
     class XorEmulation*                     mpXorEmulation;
     int                                     mnXorMode; // 0: off 1: on 2: invert only
     int                                     mnWidth;
diff --git a/vcl/inc/quartz/salgdi.h b/vcl/inc/quartz/salgdi.h
index c009c56..722d368 100644
--- a/vcl/inc/quartz/salgdi.h
+++ b/vcl/inc/quartz/salgdi.h
@@ -158,9 +158,7 @@ protected:
     AquaSalFrame*                           mpFrame;
     CGLayerRef                              mxLayer;    // Quartz graphics layer
     CGContextRef                            mrContext;  // Quartz drawing context
-#if OSL_DEBUG_LEVEL > 0
     int                                     mnContextStackDepth;
-#endif
     class XorEmulation*                     mpXorEmulation;
     int                                     mnXorMode; // 0: off 1: on 2: invert only
     int                                     mnWidth;


More information about the Libreoffice-commits mailing list