diff options
| author | Tor Lillqvist <tml@iki.fi> | 2013-01-11 11:07:23 +0200 |
|---|---|---|
| committer | Tor Lillqvist <tml@iki.fi> | 2013-01-11 11:16:59 +0200 |
| commit | e103887c8c158e7059a586ef5a5f7b234c547dfe (patch) | |
| tree | 6cbcabd6d270e595578cc283afadd5b4023bd718 /canvas/source/cairo | |
| parent | 4d23222b15ac0034e265441c71405a48403721f8 (diff) | |
QUARTZ is equivalent to MACOSX
So just check MACOSX in the sources, and don't pass any -DQUARTZ to
compilations.
Change-Id: Ia1de6024810f81f1eea01b8eb0b885d9d1ee8e20
Diffstat (limited to 'canvas/source/cairo')
| -rw-r--r-- | canvas/source/cairo/cairo_devicehelper.cxx | 2 | ||||
| -rw-r--r-- | canvas/source/cairo/cairo_quartz_cairo.cxx | 2 | ||||
| -rw-r--r-- | canvas/source/cairo/cairo_textlayout.cxx | 4 |
3 files changed, 4 insertions, 4 deletions
diff --git a/canvas/source/cairo/cairo_devicehelper.cxx b/canvas/source/cairo/cairo_devicehelper.cxx index 057f91372d2c..f9df77911b2c 100644 --- a/canvas/source/cairo/cairo_devicehelper.cxx +++ b/canvas/source/cairo/cairo_devicehelper.cxx @@ -90,7 +90,7 @@ namespace cairocanvas OutputDevice* pOutDev=getOutputDevice(); -#if defined (UNX) && !defined (QUARTZ) +#if defined (UNX) && !defined (MACOSX) // X11 only if( mpSurface ) mpSurface->Resize( rSize.getX() + pOutDev->GetOutOffXPixel(), diff --git a/canvas/source/cairo/cairo_quartz_cairo.cxx b/canvas/source/cairo/cairo_quartz_cairo.cxx index 5719d1c02964..9c3d5a065a07 100644 --- a/canvas/source/cairo/cairo_quartz_cairo.cxx +++ b/canvas/source/cairo/cairo_quartz_cairo.cxx @@ -17,7 +17,7 @@ * the License at http://www.apache.org/licenses/LICENSE-2.0 . */ -#if defined QUARTZ || defined IOS +#if defined MACOSX || defined IOS /************************************************************************ * Mac OS X/Quartz and iOS surface backend for OpenOffice.org Cairo Canvas * ************************************************************************/ diff --git a/canvas/source/cairo/cairo_textlayout.cxx b/canvas/source/cairo/cairo_textlayout.cxx index 6075029b311f..c5bb94735934 100644 --- a/canvas/source/cairo/cairo_textlayout.cxx +++ b/canvas/source/cairo/cairo_textlayout.cxx @@ -320,7 +320,7 @@ namespace cairocanvas **/ bool TextLayout::isCairoRenderable(SystemFontData aSysFontData) const { -#if defined UNX && !defined QUARTZ && !defined IOS +#if defined UNX && !defined MACOSX && !defined IOS // is font usable? if (!aSysFontData.nFontId) return false; @@ -473,7 +473,7 @@ namespace cairocanvas cairo_font_face_t* font_face = NULL; #ifdef CAIRO_HAS_QUARTZ_SURFACE -# ifdef QUARTZ +# ifdef MACOSX // TODO: use cairo_quartz_font_face_create_for_cgfont(cgFont) // when CGFont (Mac OS X 10.5 API) is provided by the AQUA VCL backend. font_face = cairo_quartz_font_face_create_for_atsu_font_id((ATSUFontID) rSysFontData.aATSUFontID); |