diff -r 000000000000 -r 6474c204b198 intl/unicharutil/src/nsEntityConverter.h
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/intl/unicharutil/src/nsEntityConverter.h	Wed Dec 31 06:09:35 2014 +0100
@@ -0,0 +1,67 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
+/* This Source Code Form is subject to the terms of the Mozilla Public
+ * License, v. 2.0. If a copy of the MPL was not distributed with this
+ * file, You can obtain one at http://mozilla.org/MPL/2.0/. */
+
+#ifndef nsEntityConverter_h__
+#define nsEntityConverter_h__
+
+#include "nsIEntityConverter.h"
+#include "nsIStringBundle.h"
+#include "nsCOMPtr.h"
+
+#define kVERSION_STRING_LEN 128
+
+class nsEntityVersionList
+{
+public:
+    nsEntityVersionList() {}
+    
+    uint32_t mVersion;
+    char16_t mEntityListName[kVERSION_STRING_LEN+1];
+    nsCOMPtr<nsIStringBundle> mEntities;
+};
+
+class nsEntityConverter: public nsIEntityConverter
+{
+public:
+	
+	//
+	// implementation methods
+	//
+	nsEntityConverter();
+	virtual ~nsEntityConverter();
+
+	//
+	// nsISupports
+	//
+	NS_DECL_ISUPPORTS
+
+	//
+	// nsIEntityConverter
+	//
+	NS_IMETHOD ConvertUTF32ToEntity(uint32_t character, uint32_t entityVersion, char **_retval);
+	NS_IMETHOD ConvertToEntity(char16_t character, uint32_t entityVersion, char **_retval);
+
+	NS_IMETHOD ConvertToEntities(const char16_t *inString, uint32_t entityVersion, char16_t **_retval);
+
+protected:
+
+  // load a version property file and generate a version list (number/name pair)
+  NS_IMETHOD LoadVersionPropertyFile();
+
+  // map version number to version string
+  const char16_t* GetVersionName(uint32_t versionNumber);
+
+  // map version number to a string bundle
+  nsIStringBundle* GetVersionBundleInstance(uint32_t versionNumber);
+
+  // load a string bundle file
+  already_AddRefed<nsIStringBundle> LoadEntityBundle(uint32_t version);
+
+
+  nsEntityVersionList *mVersionList;            // array of version number/name pairs
+  uint32_t mVersionListLength;                  // number of supported versions
+};
+
+#endif