diff --git a/hwpfilter/source/hbox.cpp b/hwpfilter/source/hbox.cpp index 24dadec0d8f8..815f516c6011 100644 --- a/hwpfilter/source/hbox.cpp +++ b/hwpfilter/source/hbox.cpp @@ -4,9 +4,9 @@ * * $RCSfile: hbox.cpp,v $ * - * $Revision: 1.3 $ + * $Revision: 1.4 $ * - * last change: $Author: rt $ $Date: 2005-09-07 16:32:27 $ + * last change: $Author: hr $ $Date: 2006-06-20 00:53:09 $ * * The Contents of this file are made available subject to * the terms of GNU Lesser General Public License Version 2.1. @@ -33,8 +33,6 @@ * ************************************************************************/ -/* $Id: hbox.cpp,v 1.3 2005-09-07 16:32:27 rt Exp $ */ - #include "precompile.h" #include @@ -86,7 +84,7 @@ int HBox::WSize(void) } -int HBox::GetString(hchar * hstr, int slen) +int HBox::GetString(hchar * hstr, int ) { *hstr++ = hh; *hstr = 0; @@ -163,13 +161,14 @@ DateCode::DateCode(void):HBox(CH_DATE_CODE) } +#define _DATECODE_WEEK_DEFINES_ #include "datecode.h" int DateCode::GetString(hchar * hstr, int slen) { hchar *fmt, *d; int i, num; - char *form; + const char *form; char cbuf[256]; bool is_pm, add_zero; @@ -180,7 +179,7 @@ int DateCode::GetString(hchar * hstr, int slen) d = hstr; for (; *fmt && ((int) (d - hstr) < DATE_SIZE) && slen > 1; fmt++) { - form = const_cast < char *>((add_zero) ? "%02d" : "%d"); + form = (add_zero) ? "%02d" : "%d"; add_zero = false; is_pm = (date[HOUR] >= 12); @@ -435,7 +434,7 @@ Footnote::~Footnote(void) // Ȧ¼öÂʽÃÀÛ/°¨Ãß±â (21) // mail merge(22) -int MailMerge::GetString(hchar * hstr, int slen) +int MailMerge::GetString(hchar * hstr, int ) { *hstr = 0; return 0; @@ -555,7 +554,7 @@ static void getOutlineNumStr(int style, int level, int num, hchar * hstr) ptr = buf; while (*ptr) { - *ptr = toupper(*ptr); + *ptr = sal::static_int_cast(toupper(*ptr)); ptr++; } } @@ -566,9 +565,9 @@ static void getOutlineNumStr(int style, int level, int num, hchar * hstr) { num = (num - 1) % 26; if (fmt & U_ENG) - *hstr++ = 'A' + num; + *hstr++ = sal::static_int_cast('A' + num); else if (fmt & L_ENG) - *hstr++ = 'a' + num; + *hstr++ = sal::static_int_cast('a' + num); else if (fmt & HAN) *hstr++ = olHanglJaso(num, OL_HANGL_KANATA); } @@ -584,7 +583,7 @@ enum number´Â °ªÀÌ ±×´ë·Î µé¾î°¡ ÀÖ´Ù. Áï, 1.2.1¿¡´Â 1,2,1ÀÌ µé¾î°¡ ÀÖ´Ù. style Àº 1ºÎÅÍ °ªÀÌ µé¾î°¡ ÀÖ´Ù. hbox.h¿¡ Á¤ÀÇµÈ µ¥·Î.. */ -hchar *Outline::GetUnicode(hchar * hstr, int slen) +hchar *Outline::GetUnicode(hchar * hstr, int) { int levelnum; hchar *p; @@ -657,7 +656,7 @@ hchar *Outline::GetUnicode(hchar * hstr, int slen) char *ptr = dest; while( *ptr ) { - *ptr = toupper(*ptr); + *ptr = sal::static_int_cast(toupper(*ptr)); ptr++; } }