diff options
| author | Jens-Heiner Rechtien <hr@openoffice.org> | 2003-07-16 16:46:49 +0000 |
|---|---|---|
| committer | Jens-Heiner Rechtien <hr@openoffice.org> | 2003-07-16 16:46:49 +0000 |
| commit | 4b952b62b58a74ececfa8c604524c2c206dc2444 (patch) | |
| tree | e617b46c59101c7e997b1c4a44a1fcb924ae2df5 | |
| parent | bfc2f1f4eb739e38ee470cbb586541325e0d2540 (diff) | |
INTEGRATION: CWS ooo11rc2 (1.31.8); FILE MERGED
2003/07/14 15:10:31 fa 1.31.8.1: Mac OS X compatibility. Force OS X to use XRenderCompositeString32 since
PORTS moved to that as well, the patch that enabled this on srx644+ is
no longer applicable to PORTS either. Misc link time additions for
OS X, bring in appropriate headers, etc.
http://www.openoffice.org/project/www/issues/show_bug.cgi?id=16692
Dan
fa@ooo
| -rw-r--r-- | vcl/unx/source/gdi/gcach_xpeer.cxx | 11 |
1 files changed, 2 insertions, 9 deletions
diff --git a/vcl/unx/source/gdi/gcach_xpeer.cxx b/vcl/unx/source/gdi/gcach_xpeer.cxx index 35a13eb1ac2e..167aa6862acd 100644 --- a/vcl/unx/source/gdi/gcach_xpeer.cxx +++ b/vcl/unx/source/gdi/gcach_xpeer.cxx @@ -2,9 +2,9 @@ * * $RCSfile: gcach_xpeer.cxx,v $ * - * $Revision: 1.31 $ + * $Revision: 1.32 $ * - * last change: $Author: hr $ $Date: 2003-06-30 14:32:12 $ + * last change: $Author: hr $ $Date: 2003-07-16 17:46:49 $ * * The Contents of this file are made available subject to the terms of * either of the following licenses @@ -184,17 +184,10 @@ void X11GlyphPeer::SetDisplay( Display* _pDisplay, Visual* _pVisual ) if( !pFunc ) return; pXRenderFreeGlyphs = (void(*)(Display*,GlyphSet,Glyph*,int))pFunc; -#ifdef MACOSX - OUString compStringFuncName(RTL_CONSTASCII_USTRINGPARAM("XRenderCompositeString16")); - pFunc=osl_getSymbol(pRenderLib, compStringFuncName.pData); - if( !pFunc ) return; - pXRenderCompositeString16 = (void(*)(Display*,int,Picture,Picture,XRenderPictFormat*,GlyphSet,int,int,int,int,unsigned short*,int))pFunc; -#else // MACOSX OUString compStringFuncName(RTL_CONSTASCII_USTRINGPARAM("XRenderCompositeString32")); pFunc=osl_getSymbol(pRenderLib, compStringFuncName.pData); if( !pFunc ) return; pXRenderCompositeString32 = (void(*)(Display*,int,Picture,Picture,XRenderPictFormat*,GlyphSet,int,int,int,int,unsigned*,int))pFunc; -#endif // MACOSX OUString creatPicFuncName(RTL_CONSTASCII_USTRINGPARAM("XRenderCreatePicture")); pFunc=osl_getSymbol(pRenderLib, creatPicFuncName.pData); |