зеркало из https://github.com/mozilla/pjs.git
Fix for bug 206027. r=harishd@netscape.com, sr=jst@netscape.com, a=mkaply@us.ibm.com. Make cut n paste from Powerpoint into Mozilla work properly.
This commit is contained in:
Родитель
6b9421960f
Коммит
e8d81b278e
|
@ -308,7 +308,7 @@ class CCDATASectionToken : public CHTMLToken {
|
||||||
CTOKEN_IMPL_SIZEOF
|
CTOKEN_IMPL_SIZEOF
|
||||||
|
|
||||||
public:
|
public:
|
||||||
CCDATASectionToken();
|
CCDATASectionToken(eHTMLTags aTag = eHTMLTag_unknown);
|
||||||
CCDATASectionToken(const nsAString& aString);
|
CCDATASectionToken(const nsAString& aString);
|
||||||
virtual nsresult Consume(PRUnichar aChar,nsScanner& aScanner,PRInt32 aMode);
|
virtual nsresult Consume(PRUnichar aChar,nsScanner& aScanner,PRInt32 aMode);
|
||||||
virtual const char* GetClassName(void);
|
virtual const char* GetClassName(void);
|
||||||
|
|
|
@ -1366,7 +1366,7 @@ CToken* nsTokenAllocator::CreateTokenOfType(eHTMLTokenTypes aType,eHTMLTags aTag
|
||||||
case eToken_script: result=new(mArenaPool) CScriptToken(); break;
|
case eToken_script: result=new(mArenaPool) CScriptToken(); break;
|
||||||
case eToken_style: result=new(mArenaPool) CStyleToken(); break;
|
case eToken_style: result=new(mArenaPool) CStyleToken(); break;
|
||||||
case eToken_instruction: result=new(mArenaPool) CInstructionToken(); break;
|
case eToken_instruction: result=new(mArenaPool) CInstructionToken(); break;
|
||||||
case eToken_cdatasection: result=new(mArenaPool) CCDATASectionToken(); break;
|
case eToken_cdatasection: result=new(mArenaPool) CCDATASectionToken(aTag); break;
|
||||||
case eToken_error: result=new(mArenaPool) CErrorToken(); break;
|
case eToken_error: result=new(mArenaPool) CErrorToken(); break;
|
||||||
case eToken_doctypeDecl: result=new(mArenaPool) CDoctypeDeclToken(aTag); break;
|
case eToken_doctypeDecl: result=new(mArenaPool) CDoctypeDeclToken(aTag); break;
|
||||||
case eToken_markupDecl: result=new(mArenaPool) CMarkupDeclToken(); break;
|
case eToken_markupDecl: result=new(mArenaPool) CMarkupDeclToken(); break;
|
||||||
|
|
|
@ -707,7 +707,7 @@ void CTextToken::Bind(const nsAString& aStr)
|
||||||
* @param aName -- string to init token name with
|
* @param aName -- string to init token name with
|
||||||
* @return
|
* @return
|
||||||
*/
|
*/
|
||||||
CCDATASectionToken::CCDATASectionToken() : CHTMLToken(eHTMLTag_unknown) {
|
CCDATASectionToken::CCDATASectionToken(eHTMLTags aTag) : CHTMLToken(aTag) {
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
|
|
|
@ -308,7 +308,7 @@ class CCDATASectionToken : public CHTMLToken {
|
||||||
CTOKEN_IMPL_SIZEOF
|
CTOKEN_IMPL_SIZEOF
|
||||||
|
|
||||||
public:
|
public:
|
||||||
CCDATASectionToken();
|
CCDATASectionToken(eHTMLTags aTag = eHTMLTag_unknown);
|
||||||
CCDATASectionToken(const nsAString& aString);
|
CCDATASectionToken(const nsAString& aString);
|
||||||
virtual nsresult Consume(PRUnichar aChar,nsScanner& aScanner,PRInt32 aMode);
|
virtual nsresult Consume(PRUnichar aChar,nsScanner& aScanner,PRInt32 aMode);
|
||||||
virtual const char* GetClassName(void);
|
virtual const char* GetClassName(void);
|
||||||
|
|
|
@ -1366,7 +1366,7 @@ CToken* nsTokenAllocator::CreateTokenOfType(eHTMLTokenTypes aType,eHTMLTags aTag
|
||||||
case eToken_script: result=new(mArenaPool) CScriptToken(); break;
|
case eToken_script: result=new(mArenaPool) CScriptToken(); break;
|
||||||
case eToken_style: result=new(mArenaPool) CStyleToken(); break;
|
case eToken_style: result=new(mArenaPool) CStyleToken(); break;
|
||||||
case eToken_instruction: result=new(mArenaPool) CInstructionToken(); break;
|
case eToken_instruction: result=new(mArenaPool) CInstructionToken(); break;
|
||||||
case eToken_cdatasection: result=new(mArenaPool) CCDATASectionToken(); break;
|
case eToken_cdatasection: result=new(mArenaPool) CCDATASectionToken(aTag); break;
|
||||||
case eToken_error: result=new(mArenaPool) CErrorToken(); break;
|
case eToken_error: result=new(mArenaPool) CErrorToken(); break;
|
||||||
case eToken_doctypeDecl: result=new(mArenaPool) CDoctypeDeclToken(aTag); break;
|
case eToken_doctypeDecl: result=new(mArenaPool) CDoctypeDeclToken(aTag); break;
|
||||||
case eToken_markupDecl: result=new(mArenaPool) CMarkupDeclToken(); break;
|
case eToken_markupDecl: result=new(mArenaPool) CMarkupDeclToken(); break;
|
||||||
|
|
|
@ -707,7 +707,7 @@ void CTextToken::Bind(const nsAString& aStr)
|
||||||
* @param aName -- string to init token name with
|
* @param aName -- string to init token name with
|
||||||
* @return
|
* @return
|
||||||
*/
|
*/
|
||||||
CCDATASectionToken::CCDATASectionToken() : CHTMLToken(eHTMLTag_unknown) {
|
CCDATASectionToken::CCDATASectionToken(eHTMLTags aTag) : CHTMLToken(aTag) {
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
|
|
Загрузка…
Ссылка в новой задаче