diff options
author | Michael Stahl <mstahl@redhat.com> | 2012-07-12 22:08:10 +0200 |
---|---|---|
committer | Michael Stahl <mstahl@redhat.com> | 2012-07-12 22:08:10 +0200 |
commit | 23e28754730f5b864fd0e7475ac2596b2b5899cf (patch) | |
tree | 29848ee6f2966ba4ec9ea4a1f3d3d15d14556c1b /sax | |
parent | npapi.h: work around idiotic warnings from winnt.h (diff) | |
download | core-23e28754730f5b864fd0e7475ac2596b2b5899cf.tar.gz core-23e28754730f5b864fd0e7475ac2596b2b5899cf.zip |
XML_Parse returns enum XML_Status
Change-Id: Ie4dde5aa412dae05d2629ce5675356db70b2529b
Diffstat (limited to 'sax')
-rw-r--r-- | sax/source/expatwrap/sax_expat.cxx | 2 | ||||
-rw-r--r-- | sax/source/fastparser/fastparser.cxx | 3 |
2 files changed, 3 insertions, 2 deletions
diff --git a/sax/source/expatwrap/sax_expat.cxx b/sax/source/expatwrap/sax_expat.cxx index c4d214b3a9e1..33707c440d9b 100644 --- a/sax/source/expatwrap/sax_expat.cxx +++ b/sax/source/expatwrap/sax_expat.cxx @@ -740,7 +740,7 @@ void SaxExpatParser_Impl::parse( ) sal_Bool bContinue = ( XML_Parse( getEntity().pParser , (const char *) seqOut.getArray(), nRead, - 0 ) != 0 ); + 0 ) != XML_STATUS_ERROR ); if( ! bContinue || this->bExceptionWasThrown ) { diff --git a/sax/source/fastparser/fastparser.cxx b/sax/source/fastparser/fastparser.cxx index 965a1a82b4d5..4f63130f1393 100644 --- a/sax/source/fastparser/fastparser.cxx +++ b/sax/source/fastparser/fastparser.cxx @@ -658,7 +658,8 @@ void FastSaxParser::parse() break; } - bool bContinue = XML_Parse( rEntity.mpParser, (const char*) seqOut.getConstArray(), nRead, 0 ) != 0; + bool const bContinue = XML_STATUS_ERROR != XML_Parse(rEntity.mpParser, + reinterpret_cast<const char*>(seqOut.getConstArray()), nRead, 0); // callbacks used inside XML_Parse may have caught an exception if( !bContinue || rEntity.maSavedException.hasValue() ) { |