mozilla
/
gecko-dev
зеркало из https://github.com/mozilla/gecko-dev.git
1
0
Форкнуть 0
Код Задачи Пакеты Проекты Релизы Вики Активность

Bug 78458: ``Remove our broken text/rtf support'', patch by Boris Zbarsky <bzbarsky@mit.edu>, r=harishd, sr=jst

This commit is contained in:
jaggernaut%netscape.com 2001-06-26 05:22:23 +00:00
Родитель 5a43b8700a
Коммит 55694b4cad
20 изменённых файлов: 0 добавлений и 3167 удалений
Показать статистику Скачать Patch файл Скачать Diff файл Показать все файлы Свернуть все файлы

1
content/build/nsContentDLF.cpp
Просмотреть файл

@ -58,7 +58,6 @@ extern nsresult NS_NewDocumentViewer(nsIDocumentViewer** aResult);
static char* gHTMLTypes[] = {
"text/html",
"text/plain",
"text/rtf",
"text/css",
0
};

3
htmlparser/src/CNavDTD.cpp
Просмотреть файл

@ -346,9 +346,6 @@ eAutoDetectResult CNavDTD::CanParse(CParserContext& aParserContext,nsString& aBu
if(PR_TRUE==aParserContext.mMimeType.EqualsWithConversion(kPlainTextContentType)) {
result=ePrimaryDetect;
}
else if(aParserContext.mMimeType.EqualsWithConversion(kRTFTextContentType)){
result=ePrimaryDetect;
}
}
else {
if(PR_TRUE==aParserContext.mMimeType.EqualsWithConversion(kHTMLTextContentType)) {

3
htmlparser/src/COtherDTD.cpp
Просмотреть файл

@ -292,9 +292,6 @@ eAutoDetectResult COtherDTD::CanParse(CParserContext& aParserContext,nsString& a
if(PR_TRUE==aParserContext.mMimeType.EqualsWithConversion(kPlainTextContentType)) {
result=eValidDetect;
}
else if(aParserContext.mMimeType.EqualsWithConversion(kRTFTextContentType)){
result=eValidDetect;
}
}
else {
if(PR_TRUE==aParserContext.mMimeType.EqualsWithConversion(kPlainTextContentType)) {

1206
htmlparser/src/CRtfDTD.cpp
Просмотреть файл

Разница между файлами не показана из-за своего большого размера Загрузить разницу

359
htmlparser/src/CRtfDTD.h
Просмотреть файл

@ -1,359 +0,0 @@
/* -*- Mode: C++; tab-width: 2; indent-tabs-mode: nil; c-basic-offset: 2 -*- */
/*
* The contents of this file are subject to the Netscape Public
* License Version 1.1 (the "License"); you may not use this file
* except in compliance with the License. You may obtain a copy of
* the License at http://www.mozilla.org/NPL/
*
* Software distributed under the License is distributed on an "AS
* IS" basis, WITHOUT WARRANTY OF ANY KIND, either express or
* implied. See the License for the specific language governing
* rights and limitations under the License.
*
* The Original Code is mozilla.org code.
*
* The Initial Developer of the Original Code is Netscape
* Communications Corporation. Portions created by Netscape are
* Copyright (C) 1998 Netscape Communications Corporation. All
* Rights Reserved.
*
* Contributor(s):
*/
/**
* MODULE NOTES:
* @update gess 4/8/98
*
*
*/
#ifndef NS_RTFDTD__
#define NS_RTFDTD__
#include "nsIDTD.h"
#include "nsISupports.h"
#include "nsHTMLTokens.h"
#include "nshtmlpars.h"
#include "nsVoidArray.h"
#include "nsDeque.h"
#include "nsToken.h"
#define NS_RTF_DTD_IID \
{0xa39c6bfc, 0x15f0, 0x11d2, \
{0x80, 0x41, 0x00, 0x10, 0x4b, 0x98, 0x3f, 0xd4}}
class nsIParserNode;
class nsParser;
class nsITokenizer;
class nsIHTMLContentSink;
enum eRTFTokenTypes {
eRTFToken_unknown=0,
eRTFToken_group, // '{'
eRTFToken_controlword, // '\'
eRTFToken_content, // contains all document content
//everything else is just text or attributes of controls...
eRTFToken_last //make sure this stays the last token...
};
enum eRTFTags {
eRTFCtrl_unknown=0,
eRTFCtrl_quote,
eRTFCtrl_star,
eRTFCtrl_linefeed,
eRTFCtrl_return,
eRTFCtrl_begincontrol,
eRTFCtrl_text,
eRTFCtrl_ansi,
eRTFCtrl_bold,
eRTFCtrl_bin,
eRTFCtrl_blue,
eRTFCtrl_cols,
eRTFCtrl_comment,
eRTFCtrl_italic,
eRTFCtrl_font,
eRTFCtrl_fonttable,
eRTFCtrl_green,
eRTFCtrl_bottommargin,
eRTFCtrl_leftmargin,
eRTFCtrl_rightmargin,
eRTFCtrl_topmargin,
eRTFCtrl_par,
eRTFCtrl_pard,
eRTFCtrl_plain,
eRTFCtrl_justified,
eRTFCtrl_fulljustified,
eRTFCtrl_leftjustified,
eRTFCtrl_rightjustified,
eRTFCtrl_rdoublequote,
eRTFCtrl_red,
eRTFCtrl_rtf,
eRTFCtrl_tab,
eRTFCtrl_title,
eRTFCtrl_underline,
eRTFCtrl_startgroup, // {
eRTFCtrl_endgroup, // }
eRTFCtrl_last //make sure this stays the last token...
};
/**
* Represents the token of RTF. Always has form \xxxx<optarg>delimiter
*
* @update gess7/8/98
* @param
* @return
*/
class CRTFControlWord : public CToken {
public:
CRTFControlWord(eRTFTags aTagID);
virtual PRInt32 GetTokenType();
virtual nsresult Consume(PRUnichar aChar,nsScanner& aScanner,PRInt32 aMode);
eRTFTags mTag;
nsString mArgument;
};
/**
* This represents the document content.
*
* @update gess7/8/98
* @param
* @return
*/
class CRTFContent: public CToken {
public:
CRTFContent(PRUnichar* aKey=0);
virtual PRInt32 GetTokenType();
virtual nsresult Consume(PRUnichar aChar,nsScanner& aScanner,PRInt32 aMode);
};
class CRtfDTD : public nsIDTD {
public:
NS_DECL_ISUPPORTS
/**
*
*
* @update gess 4/9/98
* @param
* @return
*/
CRtfDTD();
/**
*
*
* @update gess 4/9/98
* @param
* @return
*/
virtual ~CRtfDTD();
virtual const nsIID& GetMostDerivedIID(void) const;
/**
* Call this method if you want the DTD to construct a clone of itself.
* @update gess7/23/98
* @param
* @return
*/
virtual nsresult CreateNewInstance(nsIDTD** aInstancePtrResult);
/**
* This method is called to determine if the given DTD can parse
* a document in a given source-type.
* NOTE: Parsing always assumes that the end result will involve
* storing the result in the main content model.
* @update gess6/24/98
* @param
* @return TRUE if this DTD can satisfy the request; FALSE otherwise.
*/
virtual eAutoDetectResult CanParse(CParserContext& aParserContext,nsString& aBuffer, PRInt32 aVersion);
/**
* The parser uses a code sandwich to wrap the parsing process. Before
* the process begins, WillBuildModel() is called. Afterwards the parser
* calls DidBuildModel().
* @update rickg 03.20.2000
* @param aParserContext
* @param aSink
* @return error code (almost always 0)
*/
NS_IMETHOD WillBuildModel( const CParserContext& aParserContext,nsIContentSink* aSink);
/**
* The parser uses a code sandwich to wrap the parsing process. Before
* the process begins, WillBuildModel() is called. Afterwards the parser
* calls DidBuildModel().
* @update gess5/18/98
* @param aFilename is the name of the file being parsed.
* @return error code (almost always 0)
*/
NS_IMETHOD BuildModel(nsIParser* aParser,nsITokenizer* aTokenizer,nsITokenObserver* anObserver=0,nsIContentSink* aSink=0);
/**
* The parser uses a code sandwich to wrap the parsing process. Before
* the process begins, WillBuildModel() is called. Afterwards the parser
* calls DidBuildModel().
* @update gess5/18/98
* @param anErrorCode contans the last error that occured
* @return error code
*/
NS_IMETHOD DidBuildModel(nsresult anErrorCode,PRInt32 aLevel,nsIParser* aParser,nsIContentSink* aSink=0);
/**
*
* @update gess 3/25/98
* @param aToken -- token object to be put into content model
* @return 0 if all is well; non-zero is an error
*/
NS_IMETHOD HandleControlWord(CToken* aToken);
/**
*
* @update gess 3/25/98
* @param aToken -- token object to be put into content model
* @return 0 if all is well; non-zero is an error
*/
NS_IMETHOD HandleContent(CToken* aToken);
/**
*
* @update gess 3/25/98
* @param aToken -- token object to be put into content model
* @return 0 if all is well; non-zero is an error
*/
NS_IMETHOD HandleToken(CToken* aToken,nsIParser* aParser);
/**
*
* @update gess 12/20/99
* @param ptr-ref to (out) tokenizer
* @return nsresult
*/
NS_IMETHOD GetTokenizer(nsITokenizer*& aTokenizer);
/**
*
* @update gess5/18/98
* @param
* @return
*/
NS_IMETHOD WillResumeParse(void);
/**
*
* @update gess5/18/98
* @param
* @return
*/
NS_IMETHOD WillInterruptParse(void);
/**
* Called by the parser to initiate dtd verification of the
* internal context stack.
* @update gess 7/23/98
* @param
* @return
*/
virtual PRBool Verify(nsString& aURLRef,nsIParser* aParser);
/**
* Set this to TRUE if you want the DTD to verify its
* context stack.
* @update gess 7/23/98
* @param
* @return
*/
virtual void SetVerification(PRBool aEnable);
/**
* This method is called to determine whether or not a tag
* of one type can contain a tag of another type.
*
* @update gess 3/25/98
* @param aParent -- int tag of parent container
* @param aChild -- int tag of child container
* @return PR_TRUE if parent can contain child
*/
virtual PRBool CanContain(PRInt32 aParent,PRInt32 aChild) const;
/**
* This method gets called to determine whether a given
* tag is itself a container
*
* @update gess 3/25/98
* @param aTag -- tag to test for containership
* @return PR_TRUE if given tag can contain other tags
*/
virtual PRBool IsContainer(PRInt32 aTag) const;
/**
* Retrieve a ptr to the global token recycler...
* @update gess8/4/98
* @return ptr to recycler (or null)
*/
virtual nsTokenAllocator* GetTokenAllocator(void);
/**
* Use this id you want to stop the building content model
* --------------[ Sets DTD to STOP mode ]----------------
* It's recommended to use this method in accordance with
* the parser's terminate() method.
*
* @update harishd 07/22/99
* @param
* @return
*/
virtual nsresult Terminate(nsIParser* aParser=nsnull);
/**
* Give rest of world access to our tag enums, so that CanContain(), etc,
* become useful.
*/
NS_IMETHOD StringTagToIntTag(nsString &aTag, PRInt32* aIntTag) const;
NS_IMETHOD IntTagToStringTag(PRInt32 aIntTag, nsString& aTag) const;
NS_IMETHOD ConvertEntityToUnicode(const nsString& aEntity, PRInt32* aUnicode) const;
virtual PRBool IsBlockElement(PRInt32 aTagID,PRInt32 aParentID) const {return PR_FALSE;}
virtual PRBool IsInlineElement(PRInt32 aTagID,PRInt32 aParentID) const {return PR_FALSE;}
protected:
nsParser* mParser;
char* mFilename;
nsITokenizer* mTokenizer;
PRBool mHasHeader;
nsDeque mGroups;
PRInt32 mGroupCount;
nsIHTMLContentSink* mSink;
private:
nsresult PushGroup();
nsresult PopGroup();
nsresult OpenContainer(eHTMLTags aTag,const char* aTagName);
nsresult CloseContainer(eHTMLTags aTag);
nsresult AddLeafContainer(eHTMLTags aTag,const char* aTagName);
nsresult EmitStyleContainer(CToken* aToken,eRTFTags aTag,PRBool aState);
};
extern NS_HTMLPARS nsresult NS_NewRTF_DTD(nsIDTD** aInstancePtrResult);
#endif

1
htmlparser/src/MANIFEST
Просмотреть файл

@ -15,7 +15,6 @@ nsToken.h
nsIDTDDebug.h
nsIDTD.h
CNavDTD.h
CRtfDTD.h
nsHTMLTags.h
nsHTMLTagList.h
nsParserCIID.h

1
htmlparser/src/nsIParser.h
Просмотреть файл

@ -374,7 +374,6 @@ const PRUnichar kNullCh = '\0';
#define kTextCSSContentType "text/css"
#define kApplicationJSContentType "application/x-javascript"
#define kTextJSContentType "text/javascript"
#define kRTFTextContentType "text/rtf"
#define kSGMLTextContentType "text/sgml"

3
htmlparser/src/nsParserCIID.h
Просмотреть файл

@ -65,9 +65,6 @@
#define NS_VIEWSOURCE_DTD_CID \
{ 0x8323fad0, 0x2102, 0x11d4, { 0x81, 0x42, 0x0, 0x0, 0x64, 0x65, 0x73, 0x74 } }
// {8323FAD1-2102-11d4-8142-000064657374}
#define NS_CRTF_DTD_CID \
{ 0x8323fad1, 0x2102, 0x11d4, { 0x81, 0x42, 0x0, 0x0, 0x64, 0x65, 0x73, 0x74 } }
// {a6cf910f-15b3-11d2-932e-00805f8add32}

1
layout/build/nsContentDLF.cpp
Просмотреть файл

@ -58,7 +58,6 @@ extern nsresult NS_NewDocumentViewer(nsIDocumentViewer** aResult);
static char* gHTMLTypes[] = {
"text/html",
"text/plain",
"text/rtf",
"text/css",
0
};

1
layout/build/nsLayoutDLF.cpp
Просмотреть файл

@ -61,7 +61,6 @@ static NS_DEFINE_IID(kXULDocumentCID, NS_XULDOCUMENT_CID);
static char* gHTMLTypes[] = {
"text/html",
"text/plain",
"text/rtf",
"text/css",
"text/javascript",
"application/x-javascript",

2
netwerk/mime/public/nsMimeTypes.h
Просмотреть файл

@ -116,8 +116,6 @@
#define TEXT_XML "text/xml"
#define TEXT_RDF "text/rdf"
#define TEXT_XUL "application/vnd.mozilla.xul+xml"
#define TEXT_RTF "text/rtf"
#define TEXT_CPP "text/cpp"
#define VIDEO_MPEG "video/mpeg"

8
netwerk/mime/src/nsXMLMIMEDataSource.cpp
Просмотреть файл

@ -494,14 +494,6 @@ nsXMLMIMEDataSource::InitFromHack() {
rv = AppendExtension(APPLICATION_POSTSCRIPT, "ai");
if (NS_FAILED(rv)) return rv;
rv = AddMapping(TEXT_RTF, "rtf", "Rich Text Format", nsnull);
if (NS_FAILED(rv)) return rv;
rv = AddMapping(TEXT_CPP, "cpp", "CPP file", nsnull, 'TEXT','CWIE');
if (NS_FAILED(rv)) return rv;
rv = AddMapping( "application/x-arj", "arj", "ARJ file", nsnull);
if (NS_FAILED(rv)) return rv;

3
parser/htmlparser/src/CNavDTD.cpp
Просмотреть файл

@ -346,9 +346,6 @@ eAutoDetectResult CNavDTD::CanParse(CParserContext& aParserContext,nsString& aBu
if(PR_TRUE==aParserContext.mMimeType.EqualsWithConversion(kPlainTextContentType)) {
result=ePrimaryDetect;
}
else if(aParserContext.mMimeType.EqualsWithConversion(kRTFTextContentType)){
result=ePrimaryDetect;
}
}
else {
if(PR_TRUE==aParserContext.mMimeType.EqualsWithConversion(kHTMLTextContentType)) {

3
parser/htmlparser/src/COtherDTD.cpp
Просмотреть файл

@ -292,9 +292,6 @@ eAutoDetectResult COtherDTD::CanParse(CParserContext& aParserContext,nsString& a
if(PR_TRUE==aParserContext.mMimeType.EqualsWithConversion(kPlainTextContentType)) {
result=eValidDetect;
}
else if(aParserContext.mMimeType.EqualsWithConversion(kRTFTextContentType)){
result=eValidDetect;
}
}
else {
if(PR_TRUE==aParserContext.mMimeType.EqualsWithConversion(kPlainTextContentType)) {

1206
parser/htmlparser/src/CRtfDTD.cpp
Просмотреть файл

Разница между файлами не показана из-за своего большого размера Загрузить разницу

359
parser/htmlparser/src/CRtfDTD.h
Просмотреть файл

@ -1,359 +0,0 @@
/* -*- Mode: C++; tab-width: 2; indent-tabs-mode: nil; c-basic-offset: 2 -*- */
/*
* The contents of this file are subject to the Netscape Public
* License Version 1.1 (the "License"); you may not use this file
* except in compliance with the License. You may obtain a copy of
* the License at http://www.mozilla.org/NPL/
*
* Software distributed under the License is distributed on an "AS
* IS" basis, WITHOUT WARRANTY OF ANY KIND, either express or
* implied. See the License for the specific language governing
* rights and limitations under the License.
*
* The Original Code is mozilla.org code.
*
* The Initial Developer of the Original Code is Netscape
* Communications Corporation. Portions created by Netscape are
* Copyright (C) 1998 Netscape Communications Corporation. All
* Rights Reserved.
*
* Contributor(s):
*/
/**
* MODULE NOTES:
* @update gess 4/8/98
*
*
*/
#ifndef NS_RTFDTD__
#define NS_RTFDTD__
#include "nsIDTD.h"
#include "nsISupports.h"
#include "nsHTMLTokens.h"
#include "nshtmlpars.h"
#include "nsVoidArray.h"
#include "nsDeque.h"
#include "nsToken.h"
#define NS_RTF_DTD_IID \
{0xa39c6bfc, 0x15f0, 0x11d2, \
{0x80, 0x41, 0x00, 0x10, 0x4b, 0x98, 0x3f, 0xd4}}
class nsIParserNode;
class nsParser;
class nsITokenizer;
class nsIHTMLContentSink;
enum eRTFTokenTypes {
eRTFToken_unknown=0,
eRTFToken_group, // '{'
eRTFToken_controlword, // '\'
eRTFToken_content, // contains all document content
//everything else is just text or attributes of controls...
eRTFToken_last //make sure this stays the last token...
};
enum eRTFTags {
eRTFCtrl_unknown=0,
eRTFCtrl_quote,
eRTFCtrl_star,
eRTFCtrl_linefeed,
eRTFCtrl_return,
eRTFCtrl_begincontrol,
eRTFCtrl_text,
eRTFCtrl_ansi,
eRTFCtrl_bold,
eRTFCtrl_bin,
eRTFCtrl_blue,
eRTFCtrl_cols,
eRTFCtrl_comment,
eRTFCtrl_italic,
eRTFCtrl_font,
eRTFCtrl_fonttable,
eRTFCtrl_green,
eRTFCtrl_bottommargin,
eRTFCtrl_leftmargin,
eRTFCtrl_rightmargin,
eRTFCtrl_topmargin,
eRTFCtrl_par,
eRTFCtrl_pard,
eRTFCtrl_plain,
eRTFCtrl_justified,
eRTFCtrl_fulljustified,
eRTFCtrl_leftjustified,
eRTFCtrl_rightjustified,
eRTFCtrl_rdoublequote,
eRTFCtrl_red,
eRTFCtrl_rtf,
eRTFCtrl_tab,
eRTFCtrl_title,
eRTFCtrl_underline,
eRTFCtrl_startgroup, // {
eRTFCtrl_endgroup, // }
eRTFCtrl_last //make sure this stays the last token...
};
/**
* Represents the token of RTF. Always has form \xxxx<optarg>delimiter
*
* @update gess7/8/98
* @param
* @return
*/
class CRTFControlWord : public CToken {
public:
CRTFControlWord(eRTFTags aTagID);
virtual PRInt32 GetTokenType();
virtual nsresult Consume(PRUnichar aChar,nsScanner& aScanner,PRInt32 aMode);
eRTFTags mTag;
nsString mArgument;
};
/**
* This represents the document content.
*
* @update gess7/8/98
* @param
* @return
*/
class CRTFContent: public CToken {
public:
CRTFContent(PRUnichar* aKey=0);
virtual PRInt32 GetTokenType();
virtual nsresult Consume(PRUnichar aChar,nsScanner& aScanner,PRInt32 aMode);
};
class CRtfDTD : public nsIDTD {
public:
NS_DECL_ISUPPORTS
/**
*
*
* @update gess 4/9/98
* @param
* @return
*/
CRtfDTD();
/**
*
*
* @update gess 4/9/98
* @param
* @return
*/
virtual ~CRtfDTD();
virtual const nsIID& GetMostDerivedIID(void) const;
/**
* Call this method if you want the DTD to construct a clone of itself.
* @update gess7/23/98
* @param
* @return
*/
virtual nsresult CreateNewInstance(nsIDTD** aInstancePtrResult);
/**
* This method is called to determine if the given DTD can parse
* a document in a given source-type.
* NOTE: Parsing always assumes that the end result will involve
* storing the result in the main content model.
* @update gess6/24/98
* @param
* @return TRUE if this DTD can satisfy the request; FALSE otherwise.
*/
virtual eAutoDetectResult CanParse(CParserContext& aParserContext,nsString& aBuffer, PRInt32 aVersion);
/**
* The parser uses a code sandwich to wrap the parsing process. Before
* the process begins, WillBuildModel() is called. Afterwards the parser
* calls DidBuildModel().
* @update rickg 03.20.2000
* @param aParserContext
* @param aSink
* @return error code (almost always 0)
*/
NS_IMETHOD WillBuildModel( const CParserContext& aParserContext,nsIContentSink* aSink);
/**
* The parser uses a code sandwich to wrap the parsing process. Before
* the process begins, WillBuildModel() is called. Afterwards the parser
* calls DidBuildModel().
* @update gess5/18/98
* @param aFilename is the name of the file being parsed.
* @return error code (almost always 0)
*/
NS_IMETHOD BuildModel(nsIParser* aParser,nsITokenizer* aTokenizer,nsITokenObserver* anObserver=0,nsIContentSink* aSink=0);
/**
* The parser uses a code sandwich to wrap the parsing process. Before
* the process begins, WillBuildModel() is called. Afterwards the parser
* calls DidBuildModel().
* @update gess5/18/98
* @param anErrorCode contans the last error that occured
* @return error code
*/
NS_IMETHOD DidBuildModel(nsresult anErrorCode,PRInt32 aLevel,nsIParser* aParser,nsIContentSink* aSink=0);
/**
*
* @update gess 3/25/98
* @param aToken -- token object to be put into content model
* @return 0 if all is well; non-zero is an error
*/
NS_IMETHOD HandleControlWord(CToken* aToken);
/**
*
* @update gess 3/25/98
* @param aToken -- token object to be put into content model
* @return 0 if all is well; non-zero is an error
*/
NS_IMETHOD HandleContent(CToken* aToken);
/**
*
* @update gess 3/25/98
* @param aToken -- token object to be put into content model
* @return 0 if all is well; non-zero is an error
*/
NS_IMETHOD HandleToken(CToken* aToken,nsIParser* aParser);
/**
*
* @update gess 12/20/99
* @param ptr-ref to (out) tokenizer
* @return nsresult
*/
NS_IMETHOD GetTokenizer(nsITokenizer*& aTokenizer);
/**
*
* @update gess5/18/98
* @param
* @return
*/
NS_IMETHOD WillResumeParse(void);
/**
*
* @update gess5/18/98
* @param
* @return
*/
NS_IMETHOD WillInterruptParse(void);
/**
* Called by the parser to initiate dtd verification of the
* internal context stack.
* @update gess 7/23/98
* @param
* @return
*/
virtual PRBool Verify(nsString& aURLRef,nsIParser* aParser);
/**
* Set this to TRUE if you want the DTD to verify its
* context stack.
* @update gess 7/23/98
* @param
* @return
*/
virtual void SetVerification(PRBool aEnable);
/**
* This method is called to determine whether or not a tag
* of one type can contain a tag of another type.
*
* @update gess 3/25/98
* @param aParent -- int tag of parent container
* @param aChild -- int tag of child container
* @return PR_TRUE if parent can contain child
*/
virtual PRBool CanContain(PRInt32 aParent,PRInt32 aChild) const;
/**
* This method gets called to determine whether a given
* tag is itself a container
*
* @update gess 3/25/98
* @param aTag -- tag to test for containership
* @return PR_TRUE if given tag can contain other tags
*/
virtual PRBool IsContainer(PRInt32 aTag) const;
/**
* Retrieve a ptr to the global token recycler...
* @update gess8/4/98
* @return ptr to recycler (or null)
*/
virtual nsTokenAllocator* GetTokenAllocator(void);
/**
* Use this id you want to stop the building content model
* --------------[ Sets DTD to STOP mode ]----------------
* It's recommended to use this method in accordance with
* the parser's terminate() method.
*
* @update harishd 07/22/99
* @param
* @return
*/
virtual nsresult Terminate(nsIParser* aParser=nsnull);
/**
* Give rest of world access to our tag enums, so that CanContain(), etc,
* become useful.
*/
NS_IMETHOD StringTagToIntTag(nsString &aTag, PRInt32* aIntTag) const;
NS_IMETHOD IntTagToStringTag(PRInt32 aIntTag, nsString& aTag) const;
NS_IMETHOD ConvertEntityToUnicode(const nsString& aEntity, PRInt32* aUnicode) const;
virtual PRBool IsBlockElement(PRInt32 aTagID,PRInt32 aParentID) const {return PR_FALSE;}
virtual PRBool IsInlineElement(PRInt32 aTagID,PRInt32 aParentID) const {return PR_FALSE;}
protected:
nsParser* mParser;
char* mFilename;
nsITokenizer* mTokenizer;
PRBool mHasHeader;
nsDeque mGroups;
PRInt32 mGroupCount;
nsIHTMLContentSink* mSink;
private:
nsresult PushGroup();
nsresult PopGroup();
nsresult OpenContainer(eHTMLTags aTag,const char* aTagName);
nsresult CloseContainer(eHTMLTags aTag);
nsresult AddLeafContainer(eHTMLTags aTag,const char* aTagName);
nsresult EmitStyleContainer(CToken* aToken,eRTFTags aTag,PRBool aState);
};
extern NS_HTMLPARS nsresult NS_NewRTF_DTD(nsIDTD** aInstancePtrResult);
#endif

1
parser/htmlparser/src/MANIFEST
Просмотреть файл

@ -15,7 +15,6 @@ nsToken.h
nsIDTDDebug.h
nsIDTD.h
CNavDTD.h
CRtfDTD.h
nsHTMLTags.h
nsHTMLTagList.h
nsParserCIID.h

1
parser/htmlparser/src/nsIParser.h
Просмотреть файл

@ -374,7 +374,6 @@ const PRUnichar kNullCh = '\0';
#define kTextCSSContentType "text/css"
#define kApplicationJSContentType "application/x-javascript"
#define kTextJSContentType "text/javascript"
#define kRTFTextContentType "text/rtf"
#define kSGMLTextContentType "text/sgml"

3
parser/htmlparser/src/nsParserCIID.h
Просмотреть файл

@ -65,9 +65,6 @@
#define NS_VIEWSOURCE_DTD_CID \
{ 0x8323fad0, 0x2102, 0x11d4, { 0x81, 0x42, 0x0, 0x0, 0x64, 0x65, 0x73, 0x74 } }
// {8323FAD1-2102-11d4-8142-000064657374}
#define NS_CRTF_DTD_CID \
{ 0x8323fad1, 0x2102, 0x11d4, { 0x81, 0x42, 0x0, 0x0, 0x64, 0x65, 0x73, 0x74 } }
// {a6cf910f-15b3-11d2-932e-00805f8add32}

2
uriloader/exthandler/nsExternalHelperAppService.cpp
Просмотреть файл

@ -113,8 +113,6 @@ static nsDefaultMimeTypeEntry extraMimeEntries [] =
{ IMAGE_ART, "art", "ART Image", 0, 0 },
{ IMAGE_TIFF, "tiff,tif", "TIFF Image", 0, 0 },
{ APPLICATION_POSTSCRIPT, "ps,eps,ai", "Postscript File",0, 0 },
{ TEXT_RTF, "rtf", "Rich Text Format", 0, 0 },
{ TEXT_CPP, "cpp", "CPP file", 'TEXT','CWIE' },
{ "application/x-arj", "arj", "ARJ file", 0,0 },
};