diff options
| author | Jens-Heiner Rechtien <hr@openoffice.org> | 2007-11-02 11:14:58 +0000 |
|---|---|---|
| committer | Jens-Heiner Rechtien <hr@openoffice.org> | 2007-11-02 11:14:58 +0000 |
| commit | b14dfadd1e116b4527f33be94231278b0b26a709 (patch) | |
| tree | 36bcecb6ec231d791929d5b8a341d0a66aa120e7 /psprint | |
| parent | 76efba994c76ff97301f1734a182bcb976b7e94a (diff) | |
INTEGRATION: CWS os2port02 (1.18.2); FILE MERGED
2007/09/30 11:45:48 ydario 1.18.2.1: Issue number: i82034
Submitted by: ydario
Reviewed by: ydario
Commit of changes for OS/2 CWS source code integration.
Diffstat (limited to 'psprint')
| -rw-r--r-- | psprint/source/fontsubset/sft.h | 8 |
1 files changed, 5 insertions, 3 deletions
diff --git a/psprint/source/fontsubset/sft.h b/psprint/source/fontsubset/sft.h index 4bf27831f904..38c815ad9d09 100644 --- a/psprint/source/fontsubset/sft.h +++ b/psprint/source/fontsubset/sft.h @@ -4,9 +4,9 @@ * * $RCSfile: sft.h,v $ * - * $Revision: 1.18 $ + * $Revision: 1.19 $ * - * last change: $Author: vg $ $Date: 2007-09-20 14:24:50 $ + * last change: $Author: hr $ $Date: 2007-11-02 12:14:58 $ * * The Contents of this file are made available subject to * the terms of GNU Lesser General Public License Version 2.1. @@ -33,7 +33,7 @@ * ************************************************************************/ -/* $Id: sft.h,v 1.18 2007-09-20 14:24:50 vg Exp $ */ +/* $Id: sft.h,v 1.19 2007-11-02 12:14:58 hr Exp $ */ /** @@ -134,6 +134,7 @@ extern "C" { }; /** Value of the width member of the TTGlobalFontInfo struct */ +#ifndef OS2 enum WidthClass { FWIDTH_ULTRA_CONDENSED = 1, /**< 50% of normal */ FWIDTH_EXTRA_CONDENSED = 2, /**< 62.5% of normal */ @@ -145,6 +146,7 @@ extern "C" { FWIDTH_EXTRA_EXPANDED = 8, /**< 150% of normal */ FWIDTH_ULTRA_EXPANDED = 9 /**< 200% of normal */ }; +#endif // OS2 #endif /* FW_THIN */ /** Type of the 'kern' table, stored in _TrueTypeFont::kerntype */ |