[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