This commit is contained in:
harishd%netscape.com 1999-10-06 23:24:28 +00:00
Родитель 4404653cbb
Коммит e47fa0e6b1
4 изменённых файлов: 12 добавлений и 12 удалений

Просмотреть файл

@ -515,7 +515,7 @@ PRInt32 CRTFControlWord::GetTokenType() {
return eRTFToken_controlword; return eRTFToken_controlword;
} }
nsresult CRTFControlWord::Consume(PRUnichar aChar,nsScanner& aScanner) { nsresult CRTFControlWord::Consume(PRUnichar aChar,nsScanner& aScanner,PRInt32 aMode) {
const char* gAlphaChars="ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz"; const char* gAlphaChars="ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz";
const char* gDigits="-0123456789"; const char* gDigits="-0123456789";
@ -564,7 +564,7 @@ PRBool CRTFGroup::IsGroupStart(){
return mStart; return mStart;
} }
nsresult CRTFGroup::Consume(PRUnichar aChar,nsScanner& aScanner) { nsresult CRTFGroup::Consume(PRUnichar aChar,nsScanner& aScanner,PRInt32 aMode) {
PRInt32 result=NS_OK; PRInt32 result=NS_OK;
if(PR_FALSE==mStart) if(PR_FALSE==mStart)
result=aScanner.SkipWhitespace(); result=aScanner.SkipWhitespace();
@ -594,7 +594,7 @@ PRInt32 CRTFContent::GetTokenType() {
* @return * @return
*/ */
nsresult CRTFContent::Consume(PRUnichar aChar,nsScanner& aScanner) { nsresult CRTFContent::Consume(PRUnichar aChar,nsScanner& aScanner,PRInt32 aMode) {
static const char* textTerminators="\\{}"; static const char* textTerminators="\\{}";
PRInt32 result=aScanner.ReadUntil(mTextValue,textTerminators,PR_FALSE,PR_FALSE); PRInt32 result=aScanner.ReadUntil(mTextValue,textTerminators,PR_FALSE,PR_FALSE);
return result; return result;

Просмотреть файл

@ -102,7 +102,7 @@ class CRTFControlWord : public CToken {
public: public:
CRTFControlWord(char* aKey); CRTFControlWord(char* aKey);
virtual PRInt32 GetTokenType(); virtual PRInt32 GetTokenType();
virtual nsresult Consume(PRUnichar aChar,nsScanner& aScanner); virtual nsresult Consume(PRUnichar aChar,nsScanner& aScanner,PRInt32 aMode);
protected: protected:
nsString mArgument; nsString mArgument;
}; };
@ -120,7 +120,7 @@ public:
virtual PRInt32 GetTokenType(); virtual PRInt32 GetTokenType();
virtual void SetGroupStart(PRBool aFlag); virtual void SetGroupStart(PRBool aFlag);
virtual PRBool IsGroupStart(); virtual PRBool IsGroupStart();
virtual nsresult Consume(PRUnichar aChar,nsScanner& aScanner); virtual nsresult Consume(PRUnichar aChar,nsScanner& aScanner,PRInt32 aMode);
protected: protected:
PRBool mStart; PRBool mStart;
}; };
@ -136,7 +136,7 @@ class CRTFContent: public CToken {
public: public:
CRTFContent(PRUnichar* aValue); CRTFContent(PRUnichar* aValue);
virtual PRInt32 GetTokenType(); virtual PRInt32 GetTokenType();
virtual nsresult Consume(PRUnichar aChar,nsScanner& aScanner); virtual nsresult Consume(PRUnichar aChar,nsScanner& aScanner,PRInt32 aMode);
}; };

Просмотреть файл

@ -515,7 +515,7 @@ PRInt32 CRTFControlWord::GetTokenType() {
return eRTFToken_controlword; return eRTFToken_controlword;
} }
nsresult CRTFControlWord::Consume(PRUnichar aChar,nsScanner& aScanner) { nsresult CRTFControlWord::Consume(PRUnichar aChar,nsScanner& aScanner,PRInt32 aMode) {
const char* gAlphaChars="ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz"; const char* gAlphaChars="ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz";
const char* gDigits="-0123456789"; const char* gDigits="-0123456789";
@ -564,7 +564,7 @@ PRBool CRTFGroup::IsGroupStart(){
return mStart; return mStart;
} }
nsresult CRTFGroup::Consume(PRUnichar aChar,nsScanner& aScanner) { nsresult CRTFGroup::Consume(PRUnichar aChar,nsScanner& aScanner,PRInt32 aMode) {
PRInt32 result=NS_OK; PRInt32 result=NS_OK;
if(PR_FALSE==mStart) if(PR_FALSE==mStart)
result=aScanner.SkipWhitespace(); result=aScanner.SkipWhitespace();
@ -594,7 +594,7 @@ PRInt32 CRTFContent::GetTokenType() {
* @return * @return
*/ */
nsresult CRTFContent::Consume(PRUnichar aChar,nsScanner& aScanner) { nsresult CRTFContent::Consume(PRUnichar aChar,nsScanner& aScanner,PRInt32 aMode) {
static const char* textTerminators="\\{}"; static const char* textTerminators="\\{}";
PRInt32 result=aScanner.ReadUntil(mTextValue,textTerminators,PR_FALSE,PR_FALSE); PRInt32 result=aScanner.ReadUntil(mTextValue,textTerminators,PR_FALSE,PR_FALSE);
return result; return result;

Просмотреть файл

@ -102,7 +102,7 @@ class CRTFControlWord : public CToken {
public: public:
CRTFControlWord(char* aKey); CRTFControlWord(char* aKey);
virtual PRInt32 GetTokenType(); virtual PRInt32 GetTokenType();
virtual nsresult Consume(PRUnichar aChar,nsScanner& aScanner); virtual nsresult Consume(PRUnichar aChar,nsScanner& aScanner,PRInt32 aMode);
protected: protected:
nsString mArgument; nsString mArgument;
}; };
@ -120,7 +120,7 @@ public:
virtual PRInt32 GetTokenType(); virtual PRInt32 GetTokenType();
virtual void SetGroupStart(PRBool aFlag); virtual void SetGroupStart(PRBool aFlag);
virtual PRBool IsGroupStart(); virtual PRBool IsGroupStart();
virtual nsresult Consume(PRUnichar aChar,nsScanner& aScanner); virtual nsresult Consume(PRUnichar aChar,nsScanner& aScanner,PRInt32 aMode);
protected: protected:
PRBool mStart; PRBool mStart;
}; };
@ -136,7 +136,7 @@ class CRTFContent: public CToken {
public: public:
CRTFContent(PRUnichar* aValue); CRTFContent(PRUnichar* aValue);
virtual PRInt32 GetTokenType(); virtual PRInt32 GetTokenType();
virtual nsresult Consume(PRUnichar aChar,nsScanner& aScanner); virtual nsresult Consume(PRUnichar aChar,nsScanner& aScanner,PRInt32 aMode);
}; };