Lines 53-58
Link Here
|
53 |
#ifdef MACOSX |
53 |
#ifdef MACOSX |
54 |
// directory of OS X CUPS ppd files |
54 |
// directory of OS X CUPS ppd files |
55 |
#define MACXP_CUPS_PPD_DIR "/etc/cups/ppd" |
55 |
#define MACXP_CUPS_PPD_DIR "/etc/cups/ppd" |
|
|
56 |
// directory of OS X fonts |
57 |
#define MACXP_FONT_DIR "/Library/Fonts;" |
56 |
#endif |
58 |
#endif |
57 |
|
59 |
|
58 |
using namespace rtl; |
60 |
using namespace rtl; |
Lines 244-249
Link Here
|
244 |
} |
246 |
} |
245 |
aPath += ::psp::getEnvironmentPath( "SAL_FONTPATH_PRIVATE", (sal_Unicode)';' ); |
247 |
aPath += ::psp::getEnvironmentPath( "SAL_FONTPATH_PRIVATE", (sal_Unicode)';' ); |
246 |
|
248 |
|
|
|
249 |
#ifdef MACOSX |
250 |
aPath += OUString( RTL_CONSTASCII_USTRINGPARAM( ";" ) ); |
251 |
// Add the system font paths to the search path |
252 |
aPath += OUString( RTL_CONSTASCII_USTRINGPARAM(MACXP_FONT_DIR) ); |
253 |
//Userfonts |
254 |
if( aUserPath.getLength() ) |
255 |
{ |
256 |
aPath += aUserPath; |
257 |
aPath += OUString( RTL_CONSTASCII_USTRINGPARAM("/../../Fonts;")); |
258 |
} |
259 |
#endif |
260 |
|
247 |
// append jre/jdk fonts if possible |
261 |
// append jre/jdk fonts if possible |
248 |
OString aJREpath; |
262 |
OString aJREpath; |
249 |
|
263 |
|