mir/libreoffice
2
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

fix compile break on macos

Browse Source
This commit is contained in:
tsahi glik
2014-01-16 13:11:53 -08:00
parent 278bbb4dc8
commit 62c7ba40c7
1 changed files with 12 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

24
vcl/quartz/salgdicommon.cxx
View File

@@ -1157,6 +1157,7 @@ sal_uInt16 AquaSalGraphics::GetBitCount() const
SalBitmap* AquaSalGraphics::getBitmap( long nX, long nY, long nDX, long nDY ) SalBitmap* AquaSalGraphics::getBitmap( long nX, long nY, long nDX, long nDY )
{ {
#ifdef IOS
if (!mbForeignContext && m_aDevice != NULL) if (!mbForeignContext && m_aDevice != NULL)
{ {
// on ios virtual device are Svp so use Svp bitmap to get the content // 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; return NULL;
} }
else #endif
DBG_ASSERT( mxLayer, "AquaSalGraphics::getBitmap() with no layer" );
ApplyXorContext();
QuartzSalBitmap* pBitmap = new QuartzSalBitmap;
if( !pBitmap->Create( mxLayer, mnBitmapDepth, nX, nY, nDX, nDY) )
{ {
DBG_ASSERT( mxLayer, "AquaSalGraphics::getBitmap() with no layer" ); delete pBitmap;
pBitmap = NULL;
ApplyXorContext();
QuartzSalBitmap* pBitmap = new QuartzSalBitmap;
if( !pBitmap->Create( mxLayer, mnBitmapDepth, nX, nY, nDX, nDY) )
{
delete pBitmap;
pBitmap = NULL;
}
return pBitmap;
} }
return pBitmap;
} }
#ifndef IOS #ifndef IOS