[Libreoffice-commits] .: hwpfilter/source
Noel Power
noelp at kemper.freedesktop.org
Wed Jun 1 07:10:58 PDT 2011
hwpfilter/source/hpara.cpp | 6
hwpfilter/source/hwpreader.cxx | 276 ++++++++++++++++++++---------------------
2 files changed, 141 insertions(+), 141 deletions(-)
New commits:
commit 6887101c48733f85e1f2f9f1dc06524ebfae8c38
Author: Christian Lohmaier <lohmaier+LibreOffice at googlemail.com>
Date: Tue May 31 19:55:51 2011 +0200
restore Korean comments that were smashed to just ? by 6dfe3457faf4bef4b7080d9f0df31b8aff693380
diff --git a/hwpfilter/source/hpara.cpp b/hwpfilter/source/hpara.cpp
index 9b04594..2ad6202 100644
--- a/hwpfilter/source/hpara.cpp
+++ b/hwpfilter/source/hpara.cpp
@@ -81,7 +81,7 @@ HWPPara::~HWPPara(void)
if (hhstr)
{
// virtual destructor
-/* C++?? null?? ???????? ????????. */
+/* C++ì nullì ëí´ìë ëìíë¤. */
for (ii = 0; ii < nch; ++ii)
delete hhstr[ii];
@@ -106,12 +106,12 @@ int HWPPara::Read(HWPFile & hwpf, unsigned char flag)
hwpf.Read1b(&pstyno, 1);
-/* Paragraph ???? ???? */
+/* Paragraph ëí ê¸ì */
cshape.Read(hwpf);
if (nch > 0)
hwpf.AddCharShape(&cshape);
-/* Paragraph ???? ???? */
+/* Paragraph ë¬¸ë¨ ëª¨ì */
if (nch && !reuse_shape)
{
pshape.Read(hwpf);
diff --git a/hwpfilter/source/hwpreader.cxx b/hwpfilter/source/hwpreader.cxx
index d46e2a3..37e6cb0 100644
--- a/hwpfilter/source/hwpreader.cxx
+++ b/hwpfilter/source/hwpreader.cxx
@@ -627,8 +627,8 @@ void HwpReader::makeDrawMiscStyle( HWPDrawingObject *hdo )
pList->clear();
rendEl( ascii("draw:fill-image"));
}
-/* ???????????? ????????, ???????????? ????????, ?????? ????????. */
- else if( prop->flag >> 16 & 0x01 ) /* ?????????? ???????? */
+/* ê·¸ë¼ë°ì´ì
ì´ ì¡´ì¬í´ë, ë¹í¸ë§µíì¼ì´ ì¡´ì¬íë©´, ì´ê²ì´ ì°ì ì´ë¤. */
+ else if( prop->flag >> 16 & 0x01 ) /* ê·¸ë¼ë°ì´ì
ì¡´ì¬ì¬ë¶ */
{
padd( ascii("draw:name"), sXML_CDATA, ascii(Int2Str(hdo->index, "Grad%d", buf)));
switch( prop->gstyle )
@@ -710,7 +710,7 @@ void HwpReader::makeDrawMiscStyle( HWPDrawingObject *hdo )
pList->clear();
rendEl( ascii("draw:gradient"));
}
- /* ???? */
+ /* í´ì¹ */
else if( prop->pattern_type >> 24 & 0x01 )
{
int type = prop->pattern_type & 0xffffff;
@@ -874,8 +874,8 @@ void HwpReader::makeStyles()
/**
* parse automatic styles from hwpfile
- * ?????????? ?????? ???? ???????? ????????. ???????? ?????? ????????, ??????, ???? ?????? ???????? ???????? ????????, Body?????? ?????? ?????? ???????? ????????.
- * 1. paragraph, text, fbox, page???????? ???? ????????.
+ * ìëì ì¼ë¡ ë°ìì´ ëë ì¤íì¼ì ì ìíë¤. ì를ë¤ì´ ê°ê°ì 문ë¨ì´ë, í
ì´ë¸, í¤ë ë±ë±ì ì¤íì¼ì ì´ê³³ìì ì ìíê³ , Bodyììë ì´ê³³ì ì ìë ì¤íì¼ì ì´ì©íë¤.
+ * 1. paragraph, text, fbox, pageì¤íì¼ì ëí´ ì§ìíë¤.
*/
void HwpReader::makeAutoStyles()
{
@@ -1106,7 +1106,7 @@ void HwpReader::makeMasterStyles()
rstartEl(ascii("style:master-page"), rList);
pList->clear();
- if( pSet[i].bIsSet ) /* ???? ?????? ?????????? */
+ if( pSet[i].bIsSet ) /* íì¬ ì¤ì ì´ ë°ëìì¼ë©´ */
{
if( !pSet[i].pagenumber ){
if( pPrevSet && pPrevSet->pagenumber )
@@ -1148,11 +1148,11 @@ void HwpReader::makeMasterStyles()
pPage = &pSet[i];
pPrevSet = &pSet[i];
}
- else if( pPrevSet ) /* ?????? ?????? ???? ??????. */
+ else if( pPrevSet ) /* ì´ì ì ì¤ì ë ê²ì´ ìì¼ë©´. */
{
pPage = pPrevSet;
}
- else /* ???? ?????? ?????? ???????????? */
+ else /* ìì§ ì¤ì ì´ ìë¤ë©´ 기본ì¤ì ì¼ë¡ */
{
rstartEl(ascii("style:header"), rList);
padd(ascii("text:style-name"), sXML_CDATA, ascii("Standard"));
@@ -1202,7 +1202,7 @@ void HwpReader::makeMasterStyles()
d->nPnPos = 0;
rendEl(ascii("style:header"));
}
- /* ???????? ????. */
+ /* 기본ì¼ë¡ íë¤. */
else if( pPage->header_odd && !pPage->header_even )
{
rstartEl(ascii("style:header"), rList);
@@ -1237,7 +1237,7 @@ void HwpReader::makeMasterStyles()
d->nPnPos = 0;
rendEl(ascii("style:header-left"));
}
- /* ???????? ????. */
+ /* 기본ì¼ë¡ íë¤. */
else if( pPage->header_even && !pPage->header_odd )
{
rstartEl(ascii("style:header-left"), rList);
@@ -1303,7 +1303,7 @@ void HwpReader::makeMasterStyles()
d->nPnPos = 0;
rendEl(ascii("style:footer"));
}
- /* ???????? ????. */
+ /* 기본ì¼ë¡ íë¤. */
else if( pPage->footer_odd && !pPage->footer_even )
{
rstartEl(ascii("style:footer"), rList);
@@ -1338,7 +1338,7 @@ void HwpReader::makeMasterStyles()
d->nPnPos = 0;
rendEl(ascii("style:footer-left"));
}
- /* ???????? ????. */
+ /* 기본ì¼ë¡ íë¤. */
else if( pPage->footer_even && !pPage->footer_odd )
{
rstartEl(ascii("style:footer-left"), rList);
@@ -1381,11 +1381,11 @@ void HwpReader::makeMasterStyles()
/**
- * ?????? ???????? ???? ???????????? ??????.
+ * í
ì¤í¸ ì¤íì¼ì ìí íë¡í¼í°ë¤ì ë§ë ë¤.
* 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
- * ?? ????????.
+ * ì ì§ìíë¤.
*/
void HwpReader::parseCharShape(CharShape * cshape)
{
@@ -1455,11 +1455,11 @@ void HwpReader::parseCharShape(CharShape * cshape)
/**
- * ???? Paragraph?? ???????? properties???? ??????.
+ * ì¤ì Paragraphì í´ë¹íë 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 : ?????? => ???????? ?????????? ?????????? ???????? ????.
+ * ê° êµ¬íë¨.
+ * TODO : íì¤ì => 기본ê°ì´ ìëê²ë¤ë§ ì íì ì¼ë¡ ì¤ì í´ì¼ íë¤.
*/
void HwpReader::parseParaShape(ParaShape * pshape)
{
@@ -1527,7 +1527,7 @@ void HwpReader::parseParaShape(ParaShape * pshape)
/**
- * Paragraph?? ???? ???????? ??????.
+ * Paragraphì ëí ì¤íì¼ì ë§ë ë¤.
*/
void HwpReader::makePStyle(ParaShape * pshape)
{
@@ -1597,8 +1597,8 @@ void HwpReader::makePStyle(ParaShape * pshape)
/**
- * ???????? ???????? ??????. ???????? header/footer, footnote???? ????????.
- * TODO : , fo:background-color(?????? ????)
+ * íì´ì§ì ì¤íì¼ì ë§ë ë¤. ì¬ê¸°ìë header/footer, footnoteë±ì´ í¬í¨ëë¤.
+ * TODO : , fo:background-color(ì ë³´ê° ìë¤)
*/
void HwpReader::makePageStyle()
{
@@ -1831,7 +1831,7 @@ void HwpReader::makePageStyle()
rendEl(ascii("style:properties"));
rendEl(ascii("style:footer-style"));
- /* footnote style ???? dtd?????? ????????, ???????? ???????? ????. REALKING */
+ /* footnote style ì´ê±´ dtdììë ë¹ ì¡ì¼ë, ì¤íìë ì ìëì´ ìë¤. REALKING */
rstartEl(ascii("style:footnote-layout"), rList);
padd(ascii("style:distance-before-sep"), sXML_CDATA,
@@ -1870,17 +1870,17 @@ void HwpReader::makeColumns(ColumnDef *coldef)
{
switch( coldef->separator )
{
- case 1: /* ?????? */
+ case 1: /* ììì */
padd(ascii("style:width"), sXML_CDATA, ascii("0.02mm"));
- case 3: /* ???? */
+ case 3: /* ì ì */
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: /* ë꺼ì´ì */
+ case 4: /* 2ì¤ì */
padd(ascii("style:width"), sXML_CDATA, ascii("0.35mm"));
break;
- case 0: /* ???? */
+ case 0: /* ìì */
default:
padd(ascii("style:style"), sXML_CDATA, ascii("none"));
break;
@@ -1994,14 +1994,14 @@ void HwpReader::makeTableStyle(Table *tbl)
{
switch( cl->linetype[2] )
{
- case 1: /* ???????? */
- case 3: /* ???? -> ?????????????? ?????? ????. */
+ case 1: /* ê°ëì¤ì */
+ case 3: /* ì ì -> ì¤íì¤í¼ì¤ìë ì ì ì´ ìë¤. */
padd(ascii("fo:border"), sXML_CDATA,ascii("0.002cm solid #000000"));
break;
- case 2: /* ???????? */
+ case 2: /* êµµìì¤ì */
padd(ascii("fo:border"), sXML_CDATA,ascii("0.035cm solid #000000"));
break;
- case 4: /* 2???? */
+ case 4: /* 2ì¤ì */
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;
@@ -2011,56 +2011,56 @@ void HwpReader::makeTableStyle(Table *tbl)
{
switch( cl->linetype[0] )
{
- case 1: /* ???????? */
- case 3: /* ???? -> ?????????????? ?????? ????. */
+ case 1: /* ê°ëì¤ì */
+ case 3: /* ì ì -> ì¤íì¤í¼ì¤ìë ì ì ì´ ìë¤. */
padd(ascii("fo:border-left"), sXML_CDATA,ascii("0.002cm solid #000000"));
break;
- case 2: /* ???????? */
+ case 2: /* êµµìì¤ì */
padd(ascii("fo:border-left"), sXML_CDATA,ascii("0.035cm solid #000000"));
break;
- case 4: /* 2???? */
+ case 4: /* 2ì¤ì */
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: /* ê°ëì¤ì */
+ case 3: /* ì ì -> ì¤íì¤í¼ì¤ìë ì ì ì´ ìë¤. */
padd(ascii("fo:border-right"), sXML_CDATA,ascii("0.002cm solid #000000"));
break;
- case 2: /* ???????? */
+ case 2: /* êµµìì¤ì */
padd(ascii("fo:border-right"), sXML_CDATA,ascii("0.035cm solid #000000"));
break;
- case 4: /* 2???? */
+ case 4: /* 2ì¤ì */
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: /* ê°ëì¤ì */
+ case 3: /* ì ì -> ì¤íì¤í¼ì¤ìë ì ì ì´ ìë¤. */
padd(ascii("fo:border-top"), sXML_CDATA,ascii("0.002cm solid #000000"));
break;
- case 2: /* ???????? */
+ case 2: /* êµµìì¤ì */
padd(ascii("fo:border-top"), sXML_CDATA,ascii("0.035cm solid #000000"));
break;
- case 4: /* 2???? */
+ case 4: /* 2ì¤ì */
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: /* ê°ëì¤ì */
+ case 3: /* ì ì -> ì¤íì¤í¼ì¤ìë ì ì ì´ ìë¤. */
padd(ascii("fo:border-bottom"), sXML_CDATA,ascii("0.002cm solid #000000"));
break;
- case 2: /* ???????? */
+ case 2: /* êµµìì¤ì */
padd(ascii("fo:border-bottom"), sXML_CDATA,ascii("0.035cm solid #000000"));
break;
- case 4: /* 2???? */
+ case 4: /* 2ì¤ì */
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;
@@ -2405,14 +2405,14 @@ void HwpReader::makeCaptionStyle(FBoxStyle * fstyle)
case 0:
padd(ascii("fo:padding"), sXML_CDATA,ascii("0mm"));
break;
- case 1: /* ???????? */
- case 3: /* ???? -> ?????????????? ?????? ????. */
+ case 1: /* ê°ëì¤ì */
+ case 3: /* ì ì -> ì¤íì¤í¼ì¤ìë ì ì ì´ ìë¤. */
padd(ascii("fo:border"), sXML_CDATA,ascii("0.002cm solid #000000"));
break;
- case 2: /* ???????? */
+ case 2: /* êµµìì¤ì */
padd(ascii("fo:border"), sXML_CDATA,ascii("0.035cm solid #000000"));
break;
- case 4: /* 2???? */
+ case 4: /* 2ì¤ì */
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;
@@ -2422,56 +2422,56 @@ void HwpReader::makeCaptionStyle(FBoxStyle * fstyle)
{
switch( cell->linetype[0] )
{
- case 1: /* ???????? */
- case 3: /* ???? -> ?????????????? ?????? ????. */
+ case 1: /* ê°ëì¤ì */
+ case 3: /* ì ì -> ì¤íì¤í¼ì¤ìë ì ì ì´ ìë¤. */
padd(ascii("fo:border-left"), sXML_CDATA,ascii("0.002cm solid #000000"));
break;
- case 2: /* ???????? */
+ case 2: /* êµµìì¤ì */
padd(ascii("fo:border-left"), sXML_CDATA,ascii("0.035cm solid #000000"));
break;
- case 4: /* 2???? */
+ case 4: /* 2ì¤ì */
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: /* ê°ëì¤ì */
+ case 3: /* ì ì -> ì¤íì¤í¼ì¤ìë ì ì ì´ ìë¤. */
padd(ascii("fo:border-right"), sXML_CDATA,ascii("0.002cm solid #000000"));
break;
- case 2: /* ???????? */
+ case 2: /* êµµìì¤ì */
padd(ascii("fo:border-right"), sXML_CDATA,ascii("0.035cm solid #000000"));
break;
- case 4: /* 2???? */
+ case 4: /* 2ì¤ì */
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: /* ê°ëì¤ì */
+ case 3: /* ì ì -> ì¤íì¤í¼ì¤ìë ì ì ì´ ìë¤. */
padd(ascii("fo:border-top"), sXML_CDATA,ascii("0.002cm solid #000000"));
break;
- case 2: /* ???????? */
+ case 2: /* êµµìì¤ì */
padd(ascii("fo:border-top"), sXML_CDATA,ascii("0.035cm solid #000000"));
break;
- case 4: /* 2???? */
+ case 4: /* 2ì¤ì */
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: /* ê°ëì¤ì */
+ case 3: /* ì ì -> ì¤íì¤í¼ì¤ìë ì ì ì´ ìë¤. */
padd(ascii("fo:border-bottom"), sXML_CDATA,ascii("0.002cm solid #000000"));
break;
- case 2: /* ???????? */
+ case 2: /* êµµìì¤ì */
padd(ascii("fo:border-bottom"), sXML_CDATA,ascii("0.035cm solid #000000"));
break;
- case 4: /* 2???? */
+ case 4: /* 2ì¤ì */
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;
@@ -2490,11 +2490,11 @@ void HwpReader::makeCaptionStyle(FBoxStyle * fstyle)
/**
- * Floating ?????? ???? ???????? ??????.
+ * Floating ê°ì²´ì ëí ì¤íì¼ì ë§ë ë¤.
*/
void HwpReader::makeFStyle(FBoxStyle * fstyle)
{
- /* ???? exist */
+ /* 캡ì
exist */
if( ( fstyle->boxtype == 'G' || fstyle->boxtype == 'X' ) && fstyle->cap_len > 0 )
{
makeCaptionStyle(fstyle);
@@ -2616,14 +2616,14 @@ void HwpReader::makeFStyle(FBoxStyle * fstyle)
case 0:
padd(ascii("fo:border"), sXML_CDATA, ascii("none"));
break;
- case 1: /* ???????? */
- case 3: /* ???? -> ?????????????? ?????? ????. */
+ case 1: /* ê°ëì¤ì */
+ case 3: /* ì ì -> ì¤íì¤í¼ì¤ìë ì ì ì´ ìë¤. */
padd(ascii("fo:border"), sXML_CDATA,ascii("0.002cm solid #000000"));
break;
- case 2: /* ???????? */
+ case 2: /* êµµìì¤ì */
padd(ascii("fo:border"), sXML_CDATA,ascii("0.035cm solid #000000"));
break;
- case 4: /* 2???? */
+ case 4: /* 2ì¤ì */
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;
@@ -2633,56 +2633,56 @@ void HwpReader::makeFStyle(FBoxStyle * fstyle)
{
switch( cell->linetype[0] )
{
- case 1: /* ???????? */
- case 3: /* ???? -> ?????????????? ?????? ????. */
+ case 1: /* ê°ëì¤ì */
+ case 3: /* ì ì -> ì¤íì¤í¼ì¤ìë ì ì ì´ ìë¤. */
padd(ascii("fo:border-left"), sXML_CDATA,ascii("0.002cm solid #000000"));
break;
- case 2: /* ???????? */
+ case 2: /* êµµìì¤ì */
padd(ascii("fo:border-left"), sXML_CDATA,ascii("0.035cm solid #000000"));
break;
- case 4: /* 2???? */
+ case 4: /* 2ì¤ì */
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: /* ê°ëì¤ì */
+ case 3: /* ì ì -> ì¤íì¤í¼ì¤ìë ì ì ì´ ìë¤. */
padd(ascii("fo:border-right"), sXML_CDATA,ascii("0.002cm solid #000000"));
break;
- case 2: /* ???????? */
+ case 2: /* êµµìì¤ì */
padd(ascii("fo:border-right"), sXML_CDATA,ascii("0.035cm solid #000000"));
break;
- case 4: /* 2???? */
+ case 4: /* 2ì¤ì */
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: /* ê°ëì¤ì */
+ case 3: /* ì ì -> ì¤íì¤í¼ì¤ìë ì ì ì´ ìë¤. */
padd(ascii("fo:border-top"), sXML_CDATA,ascii("0.002cm solid #000000"));
break;
- case 2: /* ???????? */
+ case 2: /* êµµìì¤ì */
padd(ascii("fo:border-top"), sXML_CDATA,ascii("0.035cm solid #000000"));
break;
- case 4: /* 2???? */
+ case 4: /* 2ì¤ì */
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: /* ê°ëì¤ì */
+ case 3: /* ì ì -> ì¤íì¤í¼ì¤ìë ì ì ì´ ìë¤. */
padd(ascii("fo:border-bottom"), sXML_CDATA,ascii("0.002cm solid #000000"));
break;
- case 2: /* ???????? */
+ case 2: /* êµµìì¤ì */
padd(ascii("fo:border-bottom"), sXML_CDATA,ascii("0.035cm solid #000000"));
break;
- case 4: /* 2???? */
+ case 4: /* 2ì¤ì */
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;
@@ -2774,7 +2774,7 @@ void HwpReader::makeChars(hchar *str, int size)
/**
- * ???????? ?????????? ???? ???? ?????? ?????? CharShape?? ???????? ????
+ * 문ë¨ë´ì í¹ì문ìê° ìê³ ëª¨ë 문ìê° ëì¼í CharShape를 ì¬ì©íë ê²½ì°
*/
void HwpReader::make_text_p0(HWPPara * para, sal_Bool bParaStart)
{
@@ -2791,8 +2791,8 @@ void HwpReader::make_text_p0(HWPPara * para, sal_Bool bParaStart)
}
if( d->bFirstPara && d->bInBody )
{
- strcpy(buf,"[?????? ????]");
- padd(ascii("text:name"), sXML_CDATA, OUString(buf, strlen(buf), RTL_TEXTENCODING_EUC_KR));
+ strcpy(buf,"[문ìì ì²ì]"); /* "Begin of Document" */
+ padd(ascii("text:name"), sXML_CDATA, OUString(buf, strlen(buf), RTL_TEXTENCODING_UTF8));
rstartEl(ascii("text:bookmark"), rList);
pList->clear();
rendEl(ascii("text:bookmark"));
@@ -2841,7 +2841,7 @@ void HwpReader::make_text_p0(HWPPara * para, sal_Bool bParaStart)
/**
- * ???????? ?????????? ?????? ???????? ???? CharShape?? ???????? ????
+ * 문ë¨ë´ì í¹ì문ìê° ìì¼ë 문ìë¤ì´ ë¤ë¥¸ CharShape를 ì¬ì©íë ê²½ì°
*/
void HwpReader::make_text_p1(HWPPara * para,sal_Bool bParaStart)
{
@@ -2861,8 +2861,8 @@ void HwpReader::make_text_p1(HWPPara * para,sal_Bool bParaStart)
if( d->bFirstPara && d->bInBody )
{
/* for HWP's Bookmark */
- strcpy(buf,"[?????? ????]");
- padd(ascii("text:name"), sXML_CDATA, OUString(buf, strlen(buf), RTL_TEXTENCODING_EUC_KR));
+ strcpy(buf,"[문ìì ì²ì]"); /* "Begin of Document" */
+ padd(ascii("text:name"), sXML_CDATA, OUString(buf, strlen(buf), RTL_TEXTENCODING_UTF8));
rstartEl(ascii("text:bookmark"), rList);
pList->clear();
rendEl(ascii("text:bookmark"));
@@ -2924,7 +2924,7 @@ void HwpReader::make_text_p1(HWPPara * para,sal_Bool bParaStart)
/**
- * ???? ???? ?????????? ?????? ???????? ???? CharShape?? ???? ?????? ???? ????
+ * ë¬¸ë¨ ë´ì í¹ì문ìê° ìì¼ë©° 문ìë¤ì´ ë¤ë¥¸ CharShape를 ê°ë ê²½ì°ì ëí´ ì²ë¦¬
*/
void HwpReader::make_text_p3(HWPPara * para,sal_Bool bParaStart)
{
@@ -2940,8 +2940,8 @@ void HwpReader::make_text_p3(HWPPara * para,sal_Bool bParaStart)
{
if( !pstart )
STARTP;
- strcpy(buf,"[?????? ????]");
- padd(ascii("text:name"), sXML_CDATA, OUString(buf, strlen(buf), RTL_TEXTENCODING_EUC_KR));
+ strcpy(buf,"[문ìì ì²ì]"); /* "Begin of Document" */
+ padd(ascii("text:name"), sXML_CDATA, OUString(buf, strlen(buf), RTL_TEXTENCODING_UTF8));
rstartEl(ascii("text:bookmark"), rList);
pList->clear();
rendEl(ascii("text:bookmark"));
@@ -3063,9 +3063,9 @@ void HwpReader::make_text_p3(HWPPara * para,sal_Bool bParaStart)
}
makeTab((Tab *) para->hhstr[n]);
break;
- case CH_TEXT_BOX: /* 10 - ??/??????????/????/????/???????????? ?? */
+ case CH_TEXT_BOX: /* 10 - í/í
ì¤í¸ë°ì¤/ìì/ë²í¼/íì´í¼í
ì¤í¸ ì */
{
-/* ?????? ???? ????????, ?????? text:p???? ???????? ?????? ????. */
+/* ì¼ë¨ì íë§ ì²ë¦¬íê³ , ììì text:pìì ë¤ì´ê°ë ê²ì¼ë¡ ì²ë¦¬. */
TxtBox *hbox = (TxtBox *) para->hhstr[n];
if( hbox->style.anchor_type == 0 )
@@ -3172,11 +3172,11 @@ void HwpReader::make_text_p3(HWPPara * para,sal_Bool bParaStart)
l = 0;
makeMailMerge((MailMerge *) para->hhstr[n]);
break;
- case CH_COMPOSE: /* 23 - ???????? */
+ case CH_COMPOSE: /* 23 - ê¸ì겹침 */
break;
case CH_HYPHEN: // 24
break;
- case CH_TOC_MARK: /* 25 ?????? 3???? ???????? ????. */
+ case CH_TOC_MARK: /* 25 ìëì 3ê°ë ìì
í´ì¼ íë¤. */
if( !pstart ) {STARTP;}
if( !tstart ) {STARTT;}
makeChars(gstr, l);
@@ -3209,7 +3209,7 @@ void HwpReader::make_text_p3(HWPPara * para,sal_Bool bParaStart)
void HwpReader::makeFieldCode(FieldCode *hbox)
{
-/* ?????? */
+/* ëë¦í */
if( hbox->type[0] == 4 && hbox->type[1] == 0 )
{
padd(ascii("text:placeholder-type"), sXML_CDATA, ascii("text"));
@@ -3220,7 +3220,7 @@ void HwpReader::makeFieldCode(FieldCode *hbox)
rchars( OUString(gstr));
rendEl( ascii("text:placeholder") );
}
-/* ???????? */
+/* 문ììì½ */
else if( hbox->type[0] == 3 && hbox->type[1] == 0 )
{
if( hconv( hbox->str3, gstr ).equals(OUString(RTL_CONSTASCII_USTRINGPARAM("title"))))
@@ -3248,7 +3248,7 @@ void HwpReader::makeFieldCode(FieldCode *hbox)
rendEl( ascii("text:keywords") );
}
}
-/* ???????? */
+/* ê°ì¸ì ë³´ */
else if( hbox->type[0] == 3 && hbox->type[1] == 1 )
{
if( hconv( hbox->str3, gstr ).equals(OUString(RTL_CONSTASCII_USTRINGPARAM("User"))))
@@ -3313,7 +3313,7 @@ void HwpReader::makeFieldCode(FieldCode *hbox)
}
}
- else if( hbox->type[0] == 3 && hbox->type[1] == 2 ) /* ???????? */
+ else if( hbox->type[0] == 3 && hbox->type[1] == 2 ) /* ë§ë ë ì§ */
{
if( hbox->m_pDate )
padd(ascii("style:data-style-name"), sXML_CDATA,
@@ -3328,7 +3328,7 @@ void HwpReader::makeFieldCode(FieldCode *hbox)
/**
* Completed
- * ???????????????? ???????? Reference?? ???????? hwp???? ?? ?????? ????.
+ * ì¤íì¤í¼ì¤ììë ë¶ë§í¬ë¥¼ Referenceë¡ ì°¸ì¡°íë hwpìë ê·¸ 기ë¥ì´ ìë¤.
*/
void HwpReader::makeBookmark(Bookmark * hbox)
{
@@ -3339,7 +3339,7 @@ void HwpReader::makeBookmark(Bookmark * hbox)
pList->clear();
rendEl(ascii("text:bookmark"));
}
- else if (hbox->type == 1) /* ???? ???????? ???? ?????? ???? ???? */
+ else if (hbox->type == 1) /* ë¸ë¡ ë¶ë§í¬ì¼ ê²½ì° ììê³¼ ëì´ ìë¤ */
{
padd(ascii("text:name"), sXML_CDATA, (hconv(hbox->id, gstr)));
rstartEl(ascii("text:bookmark-start"), rList);
@@ -3596,10 +3596,10 @@ void HwpReader::makeTable(TxtBox * hbox)
/**
- * ???????????? ???????? ????????.
+ * í
ì¤í¸ë°ì¤ì í
ì´ë¸ì íì±íë¤.
* 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ë¡ ì
ì ì¹¼ë¼ ì¤ì =>ì¤íì¼ì ë¤ì´ê°ë ì§ ìì§ ëª¨ë¥´ê² ë¤.
*/
void HwpReader::makeTextBox(TxtBox * hbox)
{
@@ -3641,7 +3641,7 @@ void HwpReader::makeTextBox(TxtBox * hbox)
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 ) /* 캡ì
ì´ ì쪽ì ìì¹íë¤ */
{
parsePara(hbox->caption.first());
}
@@ -3708,7 +3708,7 @@ void HwpReader::makeTextBox(TxtBox * hbox)
{
rstartEl(ascii("draw:text-box"), rList);
pList->clear();
-/* ?????? ????????, ?????? ?????? */
+/* 캡ì
ì´ ì¡´ì¬íê³ , ì쪽ì ìì¼ë©´ */
if( hbox->style.cap_len > 0 && (hbox->cap_pos % 2) && hbox->type == TBL_TYPE )
{
parsePara(hbox->caption.first());
@@ -3721,7 +3721,7 @@ void HwpReader::makeTextBox(TxtBox * hbox)
{
parsePara(hbox->plists[0].first());
}
-/* ?????? ????????, ???????? ?????? */
+/* 캡ì
ì´ ì¡´ì¬íê³ , ìë쪽ì ìì¼ë©´ */
if( hbox->style.cap_len > 0 && !(hbox->cap_pos % 2) && hbox->type == TBL_TYPE)
{
parsePara(hbox->caption.first());
@@ -3749,7 +3749,7 @@ void HwpReader::makeTextBox(TxtBox * hbox)
/**
- * MathML?? ???????? ????.
+ * MathMLë¡ ë³íí´ì¼ íë¤.
*
*/
void HwpReader::makeFormula(TxtBox * hbox)
@@ -3807,9 +3807,9 @@ void HwpReader::makeFormula(TxtBox * hbox)
/**
- * platform?????? ?????????? href?? C:\?? D:\?? ?????? ???? ???????? ????????????
- * C:\ => ??????, D:\ => ????(/)?? ?????????? ?????? ????????. ??????
- * ?????? ???????????????? ???? ????????.
+ * platformì 보를 ì½ì´ë¤ì¬ì hrefê° C:\ë D:\ë¡ ììí ê²½ì° ë¦¬ë
ì¤ë ìë¼ë¦¬ì¤ì´ë©´
+ * C:\ => íì¼ë¡, D:\ => 루í¸(/)ë¡ ë°ê¾¸ì´ì£¼ë ìì
ì´ íìíë¤. ì´ê²ì
+ * íì»´ì´ ëì¤ì뮬ë ì´í°ë¥¼ ì°ê¸° ë문ì´ë¤.
*/
void HwpReader::makeHyperText(TxtBox * hbox)
{
@@ -3852,9 +3852,9 @@ void HwpReader::makeHyperText(TxtBox * hbox)
/**
- * platform?????? ?????????? href?? C:\?? D:\?? ?????? ???? ???????? ????????????
- * C:\ => ??????, D:\ => ????(/)?? ????????. ??????
- * ?????? ???????????????? ???? ????????.
+ * platformì 보를 ì½ì´ë¤ì¬ì hrefê° C:\ë D:\ë¡ ììí ê²½ì° ë¦¬ë
ì¤ë ìë¼ë¦¬ì¤ì´ë©´
+ * C:\ => íì¼ë¡, D:\ => 루í¸(/)ë¡ ë°ê¾¸ìë¤. ì´ê²ì
+ * íì»´ì´ ëì¤ì뮬ë ì´í°ë¥¼ ì°ê¸° ë문ì´ë¤.
*/
void HwpReader::makePicture(Picture * hbox)
{
@@ -3902,7 +3902,7 @@ void HwpReader::makePicture(Picture * hbox)
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 ) /* 캡ì
ì´ ì쪽ì ìì¹íë¤ */
{
parsePara(hbox->caption.first());
}
@@ -4047,7 +4047,7 @@ void HwpReader::makePicture(Picture * hbox)
if( hbox->style.cap_len > 0 )
{
rendEl( ascii("text:p"));
- if( !(hbox->cap_pos % 2)) /* ?????? ???????? ????????, */
+ if( !(hbox->cap_pos % 2)) /* 캡ì
ì´ ìë쪽ì ìì¹íë©´, */
{
parsePara(hbox->caption.first());
}
@@ -4125,13 +4125,13 @@ void HwpReader::makePictureDRAW(HWPDrawingObject *drawobj, Picture * hbox)
ZZPoint pt[3], r_pt[3];
for(i = 0 ; i < 3 ; i++ ){
pt[i].x = pal->pt[i].x - drawobj->property.rot_originx;
- /* ???????????? ???? */
+ /* 물리ì¢íê³ë¡ ë³í */
pt[i].y = -(pal->pt[i].y - drawobj->property.rot_originy);
}
double rotate, skewX ;
- /* 2 - ?????? ???? */
+ /* 2 - íì ê° ê³ì° */
if( pt[1].x == pt[0].x ){
if( pt[1].y > pt[0].y )
rotate = PI/2;
@@ -4148,7 +4148,7 @@ void HwpReader::makePictureDRAW(HWPDrawingObject *drawobj, Picture * hbox)
r_pt[i].y = (int)(pt[i].y * cos(-(rotate)) + pt[i].x * sin(-(rotate)));
}
- /* 4 - ???? ???? */
+ /* 4 - íê° ê³ì° */
if( r_pt[2].y == r_pt[1].y )
skewX = 0;
else
@@ -4186,7 +4186,7 @@ void HwpReader::makePictureDRAW(HWPDrawingObject *drawobj, Picture * hbox)
}
switch (drawobj->type)
{
- case HWPDO_LINE: /* ?? - ????????, ??????. */
+ case HWPDO_LINE: /* ì - ììì¢í, ëì¢í. */
if( drawobj->u.line_arc.flip & 0x01 )
{
padd(ascii("svg:x1"), sXML_CDATA,
@@ -4220,7 +4220,7 @@ void HwpReader::makePictureDRAW(HWPDrawingObject *drawobj, Picture * hbox)
pList->clear();
rendEl(ascii("draw:line"));
break;
- case HWPDO_RECT: /* ?????? - ????????, ????/???? */
+ case HWPDO_RECT: /* ì¬ê°í - ìììì¹, ê°ë¡/ì¸ë¡ */
if( !bIsRotate )
{
padd(ascii("svg:x"), sXML_CDATA,
@@ -4262,8 +4262,8 @@ void HwpReader::makePictureDRAW(HWPDrawingObject *drawobj, Picture * hbox)
}
rendEl(ascii("draw:rect"));
break;
- case HWPDO_ELLIPSE: /* ???? - ????????, ????/???? */
- case HWPDO_ADVANCED_ELLIPSE: /* ?????? ???? */
+ case HWPDO_ELLIPSE: /* íì - ìììì¹, ê°ë¡/ì¸ë¡ */
+ case HWPDO_ADVANCED_ELLIPSE: /* ë³íë íì */
{
if( !bIsRotate )
{
@@ -4312,10 +4312,10 @@ void HwpReader::makePictureDRAW(HWPDrawingObject *drawobj, Picture * hbox)
break;
}
- case HWPDO_ARC: /* ?? */
+ case HWPDO_ARC: /* í¸ */
case HWPDO_ADVANCED_ARC:
{
- /* ??????????, ???????????? ???? ?????? ?????? ???????? ????. */
+ /* í¸ì¼ê²½ì°ì, ì¤íì¤í¼ì¤ë ì ì²´ íìì í¬ê¸°ë¥¼ ì¬ì´ì¦ë¡ íë¤. */
uint flip = drawobj->u.line_arc.flip;
if( !bIsRotate )
{
@@ -4422,7 +4422,7 @@ void HwpReader::makePictureDRAW(HWPDrawingObject *drawobj, Picture * hbox)
break;
}
- case HWPDO_CURVE: /* ???? : ?????????? ????. */
+ case HWPDO_CURVE: /* 곡ì : ë¤ê°íì¼ë¡ ë³í. */
{
sal_Bool bIsNatural = sal_True;
if( drawobj->property.flag >> 5 & 0x01){
@@ -4538,7 +4538,7 @@ void HwpReader::makePictureDRAW(HWPDrawingObject *drawobj, Picture * hbox)
break;
}
case HWPDO_CLOSED_FREEFORM:
- case HWPDO_FREEFORM: /* ?????? */
+ case HWPDO_FREEFORM: /* ë¤ê°í */
{
bool bIsPolygon = false;
@@ -4681,8 +4681,8 @@ void HwpReader::makeLine(Line * )
/**
- * ????-????-???????? : ?????????? ???? ?????? ????????.
- * ?????? ?????? ?? ??????, ???? ???????? ???????? ????????.
+ * ì
ë ¥-주ì-ì¨ìì¤ëª
: ì¬ì©ììê² ì¨ì ì¤ëª
ì ë³´ì¬ì¤ë¤.
+ * 문ë¨ì´ í¬í¨ë ì ìì¼ë, ë¨ì§ 문ìì´ë§ ë½ìë´ì´ íì±íë¤.
*/
void HwpReader::makeHidden(Hidden * hbox)
{
@@ -4712,7 +4712,7 @@ void HwpReader::makeHidden(Hidden * hbox)
/**
- * ?????? text:footnote, ?????? text:endnote?? ????
+ * ê°ì£¼ë text:footnote, 미주ë text:endnoteë¡ ë³í
*/
void HwpReader::makeFootnote(Footnote * hbox)
{
@@ -4820,7 +4820,7 @@ void HwpReader::makeShowPageNum()
nPos = 2;
else if( hbox->where == 3 || hbox->where == 6 )
nPos = 3;
- else /* ?? ?????? ???????? ??????. */
+ else /* ì´ ê²½ì°ê° ì¡´ì¬íë©´ ìëë¤. */
{
if( d->nPnPos == 1 )
nPos = 1;
@@ -4916,8 +4916,8 @@ void HwpReader::parsePara(HWPPara * para, sal_Bool bParaStart)
if( d->bFirstPara && d->bInBody )
{
/* for HWP's Bookmark */
- strcpy(buf,"[?????? ????]");
- padd(ascii("text:name"), sXML_CDATA, OUString(buf, strlen(buf), RTL_TEXTENCODING_EUC_KR));
+ strcpy(buf,"[문ìì ì²ì]"); /* "Begin of Document" */
+ padd(ascii("text:name"), sXML_CDATA, OUString(buf, strlen(buf), RTL_TEXTENCODING_UTF8));
rstartEl(ascii("text:bookmark"), rList);
pList->clear();
rendEl(ascii("text:bookmark"));
More information about the Libreoffice-commits
mailing list