diff options
| author | Mox Soini <mox@iki.fi> | 2015-06-02 23:52:56 +0300 |
|---|---|---|
| committer | Miklos Vajna <vmiklos@collabora.co.uk> | 2015-06-11 08:35:09 +0000 |
| commit | 0c87f8bf42ba0338dbf6516dc9539223a5dedf4c (patch) | |
| tree | b2257ea435d70bf8e5bc00f0529f6dabf6e563b5 /include | |
| parent | 776a3f14f2d987312b926ebc1ad09321a3a87f0d (diff) | |
Cleanup crossplatform cairo
Mac / Win cairo is not built / used, this cairo code can be removed to
reduce code bloat.
4th Revised version with Android fixes
Change-Id: I6e56850f535ca13b77839b7d67e227c5f39d388e
Reviewed-on: https://gerrit.libreoffice.org/16218
Tested-by: Jenkins <ci@libreoffice.org>
Reviewed-by: Miklos Vajna <vmiklos@collabora.co.uk>
Diffstat (limited to 'include')
| -rw-r--r-- | include/vcl/sysdata.hxx | 16 |
1 files changed, 8 insertions, 8 deletions
diff --git a/include/vcl/sysdata.hxx b/include/vcl/sysdata.hxx index a525f77fbbc8..57217df2fb57 100644 --- a/include/vcl/sysdata.hxx +++ b/include/vcl/sysdata.hxx @@ -23,6 +23,8 @@ #include <vector> #include <cstddef> +#include <config_cairo_canvas.h> + #ifdef MACOSX // predeclare the native classes to avoid header/include problems typedef struct CGContext *CGContextRef; @@ -200,13 +202,12 @@ struct SystemGlyphData int fallbacklevel; }; +#if ENABLE_CAIRO_CANVAS + struct SystemFontData { unsigned long nSize; // size in bytes of this structure -#if defined( WNT ) - HFONT hFont; // native font object -#elif defined( MACOSX ) -#elif defined( UNX ) +#if defined( UNX ) void* nFontId; // native font id int nFontFlags; // native font flags #endif @@ -217,10 +218,7 @@ struct SystemFontData SystemFontData() : nSize( sizeof( SystemFontData ) ) -#if defined( WNT ) - , hFont( 0 ) -#elif defined( MACOSX ) -#elif defined( UNX ) +#if defined( UNX ) , nFontId( NULL ) , nFontFlags( 0 ) #endif @@ -232,6 +230,8 @@ struct SystemFontData } }; +#endif // ENABLE_CAIRO_CANVAS + typedef std::vector<SystemGlyphData> SystemGlyphDataVector; struct SystemTextLayoutData |