summaryrefslogtreecommitdiff
path: root/sax/source/expatwrap
diff options
context:
space:
mode:
authorStephan Bergmann <sbergman@redhat.com>2015-11-10 10:22:34 +0100
committerStephan Bergmann <sbergman@redhat.com>2015-11-10 10:31:35 +0100
commit60c40af090e420a8619b5236bde1ff4ef79100c6 (patch)
treeec8f50b4325045bec03708e14dcd996631c6c828 /sax/source/expatwrap
parentde63cac20fba1e7661687a4f1c1ce91182f4dfa0 (diff)
loplugin:nullptr (automatic rewrite)
Change-Id: I54bf272b404d2302cafbde73ec5061ea2cd966ab
Diffstat (limited to 'sax/source/expatwrap')
-rw-r--r--sax/source/expatwrap/sax_expat.cxx8
-rw-r--r--sax/source/expatwrap/saxwriter.cxx4
-rw-r--r--sax/source/expatwrap/xml2utf.cxx4
3 files changed, 8 insertions, 8 deletions
diff --git a/sax/source/expatwrap/sax_expat.cxx b/sax/source/expatwrap/sax_expat.cxx
index 51f72f7b5c64..71bb2575818a 100644
--- a/sax/source/expatwrap/sax_expat.cxx
+++ b/sax/source/expatwrap/sax_expat.cxx
@@ -435,7 +435,7 @@ void SaxExpatParser::parseStream( const InputSource& structSource)
}
// create parser with proper encoding
- entity.pParser = XML_ParserCreate( 0 );
+ entity.pParser = XML_ParserCreate( nullptr );
if( ! entity.pParser )
{
throw SAXException("Couldn't create parser",
@@ -457,7 +457,7 @@ void SaxExpatParser::parseStream( const InputSource& structSource)
XML_SetNotationDeclHandler( entity.pParser, call_callbackNotationDecl );
XML_SetExternalEntityRefHandler( entity.pParser,
call_callbackExternalEntityRef);
- XML_SetUnknownEncodingHandler( entity.pParser, call_callbackUnknownEncoding ,0);
+ XML_SetUnknownEncodingHandler( entity.pParser, call_callbackUnknownEncoding ,nullptr);
if( m_pImpl->rExtendedDocumentHandler.is() ) {
@@ -802,7 +802,7 @@ void SaxExpatParser_Impl::callbackEntityDecl(
XML_StopParser(pImpl->getEntity().pParser, XML_FALSE);
pImpl->exception = SAXParseException(
"SaxExpatParser: internal entity declaration, stopping",
- 0, css::uno::Any(),
+ nullptr, css::uno::Any(),
pImpl->rDocumentLocator->getPublicId(),
pImpl->rDocumentLocator->getSystemId(),
pImpl->rDocumentLocator->getLineNumber(),
@@ -874,7 +874,7 @@ bool SaxExpatParser_Impl::callbackExternalEntityRef(
}
if( entity.structSource.aInputStream.is() ) {
- entity.pParser = XML_ExternalEntityParserCreate( parser , context, 0 );
+ entity.pParser = XML_ExternalEntityParserCreate( parser , context, nullptr );
if( ! entity.pParser )
{
return false;
diff --git a/sax/source/expatwrap/saxwriter.cxx b/sax/source/expatwrap/saxwriter.cxx
index 9c5b94f53301..2c5c56bee475 100644
--- a/sax/source/expatwrap/saxwriter.cxx
+++ b/sax/source/expatwrap/saxwriter.cxx
@@ -109,7 +109,7 @@ public:
explicit SaxWriterHelper(Reference< XOutputStream > m_TempOut)
: m_out(m_TempOut)
, m_Sequence(SEQUENCESIZE)
- , mp_Sequence(NULL)
+ , mp_Sequence(nullptr)
, nLastLineFeedPos(0)
, nCurrentPos(0)
, m_bStartElementFinished(true)
@@ -875,7 +875,7 @@ class SAXWriter :
{
public:
SAXWriter()
- : m_pSaxWriterHelper(NULL)
+ : m_pSaxWriterHelper(nullptr)
, m_bDocStarted(false)
, m_bIsCDATA(false)
, m_bForceLineBreak(false)
diff --git a/sax/source/expatwrap/xml2utf.cxx b/sax/source/expatwrap/xml2utf.cxx
index 64e0c1407e39..68b44f6461cb 100644
--- a/sax/source/expatwrap/xml2utf.cxx
+++ b/sax/source/expatwrap/xml2utf.cxx
@@ -347,8 +347,8 @@ void XMLFile2UTFConverter::initializeDecoding()
Text2UnicodeConverter::Text2UnicodeConverter( const OString &sEncoding )
- : m_convText2Unicode(NULL)
- , m_contextText2Unicode(NULL)
+ : m_convText2Unicode(nullptr)
+ , m_contextText2Unicode(nullptr)
, m_rtlEncoding(RTL_TEXTENCODING_DONTKNOW)
{
rtl_TextEncoding encoding = rtl_getTextEncodingFromMimeCharset( sEncoding.getStr() );