diff options
| author | Noel Grandin <noel.grandin@collabora.co.uk> | 2017-02-14 12:53:43 +0200 |
|---|---|---|
| committer | Noel Grandin <noel.grandin@collabora.co.uk> | 2017-02-14 14:22:24 +0200 |
| commit | 52305b662033ebbac6e09aa66622f7eef2bfccae (patch) | |
| tree | d25c90e302557323ca821a45b3c13513752e2aa9 /editeng | |
| parent | 5a5940858e1f860101c5cb74921e44f2917b37c8 (diff) | |
convert SvParserState to scoped enum
and drop unused WAITFORDATA enumerator
Change-Id: I658802d88a19dcc2d378456375810454e7426447
Diffstat (limited to 'editeng')
| -rw-r--r-- | editeng/source/editeng/eehtml.cxx | 2 | ||||
| -rw-r--r-- | editeng/source/editeng/impedit4.cxx | 4 | ||||
| -rw-r--r-- | editeng/source/rtf/svxrtf.cxx | 12 |
3 files changed, 9 insertions, 9 deletions
diff --git a/editeng/source/editeng/eehtml.cxx b/editeng/source/editeng/eehtml.cxx index f0f6cd3ffec7..b76fbe86b67f 100644 --- a/editeng/source/editeng/eehtml.cxx +++ b/editeng/source/editeng/eehtml.cxx @@ -73,7 +73,7 @@ SvParserState EditHTMLParser::CallParser(EditEngine* pEE, const EditPaM& rPaM) { DBG_ASSERT(pEE, "CallParser: ImpEditEngine ?!"); mpEditEngine = pEE; - SvParserState _eState = SVPAR_NOTSTARTED; + SvParserState _eState = SvParserState::NotStarted; if ( mpEditEngine ) { // Build in wrap mimic in RTF import? diff --git a/editeng/source/editeng/impedit4.cxx b/editeng/source/editeng/impedit4.cxx index 55e175cf0474..0c457228676e 100644 --- a/editeng/source/editeng/impedit4.cxx +++ b/editeng/source/editeng/impedit4.cxx @@ -164,7 +164,7 @@ EditPaM ImpEditEngine::ReadRTF( SvStream& rInput, EditSelection aSel ) EditRTFParserRef xPrsr = new EditRTFParser(rInput, aSel, *pPool, pEditEngine); SvParserState eState = xPrsr->CallParser(); - if ( ( eState != SVPAR_ACCEPTED ) && ( !rInput.GetError() ) ) + if ( ( eState != SvParserState::Accepted ) && ( !rInput.GetError() ) ) { rInput.SetError( EE_READWRITE_WRONGFORMAT ); return aSel.Min(); @@ -179,7 +179,7 @@ EditPaM ImpEditEngine::ReadHTML( SvStream& rInput, const OUString& rBaseURL, Edi EditHTMLParserRef xPrsr = new EditHTMLParser( rInput, rBaseURL, pHTTPHeaderAttrs ); SvParserState eState = xPrsr->CallParser(pEditEngine, aSel.Max()); - if ( ( eState != SVPAR_ACCEPTED ) && ( !rInput.GetError() ) ) + if ( ( eState != SvParserState::Accepted ) && ( !rInput.GetError() ) ) { rInput.SetError( EE_READWRITE_WRONGFORMAT ); return aSel.Min(); diff --git a/editeng/source/rtf/svxrtf.cxx b/editeng/source/rtf/svxrtf.cxx index c88070c22f26..0aef5b3e32cf 100644 --- a/editeng/source/rtf/svxrtf.cxx +++ b/editeng/source/rtf/svxrtf.cxx @@ -107,7 +107,7 @@ SvParserState SvxRTFParser::CallParser() DBG_ASSERT( pInsPos, "no insertion position"); if( !pInsPos ) - return SVPAR_ERROR; + return SvParserState::Error; if( !aColorTbl.empty() ) ClearColorTbl(); @@ -134,7 +134,7 @@ void SvxRTFParser::Continue( int nToken ) { SvRTFParser::Continue( nToken ); - if( SVPAR_PENDING != GetStatus() ) + if( SvParserState::Pending != GetStatus() ) { SetAllAttrOfStk(); //Regardless of what "color 0" is, word defaults to auto as the default colour. @@ -328,7 +328,7 @@ void SvxRTFParser::ReadStyleTable() ReadUnknownData(); nToken = GetNextToken(); if( '}' != nToken ) - eState = SVPAR_ERROR; + eState = SvParserState::Error; break; } ++_nOpenBrakets; @@ -486,7 +486,7 @@ void SvxRTFParser::ReadFontTable() ReadUnknownData(); nToken = GetNextToken(); if( '}' != nToken ) - eState = SVPAR_ERROR; + eState = SvParserState::Error; break; } ++_nOpenBrakets; @@ -602,7 +602,7 @@ OUString& SvxRTFParser::GetTextToEndGroup( OUString& rStr ) ReadUnknownData(); int nToken = GetNextToken(); if( '}' != nToken ) - eState = SVPAR_ERROR; + eState = SvParserState::Error; break; } ++_nOpenBrakets; @@ -666,7 +666,7 @@ void SvxRTFParser::ReadInfo() ReadUnknownData(); nToken = GetNextToken(); if( '}' != nToken ) - eState = SVPAR_ERROR; + eState = SvParserState::Error; break; } ++_nOpenBrakets; |