From bcec3af8dce0d8a92400b68df64a7f631ebc7000 Mon Sep 17 00:00:00 2001 From: Stefan Sitter Date: Mon, 28 Sep 2015 20:33:48 +0200 Subject: [PATCH] Bug 1209175 - Fix a conditional statement in msgMapiHook.cpp. r=rkent --- mailnews/mapi/mapihook/src/msgMapiHook.cpp | 18 ++++-------------- 1 file changed, 4 insertions(+), 14 deletions(-) diff --git a/mailnews/mapi/mapihook/src/msgMapiHook.cpp b/mailnews/mapi/mapihook/src/msgMapiHook.cpp index 01a3b549b4..74a6e10a59 100644 --- a/mailnews/mapi/mapihook/src/msgMapiHook.cpp +++ b/mailnews/mapi/mapihook/src/msgMapiHook.cpp @@ -666,20 +666,10 @@ nsresult nsMapiHook::PopulateCompFieldsForSendDocs(nsIMsgCompFields * aCompField nsresult rv = NS_OK ; bool bExist ; - if (aFlags & MAPI_UNICODE) - { - if (aDelimChar) - strDelimChars.Assign (aDelimChar); - if (aFilePaths) - strFilePaths.Assign (aFilePaths); - } - else - { - if (aDelimChar) - strDelimChars.Assign(aDelimChar); - if (aFilePaths) - strFilePaths.Assign ( aFilePaths); - } + if (aDelimChar) + strDelimChars.Assign(aDelimChar); + if (aFilePaths) + strFilePaths.Assign(aFilePaths); // check for comma in filename if (strDelimChars.FindChar(',') == kNotFound) // if comma is not in the delimiter specified by user