INTEGRATION: CWS dr33 (1.1.26); FILE MERGED

2005/02/14 13:31:36 dr 1.1.26.1: #i42367# remove non-ASCII characters at end of line, even in comments
This commit is contained in:
Vladimir Glazounov 2005-02-16 17:17:47 +00:00
parent 7f5d153d93
commit 0b77645807
2 changed files with 11 additions and 11 deletions

View file

@ -2,9 +2,9 @@
*
* $RCSfile: hwpfile.cpp,v $
*
* $Revision: 1.1 $
* $Revision: 1.2 $
*
* last change: $Author: dvo $ $Date: 2003-10-15 14:41:17 $
* last change: $Author: vg $ $Date: 2005-02-16 18:17:32 $
*
* The Contents of this file are made available subject to the terms of
* either of the following licenses
@ -61,7 +61,7 @@
*
************************************************************************/
/* $Id: hwpfile.cpp,v 1.1 2003-10-15 14:41:17 dvo Exp $ */
/* $Id: hwpfile.cpp,v 1.2 2005-02-16 18:17:32 vg Exp $ */
#include "precompile.h"
@ -497,7 +497,7 @@ ColumnDef *HWPFile::GetColumnDef(int num)
else
return 0;
}
//@return 인덱스는 1부터 시작한다.
/* @return 인덱스는 1부터 시작한다. */
int HWPFile::GetPageMasterNum(int page)
{
LinkedListIterator<ColumnInfo> it(&columnlist);

View file

@ -2,9 +2,9 @@
*
* $RCSfile: hwpfile.h,v $
*
* $Revision: 1.1 $
* $Revision: 1.2 $
*
* last change: $Author: dvo $ $Date: 2003-10-15 14:37:09 $
* last change: $Author: vg $ $Date: 2005-02-16 18:17:47 $
*
* The Contents of this file are made available subject to the terms of
* either of the following licenses
@ -65,7 +65,7 @@
// hwpfile.h
// (C) 1998 Mizi Research, All rights are reserved
//
// $Id: hwpfile.h,v 1.1 2003-10-15 14:37:09 dvo Exp $
// $Id: hwpfile.h,v 1.2 2005-02-16 18:17:47 vg Exp $
//
#ifndef _HWPFILE_H_
@ -133,7 +133,7 @@ struct ColumnInfo{
*
* @short HWP file management object
* @author Mizi Reserach
* @version $Id: hwpfile.h,v 1.1 2003-10-15 14:37:09 dvo Exp $
* @version $Id: hwpfile.h,v 1.2 2005-02-16 18:17:47 vg Exp $
*/
class DLLEXPORT HWPFile
{
@ -246,7 +246,7 @@ class DLLEXPORT HWPFile
* Reads paragraph list of hwp file from HIODev
*/
bool ParaListRead();
/// 그림 등의 추가 정보를 읽는다.
/* 그림 등의 추가 정보를 읽는다. */
/**
* Reads additional information like embeded image of hwp file from HIODev
*/
@ -341,7 +341,7 @@ class DLLEXPORT HWPFile
OlePicture *oledata;
private:
// hwp 파일 이름
/* hwp 파일 이름 */
char fname[256];
int m_nCurrentPage;
int m_nMaxSettedPage;
@ -359,7 +359,7 @@ class DLLEXPORT HWPFile
LinkedList<EmPicture> emblist;
LinkedList<HyperText> hyperlist;
int currenthyper;
LinkedList<ParaShape> pslist; // 스타오피스의 구조상 필요
LinkedList<ParaShape> pslist; /* 스타오피스의 구조상 필요 */
LinkedList<CharShape> cslist;
LinkedList<FBoxStyle> fbslist;
LinkedList<DateCode> datecodes;