INTEGRATION: CWS sw30bf04 (1.5.2); FILE MERGED

2008/04/16 14:07:55 ama 1.5.2.1: Patch #i86356#: Remove unused methods

6 files changed, 11 insertions, 236 deletions

diff --git a/hwpfilter/source/formula.cpp b/hwpfilter/source/formula.cpp
index b8bc0b574832..6cdf16cf7953 100644
--- a/hwpfilter/source/formula.cpp
+++ b/hwpfilter/source/formula.cpp
@@ -7,7 +7,7 @@
  * OpenOffice.org - a multi-platform office productivity suite
  *
  * $RCSfile: formula.cpp,v $
- * $Revision: 1.5 $
+ * $Revision: 1.6 $
  *
  * This file is part of OpenOffice.org.
  *
@@ -333,57 +333,6 @@ void Formula::makeSubSup(Node *res)
 #endif
 }
 
-void Formula::makeUnderOver(Node *res)
-{
-     Node *tmp = res;
-     if( !tmp ) return;
-
-#ifdef DEBUG
-     inds;
-     if( res->id == ID_SUBEXPR )
-          fprintf(stderr,"<math:munder>\n");
-     else if( res->id == ID_SUPEXPR )
-          fprintf(stderr,"<math:mover>\n");
-     else
-          fprintf(stderr,"<math:munderover>\n");
-#else
-     if( res->id == ID_SUBEXPR )
-          rstartEl(ascii("math:munder"), rList);
-     else if( res->id == ID_SUPEXPR )
-          rstartEl(ascii("math:mover"), rList);
-     else
-          rstartEl(ascii("math:munderover"), rList);
-#endif
-
-     tmp = tmp->child;
-     if( res->id == ID_SUBSUPEXPR ) {
-          makeExpr(tmp);
-          makeBlock(tmp->next);
-          makeBlock(tmp->next->next);
-     }
-     else{
-          makeExpr(tmp);
-          makeExpr(tmp->next);
-     }
-
-#ifdef DEBUG
-     inde;
-     if( res->id == ID_SUBEXPR )
-          fprintf(stderr,"</math:munder>\n");
-     else if( res->id == ID_SUPEXPR )
-          fprintf(stderr,"</math:mover>\n");
-     else
-          fprintf(stderr,"</math:munderover>\n");
-#else
-     if( res->id == ID_SUBEXPR )
-          rendEl(ascii("math:munder"));
-     else if( res->id == ID_SUPEXPR )
-          rendEl(ascii("math:mover"));
-     else
-          rendEl(ascii("math:munderover"));
-#endif
-}
-
 void Formula::makeFraction(Node *res)
 {
      Node *tmp = res;
@@ -634,33 +583,6 @@ void Formula::makeBlock(Node *res)
 #endif
 }
 
-void Formula::makeOperator(Node *res)
-{
-#ifdef DEBUG
-     inds;
-     fprintf(stderr,"<math:mo>%s</math:mo>\n",getMathMLEntity(res->value, entity));
-     indo;
-#else
-     rstartEl(ascii("math:mo"), rList);
-     runistr(getMathMLEntity(res->value,entity));
-     rendEl(ascii("math:mo"));
-#endif
-}
-void Formula::makeDelimeter(Node *res)
-{
-     if( res->value != NULL ){
-#ifdef DEBUG
-          inds;
-          fprintf(stderr,"<math:mi>%s</math:mi>\n",getMathMLEntity(res->value, entity));
-          indo;
-#else
-          rstartEl(ascii("math:mi"), rList);
-          runistr(getMathMLEntity(res->value, entity));
-          rendEl(ascii("math:mi"));
-#endif
-     }
-}
-
 // DVO: add space to avoid warning
 void Formula::makeBegin(Node * /*res*/)
 {
diff --git a/hwpfilter/source/hbox.cpp b/hwpfilter/source/hbox.cpp
index 6142cd40c574..97c5d520df05 100644
--- a/hwpfilter/source/hbox.cpp
+++ b/hwpfilter/source/hbox.cpp
@@ -7,7 +7,7 @@
  * OpenOffice.org - a multi-platform office productivity suite
  *
  * $RCSfile: hbox.cpp,v $
- * $Revision: 1.5 $
+ * $Revision: 1.6 $
  *
  * This file is part of OpenOffice.org.
  *
@@ -42,13 +42,6 @@
 
 int HBox::boxCount = 0;
 
-HBox::HBox()
-{
-    hh = 0;
-    boxCount++;
-}
-
-
 HBox::HBox(hchar hch)
 {
     hh = hch;
diff --git a/hwpfilter/source/hbox.h b/hwpfilter/source/hbox.h
index 77809907b188..b36609da9075 100644
--- a/hwpfilter/source/hbox.h
+++ b/hwpfilter/source/hbox.h
@@ -7,7 +7,7 @@
  * OpenOffice.org - a multi-platform office productivity suite
  *
  * $RCSfile: hbox.h,v $
- * $Revision: 1.5 $
+ * $Revision: 1.6 $
  *
  * This file is part of OpenOffice.org.
  *
@@ -28,7 +28,7 @@
  *
  ************************************************************************/
 
-/* $Id: hbox.h,v 1.5 2008-04-10 12:02:37 rt Exp $ */
+/* $Id: hbox.h,v 1.6 2008-06-04 09:56:30 vg Exp $ */
 
 #ifndef _HBOX_H_
 #define _HBOX_H_
@@ -53,10 +53,6 @@ struct HBox
         hchar hh;
 
 /**
- * Construct a HBox object with default value zero.
- */
-        HBox();
-/**
  * Construct a HBox object with parameter hch.
  * @param hch 16bit character being able to have Korean character.
  */
diff --git a/hwpfilter/source/himgutil.cpp b/hwpfilter/source/himgutil.cpp
index 2ccb444638bc..66916646c780 100644
--- a/hwpfilter/source/himgutil.cpp
+++ b/hwpfilter/source/himgutil.cpp
@@ -7,7 +7,7 @@
  * OpenOffice.org - a multi-platform office productivity suite
  *
  * $RCSfile: himgutil.cpp,v $
- * $Revision: 1.5 $
+ * $Revision: 1.6 $
  *
  * This file is part of OpenOffice.org.
  *
@@ -38,44 +38,6 @@
 #include "htags.h"
 #include "himgutil.h"
 
-const char *GetPictureFilename(const char *picname)
-{
-#ifdef _WIN32
-    return picname;
-#else                                         /* UNIX */
-    static char fname[256], *ptr;
-
-    if (picname[1] == ':')
-        ptr = strcpy(fname, picname + 3);
-    else
-        ptr = strcpy(fname, picname);
-
-    while (*ptr)
-    {
-        if (*ptr == '\\')
-            *ptr = DIRSEP;
-        ptr++;
-    }
-    if (access(fname, 0) != -1)
-        return fname;
-    else if ((ptr = strrchr(fname, DIRSEP)) && access(ptr + 1, 0) != -1)
-        return ptr + 1;
-
-/* ¼Ò¹®ÀÚ·Î */
-    ptr = fname;
-    while (*ptr)
-    {
-        *ptr = tolower(*ptr);
-        ptr++;
-    }
-    if (access(fname, 0) != -1)
-        return fname;
-    else if ((ptr = strrchr(fname, '/')) && access(ptr + 1, 0) != -1)
-        return ptr + 1;
-    return 0;
-#endif                                        /* !_WIN32 */
-}
-
 
 static int ImageMagicType(const uchar * magicno)
 {
@@ -138,30 +100,6 @@ static int ImageMagicType(const uchar * magicno)
     return rv;
 }
 
-
-int ReadFileType(const char *fname)
-{
-    FILE *fp;
-    uchar magicno[30];                            /* first 30 bytes of file */
-    int n;
-
-    if (!fname)
-        return RFT_ERROR;                         /* shouldn't happen */
-
-    fp = fopen(fname, "rb");
-    if (!fp)
-        return RFT_ERROR;
-
-    n = fread(magicno, 1, 30, fp);
-    fclose(fp);
-
-    if (n < 30)
-        return RFT_UNKNOWN;                       /* files less than 30 bytes long... */
-
-    return ImageMagicType(magicno);
-}
-
-
 const char *GetEmbImgname(const EmPicture * empic)
 {
     static char fname[256];
diff --git a/hwpfilter/source/hpara.cpp b/hwpfilter/source/hpara.cpp
index 8697e214f8e9..9790e135c709 100644
--- a/hwpfilter/source/hpara.cpp
+++ b/hwpfilter/source/hpara.cpp
@@ -7,7 +7,7 @@
  * OpenOffice.org - a multi-platform office productivity suite
  *
  * $RCSfile: hpara.cpp,v $
- * $Revision: 1.5 $
+ * $Revision: 1.6 $
  *
  * This file is part of OpenOffice.org.
  *
@@ -28,7 +28,7 @@
  *
  ************************************************************************/
 
-/* $Id: hpara.cpp,v 1.5 2008-04-10 12:06:11 rt Exp $ */
+/* $Id: hpara.cpp,v 1.6 2008-06-04 09:59:35 vg Exp $ */
 
 #include "precompile.h"
 
@@ -85,7 +85,7 @@ HWPPara::~HWPPara(void)
     if (hhstr)
     {
 // virtual destructor
-/* C++Àº null¿¡ ´ëÇؼ­µµ µ¿ÀÛÇÑ´Ù. */
+/* C++?? null?? ???????? ????????. */
         for (ii = 0; ii < nch; ++ii)
             delete hhstr[ii];
 
@@ -110,12 +110,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);
@@ -198,17 +198,6 @@ HWPPara *HWPPara::Next(void)
 }
 
 
-/* layoutÀ» À§ÇÑ ÇÔ¼ö */
-
-LineInfo *HWPPara::GetLineInfo(int line)
-{
-    if (line < 0 || line >= nline)
-        line = 0;
-    return linfo + line;
-
-}
-
-
 CharShape *HWPPara::GetCharShape(int pos)
 {
     if (contain_cshape == 0)
diff --git a/hwpfilter/source/hwpfile.cpp b/hwpfilter/source/hwpfile.cpp
index 87ff4c654a05..ee820ef6f445 100644
--- a/hwpfilter/source/hwpfile.cpp
+++ b/hwpfilter/source/hwpfile.cpp
@@ -7,7 +7,7 @@
  * OpenOffice.org - a multi-platform office productivity suite
  *
  * $RCSfile: hwpfile.cpp,v $
- * $Revision: 1.5 $
+ * $Revision: 1.6 $
  *
  * This file is part of OpenOffice.org.
  *
@@ -67,13 +67,6 @@ HWPFile::HWPFile(void)
 }
 
 
-HWPFile::HWPFile(HStream & stream)
-{
-    Init();
-    Open(stream);
-}
-
-
 /**
  * TODO : Ãß°¡µÈ ½ºÅ¸Àϸ®½ºÆ®¿¡ ´ëÇÑ ¸Þ¸ð¸® ÇØÁ¦
  */
@@ -182,20 +175,6 @@ int HWPFile::Open(HStream & stream)
 }
 
 
-void HWPFile::Flush(void)
-{
-    if (hiodev)
-        hiodev->flush();
-}
-
-
-void HWPFile::Close(void)
-{
-    if (hiodev)
-        hiodev->close();
-}
-
-
 int HWPFile::State(void) const
 {
     return error_code;
@@ -424,36 +403,6 @@ bool HWPFile::TagsRead(void)
 }
 
 
-const char *HWPFile::GetFileName() const
-{
-    return fname;
-}
-
-
-bool HWPFile::IsCompressedFile() const
-{
-    return compressed;
-}
-
-
-enum HWPFile::Paper HWPFile::GetPaperKind() const
-{
-    return (enum Paper) (_hwpInfo.paper.paper_kind);
-}
-
-
-void HWPFile::GetPaperSize(hunit & Width, hunit & Height) const
-{
-    Width = _hwpInfo.paper.paper_width;
-    Height = _hwpInfo.paper.paper_height;
-}
-
-
-bool HWPFile::GetPaperOrientation() const
-{
-    return (_hwpInfo.paper.paper_direction != 1);
-}
-
 ColumnDef *HWPFile::GetColumnDef(int num)
 {
     ColumnInfo *cinfo = columnlist.find(num);
@@ -479,18 +428,6 @@ int HWPFile::GetPageMasterNum(int page)
     return i-1;
 }
 
-int HWPFile::GetFontCount(int lang)
-{
-    return _hwpFont.NFonts(lang);
-}
-
-
-const char *HWPFile::GetFontName(int lang, int id)
-{
-    return _hwpFont.GetFontName(lang, id);
-}
-
-
 HyperText *HWPFile::GetHyperText()
 {
     return hyperlist.find(currenthyper++);