diff --git a/mozilla/htmlparser/public/nsIDTD.h b/mozilla/htmlparser/public/nsIDTD.h
index 378612bc700..566025a7132 100644
--- a/mozilla/htmlparser/public/nsIDTD.h
+++ b/mozilla/htmlparser/public/nsIDTD.h
@@ -220,9 +220,6 @@ public:
    
     NS_IMETHOD_(const PRUnichar *) IntTagToStringTag(PRInt32 aIntTag) const = 0;
     
-    NS_IMETHOD ConvertEntityToUnicode(const nsAString& aEntity,
-                                      PRInt32* aUnicode) const = 0;
-    
     NS_IMETHOD_(PRBool) IsBlockElement(PRInt32 aTagID,
                                        PRInt32 aParentID) const = 0;
     
@@ -247,7 +244,6 @@ public:
     NS_IMETHOD_(PRInt32) GetType(); \
     NS_IMETHOD StringTagToIntTag(const nsAString &aTag, PRInt32* aIntTag) const ;\
     NS_IMETHOD_(const PRUnichar *) IntTagToStringTag(PRInt32 aIntTag) const ;\
-    NS_IMETHOD ConvertEntityToUnicode(const nsAString& aEntity, PRInt32* aUnicode) const ;\
     NS_IMETHOD_(PRBool)  IsBlockElement(PRInt32 aTagID,PRInt32 aParentID) const;\
     NS_IMETHOD_(PRBool)  IsInlineElement(PRInt32 aTagID,PRInt32 aParentID) const;
 #endif /* nsIDTD_h___ */
diff --git a/mozilla/htmlparser/src/CNavDTD.cpp b/mozilla/htmlparser/src/CNavDTD.cpp
index 52ff40014cd..4a047508b6c 100644
--- a/mozilla/htmlparser/src/CNavDTD.cpp
+++ b/mozilla/htmlparser/src/CNavDTD.cpp
@@ -2511,16 +2511,6 @@ CNavDTD::IntTagToStringTag(PRInt32 aIntTag) const
   return str_ptr;
 }
 
-NS_IMETHODIMP
-CNavDTD::ConvertEntityToUnicode(const nsAString& aEntity,
-                                PRInt32* aUnicode) const
-{
-  *aUnicode = nsHTMLEntities::EntityToUnicode(aEntity);
-
-  return NS_OK;
-}
-
-
 /**
  *  This method is called to determine whether or not
  *  the given childtag is a block element.
diff --git a/mozilla/htmlparser/src/COtherDTD.cpp b/mozilla/htmlparser/src/COtherDTD.cpp
index 87cce9258a0..3807f5ee586 100644
--- a/mozilla/htmlparser/src/COtherDTD.cpp
+++ b/mozilla/htmlparser/src/COtherDTD.cpp
@@ -910,15 +910,6 @@ COtherDTD::IntTagToStringTag(PRInt32 aIntTag) const
   return str_ptr;
 }  
 
-NS_IMETHODIMP
-COtherDTD::ConvertEntityToUnicode(const nsAString& aEntity,
-                                  PRInt32* aUnicode) const
-{
-  *aUnicode = nsHTMLEntities::EntityToUnicode(aEntity);
-
-  return NS_OK;
-}
- 
 /**
  *  This method is called to determine whether or not
  *  the given childtag is a block element.
diff --git a/mozilla/htmlparser/src/nsExpatDriver.cpp b/mozilla/htmlparser/src/nsExpatDriver.cpp
index 40a460d5aae..5461f7ebc0d 100644
--- a/mozilla/htmlparser/src/nsExpatDriver.cpp
+++ b/mozilla/htmlparser/src/nsExpatDriver.cpp
@@ -1171,9 +1171,4 @@ nsExpatDriver::IntTagToStringTag(PRInt32 aIntTag) const
   return 0;
 }
 
-NS_IMETHODIMP 
-nsExpatDriver::ConvertEntityToUnicode(const nsAString& aEntity, PRInt32* aUnicode) const
-{
-  return NS_OK;
-}
 /******************************************************************************/
diff --git a/mozilla/htmlparser/src/nsViewSourceHTML.cpp b/mozilla/htmlparser/src/nsViewSourceHTML.cpp
index 4ae5c21683c..416fd23b4af 100644
--- a/mozilla/htmlparser/src/nsViewSourceHTML.cpp
+++ b/mozilla/htmlparser/src/nsViewSourceHTML.cpp
@@ -78,7 +78,6 @@
 #include "nsIContentSink.h"
 #include "nsIHTMLContentSink.h"
 #include "nsHTMLTokenizer.h"
-#include "nsHTMLEntities.h"
 #include "nsIPrefService.h"
 #include "nsIPrefBranch.h"
 #include "nsUnicharUtils.h"
@@ -855,16 +854,6 @@ CViewSourceHTML::IntTagToStringTag(PRInt32 aIntTag) const
   return str_ptr;
 }
 
-NS_IMETHODIMP
-CViewSourceHTML::ConvertEntityToUnicode(const nsAString& aEntity,
-                                        PRInt32* aUnicode) const
-{
-  *aUnicode = nsHTMLEntities::EntityToUnicode(aEntity);
-
-  return NS_OK;
-}
-
-
 PRBool CViewSourceHTML::IsBlockElement(PRInt32 aTagID,PRInt32 aParentID) const {
   PRBool result=PR_FALSE;
   return result;
diff --git a/mozilla/parser/htmlparser/public/nsIDTD.h b/mozilla/parser/htmlparser/public/nsIDTD.h
index 378612bc700..566025a7132 100644
--- a/mozilla/parser/htmlparser/public/nsIDTD.h
+++ b/mozilla/parser/htmlparser/public/nsIDTD.h
@@ -220,9 +220,6 @@ public:
    
     NS_IMETHOD_(const PRUnichar *) IntTagToStringTag(PRInt32 aIntTag) const = 0;
     
-    NS_IMETHOD ConvertEntityToUnicode(const nsAString& aEntity,
-                                      PRInt32* aUnicode) const = 0;
-    
     NS_IMETHOD_(PRBool) IsBlockElement(PRInt32 aTagID,
                                        PRInt32 aParentID) const = 0;
     
@@ -247,7 +244,6 @@ public:
     NS_IMETHOD_(PRInt32) GetType(); \
     NS_IMETHOD StringTagToIntTag(const nsAString &aTag, PRInt32* aIntTag) const ;\
     NS_IMETHOD_(const PRUnichar *) IntTagToStringTag(PRInt32 aIntTag) const ;\
-    NS_IMETHOD ConvertEntityToUnicode(const nsAString& aEntity, PRInt32* aUnicode) const ;\
     NS_IMETHOD_(PRBool)  IsBlockElement(PRInt32 aTagID,PRInt32 aParentID) const;\
     NS_IMETHOD_(PRBool)  IsInlineElement(PRInt32 aTagID,PRInt32 aParentID) const;
 #endif /* nsIDTD_h___ */
diff --git a/mozilla/parser/htmlparser/src/CNavDTD.cpp b/mozilla/parser/htmlparser/src/CNavDTD.cpp
index 52ff40014cd..4a047508b6c 100644
--- a/mozilla/parser/htmlparser/src/CNavDTD.cpp
+++ b/mozilla/parser/htmlparser/src/CNavDTD.cpp
@@ -2511,16 +2511,6 @@ CNavDTD::IntTagToStringTag(PRInt32 aIntTag) const
   return str_ptr;
 }
 
-NS_IMETHODIMP
-CNavDTD::ConvertEntityToUnicode(const nsAString& aEntity,
-                                PRInt32* aUnicode) const
-{
-  *aUnicode = nsHTMLEntities::EntityToUnicode(aEntity);
-
-  return NS_OK;
-}
-
-
 /**
  *  This method is called to determine whether or not
  *  the given childtag is a block element.
diff --git a/mozilla/parser/htmlparser/src/COtherDTD.cpp b/mozilla/parser/htmlparser/src/COtherDTD.cpp
index 87cce9258a0..3807f5ee586 100644
--- a/mozilla/parser/htmlparser/src/COtherDTD.cpp
+++ b/mozilla/parser/htmlparser/src/COtherDTD.cpp
@@ -910,15 +910,6 @@ COtherDTD::IntTagToStringTag(PRInt32 aIntTag) const
   return str_ptr;
 }  
 
-NS_IMETHODIMP
-COtherDTD::ConvertEntityToUnicode(const nsAString& aEntity,
-                                  PRInt32* aUnicode) const
-{
-  *aUnicode = nsHTMLEntities::EntityToUnicode(aEntity);
-
-  return NS_OK;
-}
- 
 /**
  *  This method is called to determine whether or not
  *  the given childtag is a block element.
diff --git a/mozilla/parser/htmlparser/src/nsExpatDriver.cpp b/mozilla/parser/htmlparser/src/nsExpatDriver.cpp
index 40a460d5aae..5461f7ebc0d 100644
--- a/mozilla/parser/htmlparser/src/nsExpatDriver.cpp
+++ b/mozilla/parser/htmlparser/src/nsExpatDriver.cpp
@@ -1171,9 +1171,4 @@ nsExpatDriver::IntTagToStringTag(PRInt32 aIntTag) const
   return 0;
 }
 
-NS_IMETHODIMP 
-nsExpatDriver::ConvertEntityToUnicode(const nsAString& aEntity, PRInt32* aUnicode) const
-{
-  return NS_OK;
-}
 /******************************************************************************/
diff --git a/mozilla/parser/htmlparser/src/nsViewSourceHTML.cpp b/mozilla/parser/htmlparser/src/nsViewSourceHTML.cpp
index 4ae5c21683c..416fd23b4af 100644
--- a/mozilla/parser/htmlparser/src/nsViewSourceHTML.cpp
+++ b/mozilla/parser/htmlparser/src/nsViewSourceHTML.cpp
@@ -78,7 +78,6 @@
 #include "nsIContentSink.h"
 #include "nsIHTMLContentSink.h"
 #include "nsHTMLTokenizer.h"
-#include "nsHTMLEntities.h"
 #include "nsIPrefService.h"
 #include "nsIPrefBranch.h"
 #include "nsUnicharUtils.h"
@@ -855,16 +854,6 @@ CViewSourceHTML::IntTagToStringTag(PRInt32 aIntTag) const
   return str_ptr;
 }
 
-NS_IMETHODIMP
-CViewSourceHTML::ConvertEntityToUnicode(const nsAString& aEntity,
-                                        PRInt32* aUnicode) const
-{
-  *aUnicode = nsHTMLEntities::EntityToUnicode(aEntity);
-
-  return NS_OK;
-}
-
-
 PRBool CViewSourceHTML::IsBlockElement(PRInt32 aTagID,PRInt32 aParentID) const {
   PRBool result=PR_FALSE;
   return result;