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 /dbaccess | |
| parent | 5a5940858e1f860101c5cb74921e44f2917b37c8 (diff) | |
convert SvParserState to scoped enum
and drop unused WAITFORDATA enumerator
Change-Id: I658802d88a19dcc2d378456375810454e7426447
Diffstat (limited to 'dbaccess')
| -rw-r--r-- | dbaccess/source/ui/misc/HtmlReader.cxx | 2 | ||||
| -rw-r--r-- | dbaccess/source/ui/misc/RtfReader.cxx | 10 | ||||
| -rw-r--r-- | dbaccess/source/ui/misc/TokenWriter.cxx | 8 |
3 files changed, 10 insertions, 10 deletions
diff --git a/dbaccess/source/ui/misc/HtmlReader.cxx b/dbaccess/source/ui/misc/HtmlReader.cxx index a2aaf9d03340..6ab40504d6ee 100644 --- a/dbaccess/source/ui/misc/HtmlReader.cxx +++ b/dbaccess/source/ui/misc/HtmlReader.cxx @@ -114,7 +114,7 @@ SvParserState OHTMLReader::CallParser() rInput.ResetError(); SvParserState eParseState = HTMLParser::CallParser(); SetColumnTypes(m_pColumnList,m_pInfoMap); - return m_bFoundTable ? eParseState : SVPAR_ERROR; + return m_bFoundTable ? eParseState : SvParserState::Error; } void OHTMLReader::NextToken( int nToken ) diff --git a/dbaccess/source/ui/misc/RtfReader.cxx b/dbaccess/source/ui/misc/RtfReader.cxx index 4adee9797122..268845c31cec 100644 --- a/dbaccess/source/ui/misc/RtfReader.cxx +++ b/dbaccess/source/ui/misc/RtfReader.cxx @@ -92,7 +92,7 @@ SvParserState ORTFReader::CallParser() rInput.ResetError(); SvParserState eParseState = SvRTFParser::CallParser(); SetColumnTypes(m_pColumnList,m_pInfoMap); - return m_bFoundTable ? eParseState : SVPAR_ERROR; + return m_bFoundTable ? eParseState : SvParserState::Error; } void ORTFReader::NextToken( int nToken ) @@ -122,11 +122,11 @@ void ORTFReader::NextToken( int nToken ) } nTmpToken2 = GetNextToken(); } - while(aToken[0] != ';' && eState != SVPAR_ERROR && eState != SVPAR_ACCEPTED); + while(aToken[0] != ';' && eState != SvParserState::Error && eState != SvParserState::Accepted); m_vecColor.push_back(aColor.GetRGBColor()); nTmpToken2 = GetNextToken(); } - while(nTmpToken2 == RTF_RED && eState != SVPAR_ERROR && eState != SVPAR_ACCEPTED); + while(nTmpToken2 == RTF_RED && eState != SvParserState::Error && eState != SvParserState::Accepted); SkipToken(); } break; @@ -221,7 +221,7 @@ void ORTFReader::NextToken( int nToken ) { do {} - while(GetNextToken() != RTF_ROW && eState != SVPAR_ERROR && eState != SVPAR_ACCEPTED); + while(GetNextToken() != RTF_ROW && eState != SvParserState::Error && eState != SvParserState::Accepted); m_bHead = false; } break; @@ -302,7 +302,7 @@ bool ORTFReader::CreateTable(int nToken) } nToken = GetNextToken(); } - while(nToken != RTF_TROWD && eState != SVPAR_ERROR && eState != SVPAR_ACCEPTED); + while(nToken != RTF_TROWD && eState != SvParserState::Error && eState != SvParserState::Accepted); bool bOk = !m_vDestVector.empty(); if(bOk) diff --git a/dbaccess/source/ui/misc/TokenWriter.cxx b/dbaccess/source/ui/misc/TokenWriter.cxx index 8b63406349aa..e2edd92abd4e 100644 --- a/dbaccess/source/ui/misc/TokenWriter.cxx +++ b/dbaccess/source/ui/misc/TokenWriter.cxx @@ -590,7 +590,7 @@ void ORTFImportExport::appendRow(OString* pHorzChar,sal_Int32 _nColumnCount,sal_ bool ORTFImportExport::Read() { ODatabaseImportExport::Read(); - SvParserState eState = SVPAR_ERROR; + SvParserState eState = SvParserState::Error; if ( m_pStream ) { m_pReader = new ORTFReader((*m_pStream),m_xConnection,m_xFormatter,m_xContext); @@ -602,7 +602,7 @@ bool ORTFImportExport::Read() m_pReader = nullptr; } - return eState != SVPAR_ERROR; + return eState != SvParserState::Error; } const sal_Int16 OHTMLImportExport::nDefaultFontSize[SBA_HTML_FONTSIZES] = @@ -661,7 +661,7 @@ bool OHTMLImportExport::Write() bool OHTMLImportExport::Read() { ODatabaseImportExport::Read(); - SvParserState eState = SVPAR_ERROR; + SvParserState eState = SvParserState::Error; if ( m_pStream ) { m_pReader = new OHTMLReader((*m_pStream),m_xConnection,m_xFormatter,m_xContext); @@ -674,7 +674,7 @@ bool OHTMLImportExport::Read() m_pReader = nullptr; } - return eState != SVPAR_ERROR; + return eState != SvParserState::Error; } void OHTMLImportExport::WriteHeader() |