mirror of
https://github.com/mozilla/gecko-dev.git
synced 2024-11-29 15:52:07 +00:00
Bug 229969 Fix 'Warning: "/*" within comment'
patch by gautheri@noos.fr (Serge GAUTHERIE) r+sr=bzbarsky
This commit is contained in:
parent
7ab855f60c
commit
413b5f69f6
@ -1528,15 +1528,13 @@ nsOSHelperAppService::GetFromExtension(const char *aFileExt) {
|
||||
mimeInfo->SetMIMEType(NS_ConvertUCS2toUTF8(mimeType).get());
|
||||
mimeInfo->AppendExtension(aFileExt);
|
||||
nsHashtable typeOptions; // empty hash table
|
||||
/*
|
||||
The mailcap lookup is two-pass to handle the case of mailcap files
|
||||
that have something like:
|
||||
|
||||
text/*; emacs %s
|
||||
text/rtf; soffice %s
|
||||
|
||||
in that order. We want to pick up "soffice" for text/rtf in such cases
|
||||
*/
|
||||
// The mailcap lookup is two-pass to handle the case of mailcap files
|
||||
// that have something like:
|
||||
//
|
||||
// text/*; emacs %s
|
||||
// text/rtf; soffice %s
|
||||
//
|
||||
// in that order. We want to pick up "soffice" for text/rtf in such cases
|
||||
rv = LookUpHandlerAndDescription(majorType, minorType, typeOptions,
|
||||
handler, mailcap_description,
|
||||
mozillaFlags);
|
||||
@ -1611,15 +1609,13 @@ nsOSHelperAppService::GetFromType(const char *aMIMEType) {
|
||||
|
||||
nsDependentSubstring majorType(majorTypeStart, majorTypeEnd);
|
||||
nsDependentSubstring minorType(minorTypeStart, minorTypeEnd);
|
||||
/*
|
||||
The mailcap lookup is two-pass to handle the case of mailcap files
|
||||
that have something like:
|
||||
|
||||
text/*; emacs %s
|
||||
text/rtf; soffice %s
|
||||
|
||||
in that order. We want to pick up "soffice" for text/rtf in such cases
|
||||
*/
|
||||
// The mailcap lookup is two-pass to handle the case of mailcap files
|
||||
// that have something like:
|
||||
//
|
||||
// text/*; emacs %s
|
||||
// text/rtf; soffice %s
|
||||
//
|
||||
// in that order. We want to pick up "soffice" for text/rtf in such cases
|
||||
rv = LookUpHandlerAndDescription(majorType,
|
||||
minorType,
|
||||
typeOptions,
|
||||
|
@ -926,15 +926,13 @@ nsOSHelperAppService::LookUpHandlerAndDescription(const nsAString& aMajorType,
|
||||
nsAString& aDescription,
|
||||
nsAString& aMozillaFlags) {
|
||||
|
||||
/*
|
||||
* The mailcap lookup is two-pass to handle the case of mailcap files
|
||||
* that have something like:
|
||||
*
|
||||
* text/*; emacs %s
|
||||
* text/rtf; soffice %s
|
||||
*
|
||||
* in that order. We want to pick up "soffice" for text/rtf in such cases
|
||||
*/
|
||||
// The mailcap lookup is two-pass to handle the case of mailcap files
|
||||
// that have something like:
|
||||
//
|
||||
// text/*; emacs %s
|
||||
// text/rtf; soffice %s
|
||||
//
|
||||
// in that order. We want to pick up "soffice" for text/rtf in such cases
|
||||
nsresult rv = DoLookUpHandlerAndDescription(aMajorType,
|
||||
aMinorType,
|
||||
aTypeOptions,
|
||||
|
Loading…
Reference in New Issue
Block a user