diff options
| author | Vladimir Glazounov <vg@openoffice.org> | 2005-02-16 17:15:12 +0000 |
|---|---|---|
| committer | Vladimir Glazounov <vg@openoffice.org> | 2005-02-16 17:15:12 +0000 |
| commit | 0634ac9f07b6b568057b63a2dce561738c492f57 (patch) | |
| tree | bf4e9386195c3cb683e6ab59bd3d7421c030c3c0 /hwpfilter/source/hbox.h | |
| parent | 5b3cbe30cbfe6760fff4701c7fd62e5741514c4e (diff) | |
INTEGRATION: CWS dr33 (1.1.26); FILE MERGED
2005/02/14 13:31:33 dr 1.1.26.1: #i42367# remove non-ASCII characters at end of line, even in comments
Diffstat (limited to 'hwpfilter/source/hbox.h')
| -rw-r--r-- | hwpfilter/source/hbox.h | 35 |
1 files changed, 18 insertions, 17 deletions
diff --git a/hwpfilter/source/hbox.h b/hwpfilter/source/hbox.h index 9cda33217862..d7a7e04ce353 100644 --- a/hwpfilter/source/hbox.h +++ b/hwpfilter/source/hbox.h @@ -2,9 +2,9 @@ * * $RCSfile: hbox.h,v $ * - * $Revision: 1.1 $ + * $Revision: 1.2 $ * - * last change: $Author: dvo $ $Date: 2003-10-15 14:35:19 $ + * last change: $Author: vg $ $Date: 2005-02-16 18:14:57 $ * * 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.1 2003-10-15 14:35:19 dvo Exp $ */ +/* $Id: hbox.h,v 1.2 2005-02-16 18:14:57 vg Exp $ */ #ifndef _HBOX_H_ #define _HBOX_H_ @@ -136,9 +136,9 @@ struct SkipBlock: public HBox struct DateCode; struct FieldCode : public HBox { - uchar type[2]; // 2/0 - , 3/0-, 3/1-, 3/2-糯¥, 4/0-Ʋ + uchar type[2]; /* 2/0 - , 3/0-, 3/1-, 3/2-糯¥, 4/0-Ʋ */ char *reserved1; - unsigned short location_info; // 0 - ڵ, 1 - ڵ + unsigned short location_info; /* 0 - ڵ, 1 - ڵ */ char *reserved2; hchar *str1; hchar *str2; @@ -313,7 +313,7 @@ struct FBoxStyle /** * Kind of wrap */ - unsigned char txtflow; // . 0-2(ڸ,,︲) + unsigned char txtflow; /* . 0-2(ڸ,,︲) */ /** * Horizontal alignment */ @@ -331,12 +331,12 @@ struct FBoxStyle /** * Index of floating object */ - short boxnum; // Ÿǽ Ÿ ̸ + short boxnum; /* Ÿǽ Ÿ ̸ */ /** * Type of floating object : line, txtbox, image, table, equalizer and button */ unsigned char boxtype; // (L)ine, t(X)tbox, Picture - (G) - short cap_len; // ĸ + short cap_len; /* ĸ */ void *cell; @@ -362,8 +362,9 @@ struct FBox: public HBox char xpos_type, ypos_type; unsigned char smart_linesp; -// ڷ tbox pic Ͽ ʰ ø , -// line Ͽ Ѵ. +/* ڷ tbox pic Ͽ ʰ ø , + line Ͽ Ѵ. + */ short boundsy, boundey; unsigned char boundx, draw; @@ -586,7 +587,7 @@ struct Table TxtBox *box; }; -// picture (11) , OLE, Ա, +/* picture (11) , OLE, Ա, */ enum { PICTYPE_FILE, PICTYPE_OLE, PICTYPE_EMBED, @@ -665,7 +666,7 @@ struct Picture: public FBox * follow_block_size is the size information of the Drawing object of hwp. * It's value is greater than 0 if the pictype is PICTYPE_DRAW. */ - ulong follow_block_size; // ߰ . + ulong follow_block_size; /* ߰ . */ short dummy1; // to not change structure size */ short dummy2; // to not change structure size */ uchar reserved1; @@ -695,7 +696,7 @@ struct Picture: public FBox /** * It's for the Drawing object */ - unsigned char *follow; // drawing϶, ߰. + unsigned char *follow; /* drawing϶, ߰. */ bool ishyper; @@ -871,7 +872,7 @@ struct ShowPageNum: public HBox virtual int Read(HWPFile &hwpf); }; -// Ȧʽ (21) +/* Ȧʽ (21) */ #define HIDE_HD 1 /* bit 0 */ #define HIDE_FT 2 /* bit 1 */ #define HIDE_PGNUM 4 /* bit 2 */ @@ -1041,7 +1042,7 @@ class Outline: public HBox /** * decoration charactor for the level type */ - hchar deco[MAX_OUTLINE_LEVEL][2]; // ǽ յ + hchar deco[MAX_OUTLINE_LEVEL][2]; /* ǽ յ */ hchar dummy; Outline(); @@ -1050,7 +1051,7 @@ class Outline: public HBox hchar *GetUnicode(hchar *, int slen = 255); }; -// ĭ(30) +/* ĭ(30) */ /** * The Special space to be treated non-space when a string is * cut at the end of line @@ -1065,7 +1066,7 @@ struct KeepSpace: public HBox virtual int Read(HWPFile &hwpf); }; -// ĭ(31) +/* ĭ(31) */ /** * @short Space with always same width not relation with fonts. */ |