Kaydet (Commit) 13229ce1 authored tarafından Tor Lillqvist's avatar Tor Lillqvist

UNX does not imply X11

We really need some feature test macro that would be equivalent to
using X11.

Change-Id: I0c1f9b487b4feab3b7d4641e898f9fdf0144065b
üst daa2ac6e
...@@ -47,7 +47,7 @@ ...@@ -47,7 +47,7 @@
#include <com/sun/star/graphic/XGraphic.hpp> #include <com/sun/star/graphic/XGraphic.hpp>
#include <com/sun/star/graphic/XGraphicRenderer.hpp> #include <com/sun/star/graphic/XGraphicRenderer.hpp>
#ifdef UNX #if defined(UNX) && !defined(ANDROID) && !defined(IOS) && !defined(MACOSX) && !defined(LIBO_HEADLESS)
#include <unx/salbmp.h> #include <unx/salbmp.h>
#endif #endif
...@@ -450,7 +450,7 @@ bool GDIMetaFile::ImplPlayWithRenderer( OutputDevice* pOut, const Point& rPos, S ...@@ -450,7 +450,7 @@ bool GDIMetaFile::ImplPlayWithRenderer( OutputDevice* pOut, const Point& rPos, S
// and the commit that changed to the new code relied on alpha support in bitmap // and the commit that changed to the new code relied on alpha support in bitmap
// (which that commit implemented only in X11SalBitmap) and so it didn't work on Windows. // (which that commit implemented only in X11SalBitmap) and so it didn't work on Windows.
// So keep both. // So keep both.
#ifdef UNX #if defined(UNX) && !defined(ANDROID) && !defined(IOS) && !defined(MACOSX) && !defined(LIBO_HEADLESS)
X11SalBitmap* X11Bmp = static_cast< X11SalBitmap* >( pSalBmp ); X11SalBitmap* X11Bmp = static_cast< X11SalBitmap* >( pSalBmp );
X11Bmp->SetHasAlpha( true ); X11Bmp->SetHasAlpha( true );
if( X11Bmp->Create( xBitmapCanvas, aSize ) ) if( X11Bmp->Create( xBitmapCanvas, aSize ) )
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment