INTEGRATION: CWS sw30bf04 (1.3.2); FILE MERGED

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

5 files changed, 9 insertions, 30 deletions

diff --git a/hwpfilter/source/formula.h b/hwpfilter/source/formula.h
index 4bd24887f217..ec04f8ab7684 100644
--- a/hwpfilter/source/formula.h
+++ b/hwpfilter/source/formula.h
@@ -7,7 +7,7 @@
  * OpenOffice.org - a multi-platform office productivity suite
  *
  * $RCSfile: formula.h,v $
- * $Revision: 1.3 $
+ * $Revision: 1.4 $
  *
  * This file is part of OpenOffice.org.
  *
@@ -77,7 +77,6 @@ private:
      void makePrimary(Node *res);
      void makeIdentifier(Node *res);
      void makeSubSup(Node *res);
-     void makeUnderOver(Node *res);
      void makeFraction(Node *res);
      void makeDecoration(Node *res);
      void makeFunction(Node *res);
@@ -88,8 +87,6 @@ private:
      void makeFence(Node *res);
      void makeBracket(Node *res);
      void makeBlock(Node *res);
-     void makeOperator(Node *res);
-     void makeDelimeter(Node *res);
      void makeBegin(Node *res);
      void makeEnd(Node *res);
 
diff --git a/hwpfilter/source/hfont.cpp b/hwpfilter/source/hfont.cpp
index 8adea75b35ae..d90c93647c68 100644
--- a/hwpfilter/source/hfont.cpp
+++ b/hwpfilter/source/hfont.cpp
@@ -7,7 +7,7 @@
  * OpenOffice.org - a multi-platform office productivity suite
  *
  * $RCSfile: hfont.cpp,v $
- * $Revision: 1.3 $
+ * $Revision: 1.4 $
  *
  * This file is part of OpenOffice.org.
  *
@@ -28,7 +28,7 @@
  *
  ************************************************************************/
 
-/* $Id: hfont.cpp,v 1.3 2008-04-10 12:03:32 rt Exp $ */
+/* $Id: hfont.cpp,v 1.4 2008-06-04 09:56:49 vg Exp $ */
 
 #include "precompile.h"
 #include "hwplib.h"
@@ -56,14 +56,6 @@ HWPFont::~HWPFont(void)
 }
 
 
-int HWPFont::NFonts(int lang)
-{
-    if (!(lang >= 0 && lang < NLanguage))
-        return 0;
-    return nFonts[lang];
-}
-
-
 int HWPFont::AddFont(int lang, const char *font)
 {
     int nfonts;
diff --git a/hwpfilter/source/hfont.h b/hwpfilter/source/hfont.h
index 3bc386d7c60a..1944b82536de 100644
--- a/hwpfilter/source/hfont.h
+++ b/hwpfilter/source/hfont.h
@@ -7,7 +7,7 @@
  * OpenOffice.org - a multi-platform office productivity suite
  *
  * $RCSfile: hfont.h,v $
- * $Revision: 1.3 $
+ * $Revision: 1.4 $
  *
  * This file is part of OpenOffice.org.
  *
@@ -28,7 +28,7 @@
  *
  ************************************************************************/
 
-/* $Id: hfont.h,v 1.3 2008-04-10 12:03:48 rt Exp $ */
+/* $Id: hfont.h,v 1.4 2008-06-04 09:57:04 vg Exp $ */
 
 #ifndef _HWPFONTS_H_
 #define _HWPFONTS_H_
@@ -63,11 +63,6 @@ class DLLEXPORT HWPFont
         ~HWPFont(void);
 
 /**
- * @param lang Language index
- * @returns Count of the font list for given language
- */
-        int       NFonts(int lang);
-/**
  * Adds a font into font list of a language
  * @param lang Language index
  * @param font Name of font family
diff --git a/hwpfilter/source/himgutil.h b/hwpfilter/source/himgutil.h
index d0c2ca579166..b144f3968d25 100644
--- a/hwpfilter/source/himgutil.h
+++ b/hwpfilter/source/himgutil.h
@@ -7,7 +7,7 @@
  * OpenOffice.org - a multi-platform office productivity suite
  *
  * $RCSfile: himgutil.h,v $
- * $Revision: 1.3 $
+ * $Revision: 1.4 $
  *
  * This file is part of OpenOffice.org.
  *
@@ -28,7 +28,7 @@
  *
  ************************************************************************/
 
-/* NAME $Id: himgutil.h,v 1.3 2008-04-10 12:04:49 rt Exp $
+/* NAME $Id: himgutil.h,v 1.4 2008-06-04 09:58:33 vg Exp $
  * PURPOSE
  *   WIN32 µîÀÇ xv image ¶óÀ̺귯¸®°¡ ¾ø´Â °æ¿ì,
  *   À̹ÌÁö ÆÄÀÏÀÇ Çü½ÄÀ» ¹ÝȯÇϴµ¥ »ç¿ëÇÑ´Ù.
@@ -70,8 +70,6 @@
 // function declaration
 struct EmPicture;
 
-int  ReadFileType(const char *fname);
-const char *GetPictureFilename(const char *picname);
 /**
  * Extract the name from given object
  * @param empic Object having name to extract
diff --git a/hwpfilter/source/hutil.h b/hwpfilter/source/hutil.h
index 5c35e6c2ae87..5b61cd4df009 100644
--- a/hwpfilter/source/hutil.h
+++ b/hwpfilter/source/hutil.h
@@ -7,7 +7,7 @@
  * OpenOffice.org - a multi-platform office productivity suite
  *
  * $RCSfile: hutil.h,v $
- * $Revision: 1.3 $
+ * $Revision: 1.4 $
  *
  * This file is part of OpenOffice.org.
  *
@@ -28,7 +28,7 @@
  *
  ************************************************************************/
 
-/* $Id: hutil.h,v 1.3 2008-04-10 12:08:30 rt Exp $ */
+/* $Id: hutil.h,v 1.4 2008-06-04 10:00:41 vg Exp $ */
 
 #ifndef _UTIL_H_
 #define _UTIL_H_
@@ -47,7 +47,4 @@ void    str2hstr(const char *c, hchar *i);
  */
 int hstrlen(const hchar *s);
 
-#ifndef _WIN32
-char    *strupr(char *str);
-#endif
 #endif                                            /* UTIL_H_*/