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

[tsahi glik]

 vcl/quartz/salgdicommon.cxx |   22 +++++++++++-----------
 1 file changed, 11 insertions(+), 11 deletions(-)

New commits:
commit 62c7ba40c79528d08aa55217b3ce8b7ee67a4de6
Author: tsahi glik <tsahi.g...@cloudon.com>
Date:   Thu Jan 16 13:11:53 2014 -0800

    fix compile break on macos

diff --git a/vcl/quartz/salgdicommon.cxx b/vcl/quartz/salgdicommon.cxx
index 0224f58..dec87ff 100644
--- a/vcl/quartz/salgdicommon.cxx
+++ b/vcl/quartz/salgdicommon.cxx
@@ -1157,6 +1157,7 @@ sal_uInt16 AquaSalGraphics::GetBitCount() const
 
 SalBitmap* AquaSalGraphics::getBitmap( long  nX, long  nY, long  nDX, long  
nDY )
 {
+#ifdef IOS
     if (!mbForeignContext && m_aDevice != NULL)
     {
         // on ios virtual device are Svp so use Svp bitmap to get the content
@@ -1193,20 +1194,19 @@ SalBitmap* AquaSalGraphics::getBitmap( long  nX, long  
nY, long  nDX, long  nDY
         }
         return NULL;
     }
-    else
-    {
-        DBG_ASSERT( mxLayer, "AquaSalGraphics::getBitmap() with no layer" );
+#endif
 
-        ApplyXorContext();
+    DBG_ASSERT( mxLayer, "AquaSalGraphics::getBitmap() with no layer" );
 
-        QuartzSalBitmap* pBitmap = new QuartzSalBitmap;
-        if( !pBitmap->Create( mxLayer, mnBitmapDepth, nX, nY, nDX, nDY) )
-        {
-            delete pBitmap;
-            pBitmap = NULL;
-        }
-        return pBitmap;
+    ApplyXorContext();
+
+    QuartzSalBitmap* pBitmap = new QuartzSalBitmap;
+    if( !pBitmap->Create( mxLayer, mnBitmapDepth, nX, nY, nDX, nDY) )
+    {
+        delete pBitmap;
+        pBitmap = NULL;
     }
+    return pBitmap;
 }
 
 #ifndef IOS
_______________________________________________
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits