summaryrefslogtreecommitdiffstats
path: root/mailnews/import/build
diff options
context:
space:
mode:
authorMatt A. Tobin <email@mattatobin.com>2019-11-11 01:22:58 -0500
committerMatt A. Tobin <email@mattatobin.com>2019-11-11 01:22:58 -0500
commit7047b11cf0126c784fca3aab78d78cd2d85d7d8f (patch)
treef994c6b8c5788ed9902cbc1503d4c45b13d4282a /mailnews/import/build
parent3c41580e7182a23bf149a68a31cb51c6fb0a3008 (diff)
downloadUXP-7047b11cf0126c784fca3aab78d78cd2d85d7d8f.tar
UXP-7047b11cf0126c784fca3aab78d78cd2d85d7d8f.tar.gz
UXP-7047b11cf0126c784fca3aab78d78cd2d85d7d8f.tar.lz
UXP-7047b11cf0126c784fca3aab78d78cd2d85d7d8f.tar.xz
UXP-7047b11cf0126c784fca3aab78d78cd2d85d7d8f.zip
Bug 1338715 - Remove Outlook Express import
Tag #1273
Diffstat (limited to 'mailnews/import/build')
-rw-r--r--mailnews/import/build/moz.build1
-rw-r--r--mailnews/import/build/nsImportModule.cpp9
2 files changed, 0 insertions, 10 deletions
diff --git a/mailnews/import/build/moz.build b/mailnews/import/build/moz.build
index 76cd0cceb..56a6eb8c1 100644
--- a/mailnews/import/build/moz.build
+++ b/mailnews/import/build/moz.build
@@ -49,7 +49,6 @@ if CONFIG['OS_ARCH'] == 'WINNT':
if not CONFIG['GNU_CC']:
LOCAL_INCLUDES += [
'../becky/src',
- '../oexpress',
'../outlook/src',
'../winlivemail',
]
diff --git a/mailnews/import/build/nsImportModule.cpp b/mailnews/import/build/nsImportModule.cpp
index f251e5660..f8f3814e6 100644
--- a/mailnews/import/build/nsImportModule.cpp
+++ b/mailnews/import/build/nsImportModule.cpp
@@ -46,8 +46,6 @@ NS_DEFINE_NAMED_CID(NS_APPLEMAILIMPL_CID);
// outlook import Include Files
////////////////////////////////////////////////////////////////////////////////
#ifdef XP_WIN
-#include "nsOEImport.h"
-#include "nsOEStringBundle.h"
#ifdef MOZ_MAPI_SUPPORT
#include "nsOutlookImport.h"
#include "nsOutlookStringBundle.h"
@@ -55,7 +53,6 @@ NS_DEFINE_NAMED_CID(NS_APPLEMAILIMPL_CID);
#include "nsWMImport.h"
#include "nsWMStringBundle.h"
-NS_DEFINE_NAMED_CID(NS_OEIMPORT_CID);
NS_DEFINE_NAMED_CID(NS_WMIMPORT_CID);
#ifdef MOZ_MAPI_SUPPORT
NS_DEFINE_NAMED_CID(NS_OUTLOOKIMPORT_CID);
@@ -100,7 +97,6 @@ NS_GENERIC_FACTORY_CONSTRUCTOR_INIT(nsAppleMailImportMail, Initialize)
// outlook import factories
////////////////////////////////////////////////////////////////////////////////
#ifdef XP_WIN
-NS_GENERIC_FACTORY_CONSTRUCTOR(nsOEImport)
NS_GENERIC_FACTORY_CONSTRUCTOR(nsWMImport)
#ifdef MOZ_MAPI_SUPPORT
NS_GENERIC_FACTORY_CONSTRUCTOR(nsOutlookImport)
@@ -120,7 +116,6 @@ static const mozilla::Module::CategoryEntry kMailNewsImportCategories[] = {
{ "mailnewsimport", "{0eb034a3-964a-4e2f-92eb-cc55d9ae9dd2}", NS_IMPORT_ADDRESS_STR },
#ifdef XP_WIN
{ "mailnewsimport", "{42bc82bc-8e9f-4597-8b6e-e529daaf3af1}", kWMSupportsString },
- { "mailnewsimport", "{be0bc880-1742-11d3-a206-00a0cc26da63}", kOESupportsString },
{ "mailnewsimport", "{7952a6cf-2442-4c04-9f02-150b15a0a841}", kBeckySupportsString },
#ifdef MOZ_MAPI_SUPPORT
{ "mailnewsimport", "{1DB469A0-8B00-11d3-A206-00A0CC26DA63}", kOutlookSupportsString },
@@ -143,7 +138,6 @@ const mozilla::Module::CIDEntry kMailNewsImportCIDs[] = {
#endif
#ifdef XP_WIN
- { &kNS_OEIMPORT_CID, false, NULL, nsOEImportConstructor },
{ &kNS_WMIMPORT_CID, false, NULL, nsWMImportConstructor },
{ &kNS_BECKYIMPORT_CID, false, NULL, nsBeckyImportConstructor },
#ifdef MOZ_MAPI_SUPPORT
@@ -164,7 +158,6 @@ const mozilla::Module::ContractIDEntry kMailNewsImportContracts[] = {
#endif
#ifdef XP_WIN
- { "@mozilla.org/import/import-oe;1", &kNS_OEIMPORT_CID },
{ "@mozilla.org/import/import-wm;1", &kNS_WMIMPORT_CID },
{ "@mozilla.org/import/import-becky;1", &kNS_BECKYIMPORT_CID },
#ifdef MOZ_MAPI_SUPPORT
@@ -178,8 +171,6 @@ const mozilla::Module::ContractIDEntry kMailNewsImportContracts[] = {
static void importModuleDtor()
{
#ifdef XP_WIN
-
- nsOEStringBundle::Cleanup();
nsWMStringBundle::Cleanup();
nsBeckyStringBundle::Cleanup();
#ifdef MOZ_MAPI_SUPPORT