Author: pfg
Date: Tue Jun 26 20:52:33 2012
New Revision: 1354223
URL: http://svn.apache.org/viewvc?rev=1354223&view=rev
Log:
Merge r1333151 - Attempt to rescue some old Korean comments.
Modified:
incubator/ooo/symphony/trunk/main/hwpfilter/source/hpara.cpp
incubator/ooo/symphony/trunk/main/hwpfilter/source/hwpreader.cxx
Modified: incubator/ooo/symphony/trunk/main/hwpfilter/source/hpara.cpp
URL:
http://svn.apache.org/viewvc/incubator/ooo/symphony/trunk/main/hwpfilter/source/hpara.cpp?rev=1354223&r1=1354222&r2=1354223&view=diff
==============================================================================
--- incubator/ooo/symphony/trunk/main/hwpfilter/source/hpara.cpp (original)
+++ incubator/ooo/symphony/trunk/main/hwpfilter/source/hpara.cpp Tue Jun 26
20:52:33 2012
@@ -85,7 +85,7 @@ HWPPara::~HWPPara(void)
if (hhstr)
{
// virtual destructor
-/* C++?? null?? ???????? ????????. */
+/* C++ should also work on a null. */
for (ii = 0; ii < nch; ++ii)
delete hhstr[ii];
@@ -110,12 +110,12 @@ int HWPPara::Read(HWPFile & hwpf, unsign
hwpf.Read1b(&pstyno, 1);
-/* Paragraph ???? ???? */
+/* Paragraph representative character */
cshape.Read(hwpf);
if (nch > 0)
hwpf.AddCharShape(&cshape);
-/* Paragraph ???? ???? */
+/* Paragraph paragraph shape */
if (nch && !reuse_shape)
{
pshape.Read(hwpf);
Modified: incubator/ooo/symphony/trunk/main/hwpfilter/source/hwpreader.cxx
URL:
http://svn.apache.org/viewvc/incubator/ooo/symphony/trunk/main/hwpfilter/source/hwpreader.cxx?rev=1354223&r1=1354222&r2=1354223&view=diff
==============================================================================
--- incubator/ooo/symphony/trunk/main/hwpfilter/source/hwpreader.cxx (original)
+++ incubator/ooo/symphony/trunk/main/hwpfilter/source/hwpreader.cxx Tue Jun 26
20:52:33 2012
@@ -365,7 +365,7 @@ void HwpReader::makeMeta()
}
sprintf(buf,"%d-%02d-%02dT%02d:%02d:00",year,month,day,hour,minute);
-/* 2001?? 9?? 8?? ??????, 14?? 16?? */
+/* 2001³â 9¿ù 8ÀÏ Åä¿äÀÏ, 14½Ã 16ºÐ */
// 2001-09-07T11:16:47
rstartEl( ascii("meta:creation-date"), rList );
rchars( ascii(buf));
@@ -374,7 +374,7 @@ void HwpReader::makeMeta()
if (hwpinfo->summary.keyword[0][0] || hwpinfo->summary.etc[0][0])
{
-/* ???????? dc?? ????????. */
+/* ½ºÆå¿¡´Â dc·Î µÇ¾îÀÖ´Ù. */
rstartEl(ascii("meta:keywords"), rList);
if (hwpinfo->summary.keyword[0][0])
{
@@ -502,7 +502,7 @@ void HwpReader::makeDrawMiscStyle( HWPDr
if( hdo->type == HWPDO_LINE || hdo->type == HWPDO_ARC || hdo->type ==
HWPDO_FREEFORM ||
hdo->type == HWPDO_ADVANCED_ARC )
{
- /* ???????? ???? */
+ /* È»ìÇ¥¸¦ »ç¿ë */
if( prop->line_tstyle && !ArrowShape[prop->line_tstyle].bMade )
{
ArrowShape[prop->line_tstyle].bMade = sal_True;
@@ -555,7 +555,7 @@ void HwpReader::makeDrawMiscStyle( HWPDr
if( hdo->type != HWPDO_LINE )
{
- if( prop->flag >> 18 & 0x01 ) /* ?????? ???? ???? ???? */
+ if( prop->flag >> 18 & 0x01 ) /* ºñÆ®¸Ê ÆÄÀÏ ¼Ó¼º Á¸Àç */
{
padd( ascii("draw:name"), sXML_CDATA,
ascii(Int2Str(hdo->index, "fillimage%d", buf)));
if( !prop->pictype )
@@ -563,7 +563,7 @@ void HwpReader::makeDrawMiscStyle( HWPDr
padd( ascii("xlink:href"), sXML_CDATA,
hconv(kstr2hstr( (uchar
*)urltounix(prop->szPatternFile, buf), sbuf), gstr));
}
- else /* ???????? image???? ??????
???????? ????. */
+ else /* ÀÓº£µðµå image·Î¼ ÆÄÀÏ·Î
ÀúÀåÇØ¾ß ÇÑ´Ù. */
{
EmPicture *emp = 0L;
if ( strlen( prop->szPatternFile ) > 3)
@@ -615,8 +615,8 @@ void HwpReader::makeDrawMiscStyle( HWPDr
pList->clear();
rendEl( ascii("draw:fill-image"));
}
-/* ???????????? ????????, ???????????? ????????, ?????? ????????. */
- else if( prop->flag >> 16 & 0x01 ) /* ?????????? ???????? */
+/* If there is a gradient, or bitmap file exists, it is the first step. */
+ else if( prop->flag >> 16 & 0x01 ) /* the presence of the
gradient */
{
padd( ascii("draw:name"), sXML_CDATA,
ascii(Int2Str(hdo->index, "Grad%d", buf)));
switch( prop->gstyle )
@@ -698,7 +698,7 @@ void HwpReader::makeDrawMiscStyle( HWPDr
pList->clear();
rendEl( ascii("draw:gradient"));
}
- /* ???? */
+ /* Hatching */
else if( prop->pattern_type >> 24 & 0x01 )
{
int type = prop->pattern_type & 0xffffff;
@@ -862,8 +862,8 @@ void HwpReader::makeStyles()
/**
* parse automatic styles from hwpfile
- * ?????????? ?????? ???? ???????? ????????. ???????? ?????? ????????, ??????,
???? ?????? ???????? ???????? ????????, Body?????? ?????? ?????? ????????
????????.
- * 1. paragraph, text, fbox, page???????? ???? ????????.
+ * Automatically define a style that is reflected. For example, each paragraph
or, tables, headers, etc, are defined in the style of the place, Body uses the
style defined here.
+ * 1. paragraph, text, fbox, page styles are supported for.
*/
void HwpReader::makeAutoStyles()
{
@@ -1094,7 +1094,7 @@ void HwpReader::makeMasterStyles()
rstartEl(ascii("style:master-page"), rList);
pList->clear();
- if( pSet[i].bIsSet ) /* ???? ?????? ?????????? */
+ if( pSet[i].bIsSet ) /* If the current setting is
changed */
{
if( !pSet[i].pagenumber ){
if( pPrevSet && pPrevSet->pagenumber )
@@ -1136,11 +1136,11 @@ void HwpReader::makeMasterStyles()
pPage = &pSet[i];
pPrevSet = &pSet[i];
}
- else if( pPrevSet ) /* ?????? ?????? ????
??????. */
+ else if( pPrevSet ) /* If there is anything previously set.
*/
{
pPage = pPrevSet;
}
- else /* ???? ?????? ??????
???????????? */
+ else /* If there is already set to default
settings */
{
rstartEl(ascii("style:header"), rList);
padd(ascii("text:style-name"), sXML_CDATA, ascii("Standard"));
@@ -1190,7 +1190,7 @@ void HwpReader::makeMasterStyles()
d->nPnPos = 0;
rendEl(ascii("style:header"));
}
- /* ???????? ????. */
+ /* Is based */
else if( pPage->header_odd && !pPage->header_even )
{
rstartEl(ascii("style:header"), rList);
@@ -1225,7 +1225,7 @@ void HwpReader::makeMasterStyles()
d->nPnPos = 0;
rendEl(ascii("style:header-left"));
}
- /* ???????? ????. */
+ /* Is based. */
else if( pPage->header_even && !pPage->header_odd )
{
rstartEl(ascii("style:header-left"), rList);
@@ -1291,7 +1291,7 @@ void HwpReader::makeMasterStyles()
d->nPnPos = 0;
rendEl(ascii("style:footer"));
}
- /* ???????? ????. */
+ /* Is based. */
else if( pPage->footer_odd && !pPage->footer_even )
{
rstartEl(ascii("style:footer"), rList);
@@ -1326,7 +1326,7 @@ void HwpReader::makeMasterStyles()
d->nPnPos = 0;
rendEl(ascii("style:footer-left"));
}
- /* ???????? ????. */
+ /* Is based. */
else if( pPage->footer_even && !pPage->footer_odd )
{
rstartEl(ascii("style:footer-left"), rList);
@@ -1369,11 +1369,11 @@ void HwpReader::makeMasterStyles()
/**
- * ?????? ???????? ???? ???????????? ??????.
+ * Create a text style for the properties.
* 1. fo:font-size, fo:font-family, fo:letter-spacing, fo:color,
* style:text-background-color, fo:font-style, fo:font-weight,
*
style:text-underline,style:text-outline,fo:text-shadow,style:text-position
- * ?? ????????.
+ * are supported.
*/
void HwpReader::parseCharShape(CharShape * cshape)
{
@@ -1443,11 +1443,11 @@ void HwpReader::parseCharShape(CharShape
/**
- * ???? Paragraph?? ???????? properties???? ??????.
+ * Make paragraph + * corresponding to the physical properties.
* 1. fo:margin-left,fo:margin-right,fo:margin-top, fo:margin-bottom,
* fo:text-indent, fo:line-height, fo:text-align, fo:border
- * ?? ??????.
- * TODO : ?????? => ???????? ?????????? ?????????? ???????? ????.
+ * are implemented.
+ * TODO : taepseoljeong => The default setting should be optional. Limited.
*/
void HwpReader::parseParaShape(ParaShape * pshape)
{
@@ -1515,7 +1515,7 @@ void HwpReader::parseParaShape(ParaShape
/**
- * Paragraph?? ???? ???????? ??????.
+ * Styles made for paragraph.
*/
void HwpReader::makePStyle(ParaShape * pshape)
{
@@ -1585,8 +1585,8 @@ void HwpReader::makePStyle(ParaShape * p
/**
- * ???????? ???????? ??????. ???????? header/footer, footnote???? ????????.
- * TODO : , fo:background-color(?????? ????)
+ * Create the style of the page. This header / footer, footnote, and so on.
+ * TODO : fo: background-color (no information)
*/
void HwpReader::makePageStyle()
{
@@ -1818,7 +1818,7 @@ void HwpReader::makePageStyle()
rendEl(ascii("style:properties"));
rendEl(ascii("style:footer-style"));
- /* footnote style ???? dtd?????? ????????, ???????? ???????? ????.
REALKING */
+ /* footnote style in this dtd missing, but the specification is
defined. REALKING */
rstartEl(ascii("style:footnote-layout"), rList);
padd(ascii("style:distance-before-sep"), sXML_CDATA,
@@ -1857,17 +1857,17 @@ void HwpReader::makeColumns(ColumnDef *c
{
switch( coldef->separator )
{
- case 1: /* ?????? */
+ case 1: /* yapeunseon */
padd(ascii("style:width"), sXML_CDATA,
ascii("0.02mm"));
- case 3: /* ???? */
+ case 3: /* dotted */
padd(ascii("style:style"), sXML_CDATA,
ascii("dotted"));
padd(ascii("style:width"), sXML_CDATA,
ascii("0.02mm"));
break;
- case 2: /* ???????? */
- case 4: /* 2???? */
+ case 2: /* dukkeounseon */
+ case 4: /* 2 jungseon */
padd(ascii("style:width"), sXML_CDATA,
ascii("0.35mm"));
break;
- case 0: /* ???? */
+ case 0: /* None */
default:
padd(ascii("style:style"), sXML_CDATA,
ascii("none"));
break;
@@ -1981,14 +1981,14 @@ void HwpReader::makeTableStyle(Table *tb
{
switch( cl->linetype[2] )
{
- case 1: /* ???????? */
- case 3: /* ???? -> ??????????????
?????? ????. */
+ case 1: /* thin solid line*/
+ case 3: /* dotted line -> Star
Office does not have a dotted line. */
padd(ascii("fo:border"), sXML_CDATA,ascii("0.002cm solid
#000000"));
break;
- case 2: /* ???????? */
+ case 2: /* thick solid line */
padd(ascii("fo:border"), sXML_CDATA,ascii("0.035cm solid
#000000"));
break;
- case 4: /* 2???? */
+ case 4: /* 2 jungseon */
padd(ascii("style:border-line-width"),
sXML_CDATA,ascii("0.002cm 0.035cm 0.002cm"));
padd(ascii("fo:border"), sXML_CDATA,ascii("0.039cm double
#000000"));
break;
@@ -1998,56 +1998,56 @@ void HwpReader::makeTableStyle(Table *tb
{
switch( cl->linetype[0] )
{
- case 1: /* ???????? */
- case 3: /* ???? -> ??????????????
?????? ????. */
+ case 1: /* thin solid line */
+ case 3: /* dotted line -> Star
Office does not have a dotted line. */
padd(ascii("fo:border-left"), sXML_CDATA,ascii("0.002cm
solid #000000"));
break;
- case 2: /* ???????? */
+ case 2: /* thick solid line */
padd(ascii("fo:border-left"), sXML_CDATA,ascii("0.035cm
solid #000000"));
break;
- case 4: /* 2???? */
+ case 4: /* 2 jungseon */
padd(ascii("style:border-line-width-left"),
sXML_CDATA,ascii("0.002cm 0.035cm 0.002cm"));
padd(ascii("fo:border-left"), sXML_CDATA,ascii("0.039cm
double #000000"));
break;
}
switch( cl->linetype[1] )
{
- case 1: /* ???????? */
- case 3: /* ???? -> ??????????????
?????? ????. */
+ case 1: /* thin solid line */
+ case 3: /* dotted line -> Star
Office does not have a dotted line. */
padd(ascii("fo:border-right"), sXML_CDATA,ascii("0.002cm
solid #000000"));
break;
- case 2: /* ???????? */
+ case 2: /* thick solid line */
padd(ascii("fo:border-right"), sXML_CDATA,ascii("0.035cm
solid #000000"));
break;
- case 4: /* 2???? */
+ case 4: /* 2 jungseon */
padd(ascii("style:border-line-width-right"),
sXML_CDATA,ascii("0.002cm 0.035cm 0.002cm"));
padd(ascii("fo:border-right"), sXML_CDATA,ascii("0.039cm
double #000000"));
break;
}
switch( cl->linetype[2] )
{
- case 1: /* ???????? */
- case 3: /* ???? -> ??????????????
?????? ????. */
+ case 1: /* thin solid line */
+ case 3: /* dotted line -> Star
Office does not have a dotted line. */
padd(ascii("fo:border-top"), sXML_CDATA,ascii("0.002cm
solid #000000"));
break;
- case 2: /* ???????? */
+ case 2: /* thick solid line */
padd(ascii("fo:border-top"), sXML_CDATA,ascii("0.035cm
solid #000000"));
break;
- case 4: /* 2???? */
+ case 4: /* 2 jungseon */
padd(ascii("style:border-line-width-top"),
sXML_CDATA,ascii("0.002cm 0.035cm 0.002cm"));
padd(ascii("fo:border-top"), sXML_CDATA,ascii("0.039cm
double #000000"));
break;
}
switch( cl->linetype[3] )
{
- case 1: /* ???????? */
- case 3: /* ???? -> ??????????????
?????? ????. */
+ case 1: /* thin solid line */
+ case 3: /* dotted line -> Star
Office does not have a dotted line. */
padd(ascii("fo:border-bottom"), sXML_CDATA,ascii("0.002cm
solid #000000"));
break;
- case 2: /* ???????? */
+ case 2: /* thick solid line */
padd(ascii("fo:border-bottom"), sXML_CDATA,ascii("0.035cm
solid #000000"));
break;
- case 4: /* 2???? */
+ case 4: /* 2 jungseon */
padd(ascii("style:border-line-width-bottom"),
sXML_CDATA,ascii("0.002cm 0.035cm 0.002cm"));
padd(ascii("fo:border-bottom"), sXML_CDATA,ascii("0.039cm
double #000000"));
break;
@@ -2392,14 +2392,14 @@ void HwpReader::makeCaptionStyle(FBoxSty
case 0:
padd(ascii("fo:padding"), sXML_CDATA,ascii("0mm"));
break;
- case 1: /* ???????? */
- case 3: /* ???? -> ??????????????
?????? ????. */
+ case 1: /* thin solid line */
+ case 3: /* dotted line -> Star
Office does not have a dotted line. */
padd(ascii("fo:border"), sXML_CDATA,ascii("0.002cm solid
#000000"));
break;
- case 2: /* ???????? */
+ case 2: /* thick solid line */
padd(ascii("fo:border"), sXML_CDATA,ascii("0.035cm solid
#000000"));
break;
- case 4: /* 2???? */
+ case 4: /* 2 jungseon */
padd(ascii("style:border-line-width"),
sXML_CDATA,ascii("0.002cm 0.035cm 0.002cm"));
padd(ascii("fo:border"), sXML_CDATA,ascii("0.039cm double
#000000"));
break;
@@ -2409,56 +2409,56 @@ void HwpReader::makeCaptionStyle(FBoxSty
{
switch( cell->linetype[0] )
{
- case 1: /* ???????? */
- case 3: /* ???? -> ??????????????
?????? ????. */
+ case 1: /* thin solid line */
+ case 3: /* dotted line -> Star
Office does not have a dotted line. */
padd(ascii("fo:border-left"), sXML_CDATA,ascii("0.002cm
solid #000000"));
break;
- case 2: /* ???????? */
+ case 2: /* thick solid line */
padd(ascii("fo:border-left"), sXML_CDATA,ascii("0.035cm
solid #000000"));
break;
- case 4: /* 2???? */
+ case 4: /* 2 jungseon */
padd(ascii("style:border-line-width-left"),
sXML_CDATA,ascii("0.002cm 0.035cm 0.002cm"));
padd(ascii("fo:border-left"), sXML_CDATA,ascii("0.039cm
double #000000"));
break;
}
switch( cell->linetype[1] )
{
- case 1: /* ???????? */
- case 3: /* ???? -> ??????????????
?????? ????. */
+ case 1: /* thin solid line */
+ case 3: /* dotted line -> Star
Office does not have a dotted line. */
padd(ascii("fo:border-right"), sXML_CDATA,ascii("0.002cm
solid #000000"));
break;
- case 2: /* ???????? */
+ case 2: /* thick solid line */
padd(ascii("fo:border-right"), sXML_CDATA,ascii("0.035cm
solid #000000"));
break;
- case 4: /* 2???? */
+ case 4: /* 2 jungseon */
padd(ascii("style:border-line-width-right"),
sXML_CDATA,ascii("0.002cm 0.035cm 0.002cm"));
padd(ascii("fo:border-right"), sXML_CDATA,ascii("0.039cm
double #000000"));
break;
}
switch( cell->linetype[2] )
{
- case 1: /* ???????? */
- case 3: /* ???? -> ??????????????
?????? ????. */
+ case 1: /* thin solid line */
+ case 3: /* dotted line -> Star
Office does not have a dotted line. */
padd(ascii("fo:border-top"), sXML_CDATA,ascii("0.002cm
solid #000000"));
break;
- case 2: /* ???????? */
+ case 2: /* thick solid line */
padd(ascii("fo:border-top"), sXML_CDATA,ascii("0.035cm
solid #000000"));
break;
- case 4: /* 2???? */
+ case 4: /* 2 jungseon */
padd(ascii("style:border-line-width-top"),
sXML_CDATA,ascii("0.002cm 0.035cm 0.002cm"));
padd(ascii("fo:border-top"), sXML_CDATA,ascii("0.039cm
double #000000"));
break;
}
switch( cell->linetype[3] )
{
- case 1: /* ???????? */
- case 3: /* ???? -> ??????????????
?????? ????. */
+ case 1: /* thin solid line */
+ case 3: /* dotted line -> Star
Office does not have a dotted line. */
padd(ascii("fo:border-bottom"), sXML_CDATA,ascii("0.002cm
solid #000000"));
break;
- case 2: /* ???????? */
+ case 2: /* thick solid line */
padd(ascii("fo:border-bottom"), sXML_CDATA,ascii("0.035cm
solid #000000"));
break;
- case 4: /* 2???? */
+ case 4: /* 2 jungseon */
padd(ascii("style:border-line-width-bottom"),
sXML_CDATA,ascii("0.002cm 0.035cm 0.002cm"));
padd(ascii("fo:border-bottom"), sXML_CDATA,ascii("0.039cm
double #000000"));
break;
@@ -2477,11 +2477,11 @@ void HwpReader::makeCaptionStyle(FBoxSty
/**
- * Floating ?????? ???? ???????? ??????.
+ * Floating °´Ã¼¿¡ ´ëÇÑ ½ºÅ¸ÀÏÀ» ¸¸µç´Ù.
*/
void HwpReader::makeFStyle(FBoxStyle * fstyle)
{
- /* ???? exist */
+ /* ĸ¼Ç exist */
if( ( fstyle->boxtype == 'G' || fstyle->boxtype == 'X' ) &&
fstyle->cap_len > 0 )
{
makeCaptionStyle(fstyle);
@@ -2603,14 +2603,14 @@ void HwpReader::makeFStyle(FBoxStyle * f
case 0:
padd(ascii("fo:border"),
sXML_CDATA, ascii("none"));
break;
- case 1: /* ???????? */
- case 3: /* ???? -> ??????????????
?????? ????. */
+ case 1: /* thin solid line */
+ case 3: /* dotted line -> Star
Office does not have a dotted line. */
padd(ascii("fo:border"), sXML_CDATA,ascii("0.002cm solid
#000000"));
break;
- case 2: /* ???????? */
+ case 2: /* thick solid line */
padd(ascii("fo:border"), sXML_CDATA,ascii("0.035cm solid
#000000"));
break;
- case 4: /* 2???? */
+ case 4: /* 2 jungseon */
padd(ascii("style:border-line-width"),
sXML_CDATA,ascii("0.002cm 0.035cm 0.002cm"));
padd(ascii("fo:border"), sXML_CDATA,ascii("0.039cm double
#000000"));
break;
@@ -2620,56 +2620,56 @@ void HwpReader::makeFStyle(FBoxStyle * f
{
switch( cell->linetype[0] )
{
- case 1: /* ???????? */
- case 3: /* ???? -> ??????????????
?????? ????. */
+ case 1: /* thin solid line */
+ case 3: /* dotted line -> Star
Office does not have a dotted line. */
padd(ascii("fo:border-left"), sXML_CDATA,ascii("0.002cm
solid #000000"));
break;
- case 2: /* ???????? */
+ case 2: /* thick solid line */
padd(ascii("fo:border-left"), sXML_CDATA,ascii("0.035cm
solid #000000"));
break;
- case 4: /* 2???? */
+ case 4: /* 2 jungseon */
padd(ascii("style:border-line-width-left"),
sXML_CDATA,ascii("0.002cm 0.035cm 0.002cm"));
padd(ascii("fo:border-left"), sXML_CDATA,ascii("0.039cm
double #000000"));
break;
}
switch( cell->linetype[1] )
{
- case 1: /* ???????? */
- case 3: /* ???? -> ??????????????
?????? ????. */
+ case 1: /* thin solid line */
+ case 3: /* dotted line -> Star
Office does not have a dotted line. */
padd(ascii("fo:border-right"), sXML_CDATA,ascii("0.002cm
solid #000000"));
break;
- case 2: /* ???????? */
+ case 2: /* thick solid line */
padd(ascii("fo:border-right"), sXML_CDATA,ascii("0.035cm
solid #000000"));
break;
- case 4: /* 2???? */
+ case 4: /* 2 jungseon */
padd(ascii("style:border-line-width-right"),
sXML_CDATA,ascii("0.002cm 0.035cm 0.002cm"));
padd(ascii("fo:border-right"), sXML_CDATA,ascii("0.039cm
double #000000"));
break;
}
switch( cell->linetype[2] )
{
- case 1: /* ???????? */
- case 3: /* ???? -> ??????????????
?????? ????. */
+ case 1: /* thin solid line */
+ case 3: /* dotted line -> Star
Office does not have a dotted line. */
padd(ascii("fo:border-top"), sXML_CDATA,ascii("0.002cm
solid #000000"));
break;
- case 2: /* ???????? */
+ case 2: /* thick solid line */
padd(ascii("fo:border-top"), sXML_CDATA,ascii("0.035cm
solid #000000"));
break;
- case 4: /* 2???? */
+ case 4: /* 2 jungseon */
padd(ascii("style:border-line-width-top"),
sXML_CDATA,ascii("0.002cm 0.035cm 0.002cm"));
padd(ascii("fo:border-top"), sXML_CDATA,ascii("0.039cm
double #000000"));
break;
}
switch( cell->linetype[3] )
{
- case 1: /* ???????? */
- case 3: /* ???? -> ??????????????
?????? ????. */
+ case 1: /* thin solid line */
+ case 3: /* dotted line -> Star
Office does not have a dotted line. */
padd(ascii("fo:border-bottom"), sXML_CDATA,ascii("0.002cm
solid #000000"));
break;
- case 2: /* ???????? */
+ case 2: /* thick solid line */
padd(ascii("fo:border-bottom"), sXML_CDATA,ascii("0.035cm
solid #000000"));
break;
- case 4: /* 2???? */
+ case 4: /* 2 jungseon */
padd(ascii("style:border-line-width-bottom"),
sXML_CDATA,ascii("0.002cm 0.035cm 0.002cm"));
padd(ascii("fo:border-bottom"), sXML_CDATA,ascii("0.039cm
double #000000"));
break;
@@ -2761,7 +2761,7 @@ void HwpReader::makeChars(hchar *str, in
/**
- * ???????? ?????????? ???? ???? ?????? ?????? CharShape?? ???????? ????
+ * Special characters within a paragraph, but if you use characters other
CharShape
*/
void HwpReader::make_text_p0(HWPPara * para, sal_Bool bParaStart)
{
@@ -2778,7 +2778,7 @@ void HwpReader::make_text_p0(HWPPara * p
}
if( d->bFirstPara && d->bInBody )
{
- strcpy(buf,"[?????? ????]");
+ strcpy(buf,"[¹®¼ÀÇ Ã³À½]");
padd(ascii("text:name"), sXML_CDATA, OUString(buf, strlen(buf),
RTL_TEXTENCODING_EUC_KR));
rstartEl(ascii("text:bookmark"), rList);
pList->clear();
@@ -2828,7 +2828,7 @@ void HwpReader::make_text_p0(HWPPara * p
/**
- * ???????? ?????????? ?????? ???????? ???? CharShape?? ???????? ????
+ * Special characters within a paragraph, but if you use characters other
CharShape.
*/
void HwpReader::make_text_p1(HWPPara * para,sal_Bool bParaStart)
{
@@ -2848,7 +2848,7 @@ void HwpReader::make_text_p1(HWPPara * p
if( d->bFirstPara && d->bInBody )
{
/* for HWP's Bookmark */
- strcpy(buf,"[?????? ????]");
+ strcpy(buf,"[¹®¼ÀÇ Ã³À½]");
padd(ascii("text:name"), sXML_CDATA, OUString(buf, strlen(buf),
RTL_TEXTENCODING_EUC_KR));
rstartEl(ascii("text:bookmark"), rList);
pList->clear();
@@ -2911,7 +2911,7 @@ void HwpReader::make_text_p1(HWPPara * p
/**
- * ???? ???? ?????????? ?????? ???????? ???? CharShape?? ???? ?????? ???? ????
+ * There are special characters in a paragraph of text handling for the case
with other CharShape.
*/
void HwpReader::make_text_p3(HWPPara * para,sal_Bool bParaStart)
{
@@ -2927,7 +2927,7 @@ void HwpReader::make_text_p3(HWPPara * p
{
if( !pstart )
STARTP;
- strcpy(buf,"[?????? ????]");
+ strcpy(buf,"[¹®¼ÀÇ Ã³À½]");
padd(ascii("text:name"), sXML_CDATA, OUString(buf, strlen(buf),
RTL_TEXTENCODING_EUC_KR));
rstartEl(ascii("text:bookmark"), rList);
pList->clear();
@@ -3050,9 +3050,9 @@ void HwpReader::make_text_p3(HWPPara * p
}
makeTab((Tab *) para->hhstr[n]);
break;
- case CH_TEXT_BOX: /* 10 -
??/??????????/????/????/???????????? ?? */
+ case CH_TEXT_BOX: /* 10 - Table / text box /
formula / buttons / Hypertext net */
{
-/* ?????? ???? ????????, ?????? text:p???? ???????? ?????? ????. */
+/* Once the tables are processed, and the formula text: p that goes into
processing. */
TxtBox *hbox = (TxtBox *) para->hhstr[n];
if( hbox->style.anchor_type == 0 )
@@ -3159,11 +3159,11 @@ void HwpReader::make_text_p3(HWPPara * p
l = 0;
makeMailMerge((MailMerge *) para->hhstr[n]);
break;
- case CH_COMPOSE: /* 23 - ???????? */
+ case CH_COMPOSE: /* 23 - text overlap */
break;
case CH_HYPHEN: // 24
break;
- case CH_TOC_MARK: /* 25 ?????? 3???? ????????
????. */
+ case CH_TOC_MARK: /* 25 Following 3 must work.
*/
if( !pstart ) {STARTP;}
if( !tstart ) {STARTT;}
makeChars(gstr, l);
@@ -3196,7 +3196,7 @@ void HwpReader::make_text_p3(HWPPara * p
void HwpReader::makeFieldCode(FieldCode *hbox)
{
-/* ?????? */
+/* Nureumteul*/
if( hbox->type[0] == 4 && hbox->type[1] == 0 )
{
padd(ascii("text:placeholder-type"), sXML_CDATA, ascii("text"));
@@ -3207,7 +3207,7 @@ void HwpReader::makeFieldCode(FieldCode
rchars( OUString(gstr));
rendEl( ascii("text:placeholder") );
}
-/* ???????? */
+/* Text Summary */
else if( hbox->type[0] == 3 && hbox->type[1] == 0 )
{
if( hconv( hbox->str3, gstr
).equals(OUString::createFromAscii("title")))
@@ -3235,7 +3235,7 @@ void HwpReader::makeFieldCode(FieldCode
rendEl( ascii("text:keywords") );
}
}
-/* ???????? */
+/* Personal information. */
else if( hbox->type[0] == 3 && hbox->type[1] == 1 )
{
if( hconv( hbox->str3, gstr
).equals(OUString::createFromAscii("User")))
@@ -3300,7 +3300,7 @@ void HwpReader::makeFieldCode(FieldCode
}
}
- else if( hbox->type[0] == 3 && hbox->type[1] == 2 ) /* ???????? */
+ else if( hbox->type[0] == 3 && hbox->type[1] == 2 ) /* Created */
{
if( hbox->m_pDate )
padd(ascii("style:data-style-name"), sXML_CDATA,
@@ -3315,7 +3315,7 @@ void HwpReader::makeFieldCode(FieldCode
/**
* Completed
- * ???????????????? ???????? Reference?? ???????? hwp???? ?? ?????? ????.
+ * Refer to Reference Star Office bookmarks do not have the feature in a hwp.
*/
void HwpReader::makeBookmark(Bookmark * hbox)
{
@@ -3326,7 +3326,7 @@ void HwpReader::makeBookmark(Bookmark *
pList->clear();
rendEl(ascii("text:bookmark"));
}
- else if (hbox->type == 1) /* ???? ???????? ???? ??????
???? ???? */
+ else if (hbox->type == 1) /* If the block bukmakeuil
has a beginning and an end */
{
padd(ascii("text:name"), sXML_CDATA, (hconv(hbox->id, gstr)));
rstartEl(ascii("text:bookmark-start"), rList);
@@ -3587,10 +3587,10 @@ void HwpReader::makeTable(TxtBox * hbox)
/**
- * ???????????? ???????? ????????.
+ * To parse the text boxes and tables.
* 1. draw:style-name, draw:name, text:anchor-type, svg:width,
* fo:min-height, svg:x, svg:y
- * TODO : fo:background-color?? ???? ???? ????=>???????? ???????? ?? ????
????????.
+ * TODO : fo:background-color of the cell color settings => I do not know yet
whether to enter the style.
*/
void HwpReader::makeTextBox(TxtBox * hbox)
{
@@ -3634,7 +3634,7 @@ void HwpReader::makeTextBox(TxtBox * hbo
Double2Str(WTMM(( hbox->box_ys + hbox->cap_ys) )) + ascii("mm"));
rstartEl(ascii("draw:text-box"), rList);
pList->clear();
- if( hbox->cap_pos % 2 ) /* ?????? ?????? ???????? */
+ if( hbox->cap_pos % 2 ) /* is located at the top of the
caption */
{
parsePara(hbox->caption.first());
}
@@ -3705,7 +3705,7 @@ void HwpReader::makeTextBox(TxtBox * hbo
{
rstartEl(ascii("draw:text-box"), rList);
pList->clear();
-/* ?????? ????????, ?????? ?????? */
+/* If caption exists, on top of */
if( hbox->style.cap_len > 0 && (hbox->cap_pos % 2) && hbox->type ==
TBL_TYPE )
{
parsePara(hbox->caption.first());
@@ -3718,7 +3718,7 @@ void HwpReader::makeTextBox(TxtBox * hbo
{
parsePara(hbox->plists[0].first());
}
-/* ?????? ????????, ???????? ?????? */
+/* If caption exists, at the bottom */
if( hbox->style.cap_len > 0 && !(hbox->cap_pos % 2) && hbox->type ==
TBL_TYPE)
{
parsePara(hbox->caption.first());
@@ -3746,7 +3746,7 @@ void HwpReader::makeTextBox(TxtBox * hbo
/**
- * MathML?? ???????? ????.
+ * MathML should be converted.
*
*/
void HwpReader::makeFormula(TxtBox * hbox)
@@ -3804,9 +3804,9 @@ void HwpReader::makeFormula(TxtBox * hbo
/**
- * platform?????? ?????????? href?? C:\?? D:\?? ?????? ???? ????????
????????????
- * C:\ => ??????, D:\ => ????(/)?? ?????????? ?????? ????????. ??????
- * ?????? ???????????????? ???? ????????.
+ * Href platform reads the information in C: \ or D: \ if you start with Linux
or Solaris,
+ * if C: \ => Home, D: \ => root (/) is needed to convert the operation. It
+ * writes Hancomm because of the DOS emulator.
*/
void HwpReader::makeHyperText(TxtBox * hbox)
{
@@ -3849,9 +3849,9 @@ void HwpReader::makeHyperText(TxtBox * h
/**
- * platform?????? ?????????? href?? C:\?? D:\?? ?????? ???? ????????
????????????
- * C:\ => ??????, D:\ => ????(/)?? ????????. ??????
- * ?????? ???????????????? ???? ????????.
+ * Href platform reads the information in C: \ or D: \ if you start with Linux
or Solaris,
+ * if C: \ => Home, D: \ => root (/) has changed. It
+ * writes Hancomm because the DOS emulator.
*/
void HwpReader::makePicture(Picture * hbox)
{
@@ -3901,7 +3901,7 @@ void HwpReader::makePicture(Picture * hb
Double2Str(WTMM( hbox->box_ys + hbox->style.margin[1][2] +
hbox->style.margin[1][3] + hbox->cap_ys )) + ascii("mm"));
rstartEl(ascii("draw:text-box"), rList);
pList->clear();
- if( hbox->cap_pos % 2 ) /* ?????? ?????? ???????? */
+ if( hbox->cap_pos % 2 ) /* is located at the top of
the caption */
{
parsePara(hbox->caption.first());
}
@@ -4048,7 +4048,7 @@ void HwpReader::makePicture(Picture * hb
if( hbox->style.cap_len > 0 )
{
rendEl( ascii("text:p"));
- if( !(hbox->cap_pos % 2)) /* ?????? ???????? ????????,
*/
+ if( !(hbox->cap_pos % 2)) /* is located at the bottom
of the caption, */
{
parsePara(hbox->caption.first());
}
@@ -4126,13 +4126,13 @@ void HwpReader::makePictureDRAW(HWPDrawi
ZZPoint pt[3], r_pt[3];
for(i = 0 ; i < 3 ; i++ ){
pt[i].x = pal->pt[i].x -
drawobj->property.rot_originx;
- /* ???????????? ???? */
+ /* Convert to physical coordinates */
pt[i].y = -(pal->pt[i].y -
drawobj->property.rot_originy);
}
double rotate, skewX ;
- /* 2 - ?????? ???? */
+ /* 2 - Rotation calculation */
if( pt[1].x == pt[0].x ){
if( pt[1].y > pt[0].y )
rotate = PI/2;
@@ -4149,7 +4149,7 @@ void HwpReader::makePictureDRAW(HWPDrawi
r_pt[i].y = (int)(pt[i].y *
cos(-(rotate)) + pt[i].x * sin(-(rotate)));
}
- /* 4 - ???? ???? */
+ /* 4 - hwingak calculation */
if( r_pt[2].y == r_pt[1].y )
skewX = 0;
else
@@ -4187,7 +4187,7 @@ void HwpReader::makePictureDRAW(HWPDrawi
}
switch (drawobj->type)
{
- case HWPDO_LINE: /* ?? - ????????, ??????. */
+ case HWPDO_LINE: /* line - starting
coordinates, kkeutjwapyo. */
if( drawobj->u.line_arc.flip & 0x01 )
{
padd(ascii("svg:x1"), sXML_CDATA,
@@ -4221,7 +4221,7 @@ void HwpReader::makePictureDRAW(HWPDrawi
pList->clear();
rendEl(ascii("draw:line"));
break;
- case HWPDO_RECT: /* ?????? - ????????,
????/???? */
+ case HWPDO_RECT: /* rectangle - the starting
position, the horizontal / vertical */
if( !bIsRotate )
{
padd(ascii("svg:x"), sXML_CDATA,
@@ -4263,8 +4263,8 @@ void HwpReader::makePictureDRAW(HWPDrawi
}
rendEl(ascii("draw:rect"));
break;
- case HWPDO_ELLIPSE: /* ???? - ????????,
????/???? */
- case HWPDO_ADVANCED_ELLIPSE: /* ?????? ???? */
+ case HWPDO_ELLIPSE: /* ellipse - the starting
position, the horizontal / vertical */
+ case HWPDO_ADVANCED_ELLIPSE: /* ellipse */
{
if( !bIsRotate )
{
@@ -4313,10 +4313,10 @@ void HwpReader::makePictureDRAW(HWPDrawi
break;
}
- case HWPDO_ARC: /* ?? */
+ case HWPDO_ARC: /* Call */
case HWPDO_ADVANCED_ARC:
{
- /* ??????????, ???????????? ???? ?????? ?????? ????????
????. */
+ /* If the foil, Star Office is a full size of the ellipse
size. */
uint flip =
drawobj->u.line_arc.flip;
if( !bIsRotate )
{
@@ -4423,7 +4423,7 @@ void HwpReader::makePictureDRAW(HWPDrawi
break;
}
- case HWPDO_CURVE: /* ???? : ?????????? ????. */
+ case HWPDO_CURVE: /* Curve converted to polygons. */
{
sal_Bool bIsNatural = sal_True;
// os unused
@@ -4531,7 +4531,7 @@ void HwpReader::makePictureDRAW(HWPDrawi
break;
}
case HWPDO_CLOSED_FREEFORM:
- case HWPDO_FREEFORM: /* ?????? */
+ case HWPDO_FREEFORM: /* Polygon */
{
bool bIsPolygon = false;
@@ -4674,8 +4674,8 @@ void HwpReader::makeLine(Line * )
/**
- * ????-????-???????? : ?????????? ???? ?????? ????????.
- * ?????? ?????? ?? ??????, ???? ???????? ???????? ????????.
+ * Input - comments - Hidden Description: The description shows the hidden to
the user.
+ * Paragraph may include, but pulled out just a character string to parse.
*/
void HwpReader::makeHidden(Hidden * hbox)
{
@@ -4705,7 +4705,11 @@ void HwpReader::makeHidden(Hidden * hbox
/**
- * ?????? text:footnote, ?????? text:endnote?? ????
+ * ÀÌ¹Ì master-page¿¡¼ ÀÛ¾÷ÀÌ µÇ¾ú±â ¶§¹®¿¡ µû·Î ÀÛ¾÷ÇÒ ÇÊ¿ä°¡ ¾ø´Ù.
+ * TODO : ³ªÁß¿¡ ¼Ò½ºÁ¤¸®ÇÒ¶§ Á¦°Å.
+ */
+/**
+ * Footnote text: footnote, endnotes text: endnote to convert
*/
void HwpReader::makeFootnote(Footnote * hbox)
{
@@ -4813,7 +4817,7 @@ void HwpReader::makeShowPageNum()
nPos = 2;
else if( hbox->where == 3 || hbox->where == 6 )
nPos = 3;
- else /* ?? ?????? ????????
??????. */
+ else /* In this case it should
not exist. */
{
if( d->nPnPos == 1 )
nPos = 1;
@@ -4909,7 +4913,7 @@ void HwpReader::parsePara(HWPPara * para
if( d->bFirstPara && d->bInBody )
{
/* for HWP's Bookmark */
- strcpy(buf,"[?????? ????]");
+ strcpy(buf,"[¹®¼ÀÇ Ã³À½]");
padd(ascii("text:name"), sXML_CDATA, OUString(buf,
strlen(buf), RTL_TEXTENCODING_EUC_KR));
rstartEl(ascii("text:bookmark"), rList);
pList->clear();
