diff options
| author | R체diger Timm <rt@openoffice.org> | 2005-04-04 06:55:49 +0000 |
|---|---|---|
| committer | R체diger Timm <rt@openoffice.org> | 2005-04-04 06:55:49 +0000 |
| commit | 306caa4bbfc660ed7595eb3894727a4378d5ce2b (patch) | |
| tree | f81f49ad0645bb727f4e79f375c8000ead033660 /hwpfilter/source/hbox.h | |
| parent | 669fedca139ba7470fe3c99d90c7dd442ce05994 (diff) | |
INTEGRATION: CWS gccfour (1.2.2); FILE MERGED
2005/03/11 09:04:11 cmc 1.2.2.1: #i44718# name enums that compare against ints
Diffstat (limited to 'hwpfilter/source/hbox.h')
| -rw-r--r-- | hwpfilter/source/hbox.h | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/hwpfilter/source/hbox.h b/hwpfilter/source/hbox.h index d7a7e04ce353..60fe4fba09e0 100644 --- a/hwpfilter/source/hbox.h +++ b/hwpfilter/source/hbox.h @@ -2,9 +2,9 @@ * * $RCSfile: hbox.h,v $ * - * $Revision: 1.2 $ + * $Revision: 1.3 $ * - * last change: $Author: vg $ $Date: 2005-02-16 18:14:57 $ + * last change: $Author: rt $ $Date: 2005-04-04 07:55:49 $ * * The Contents of this file are made available subject to the terms of * either of the following licenses @@ -61,7 +61,7 @@ * ************************************************************************/ -/* $Id: hbox.h,v 1.2 2005-02-16 18:14:57 vg Exp $ */ +/* $Id: hbox.h,v 1.3 2005-04-04 07:55:49 rt Exp $ */ #ifndef _HBOX_H_ #define _HBOX_H_ @@ -233,7 +233,7 @@ struct Tab: public HBox // tbox(10) TABLE BOX MATH BUTTON HYPERTEXT -enum { TBL_TYPE, TXT_TYPE, EQU_TYPE, BUTTON_TYPE, HYPERTEXT_TYPE }; +enum ttype { TBL_TYPE, TXT_TYPE, EQU_TYPE, BUTTON_TYPE, HYPERTEXT_TYPE }; enum /* TxtBox->margin[n][?] */ { OUT_M, IN_M, CELL_M @@ -242,7 +242,7 @@ enum /* TxtBox->margin[?][n] */ { L_M, R_M, T_M, B_M }; -enum { CHAR_ANCHOR, PARA_ANCHOR, PAGE_ANCHOR, PAPER_ANCHOR }; +enum anchor { CHAR_ANCHOR, PARA_ANCHOR, PAGE_ANCHOR, PAPER_ANCHOR }; enum { TF_OCCUPY_SPACE, TF_TRANSPARENT,TF_ARROUND_TEXT }; enum { @@ -588,7 +588,7 @@ struct Table }; /* picture (11) 그림, OLE그림, 삽입그림, 그리기 */ -enum +enum pictype { PICTYPE_FILE, PICTYPE_OLE, PICTYPE_EMBED, PICTYPE_DRAW, PICTYPE_UNKNOWN |