From 6cf30940750607eeb062113dbee9968769d7bd06 Mon Sep 17 00:00:00 2001
From: Tor Lillqvist <tml@iki.fi>
Date: Wed, 22 May 2013 20:16:28 +0300
Subject: WaE: implicit conversion of NULL constant to nullptr_t

Change-Id: I2eefbca1ef986219f04504cba4ca09a22972e8cb
---
 writerfilter/source/dmapper/DomainMapper.cxx        | 4 ++--
 writerfilter/source/dmapper/FormControlHelper.hxx   | 2 +-
 writerfilter/source/dmapper/NumberingManager.cxx    | 2 +-
 writerfilter/source/doctok/DffImpl.cxx              | 2 +-
 writerfilter/source/doctok/WW8DocumentImpl.cxx      | 2 +-
 writerfilter/source/doctok/WW8ResourceModelImpl.cxx | 2 +-
 6 files changed, 7 insertions(+), 7 deletions(-)

(limited to 'writerfilter')

diff --git a/writerfilter/source/dmapper/DomainMapper.cxx b/writerfilter/source/dmapper/DomainMapper.cxx
index 561243448498..0be87b7fee49 100644
--- a/writerfilter/source/dmapper/DomainMapper.cxx
+++ b/writerfilter/source/dmapper/DomainMapper.cxx
@@ -3622,7 +3622,7 @@ void DomainMapper::lcl_text(const sal_uInt8 * data_, size_t len)
             m_pImpl->SetFieldResult( sText );
         else
         {
-            if (pContext == NULL)
+            if (pContext == 0)
                 pContext.reset(new PropertyMap());
 
             m_pImpl->appendTextPortion( sText, pContext );
@@ -3709,7 +3709,7 @@ void DomainMapper::lcl_utext(const sal_uInt8 * data_, size_t len)
                 m_pImpl->SetFieldResult( sText );
             else
             {
-                if (pContext == NULL)
+                if (pContext == 0)
                     pContext.reset(new PropertyMap());
 
                 m_pImpl->appendTextPortion( sText, pContext );
diff --git a/writerfilter/source/dmapper/FormControlHelper.hxx b/writerfilter/source/dmapper/FormControlHelper.hxx
index 3ec1a8887eff..d7c9bc51445c 100644
--- a/writerfilter/source/dmapper/FormControlHelper.hxx
+++ b/writerfilter/source/dmapper/FormControlHelper.hxx
@@ -41,7 +41,7 @@ public:
 
     bool insertControl(uno::Reference<text::XTextRange> xTextRange);
     bool processField(uno::Reference<text::XFormField> xFormField);
-    bool hasFFDataHandler() const { return (m_pFFData != NULL); }
+    bool hasFFDataHandler() const { return (m_pFFData != 0); }
 private:
     FFDataHandler::Pointer_t m_pFFData;
     struct FormControlHelper_Impl;
diff --git a/writerfilter/source/dmapper/NumberingManager.cxx b/writerfilter/source/dmapper/NumberingManager.cxx
index 98dacdf9a6a0..1923c867470c 100644
--- a/writerfilter/source/dmapper/NumberingManager.cxx
+++ b/writerfilter/source/dmapper/NumberingManager.cxx
@@ -1155,7 +1155,7 @@ AbstractListDef::Pointer ListsManager::GetAbstractList( sal_Int32 nId )
                 if( pStyleSheetProperties && pStyleSheetProperties->GetNumId() >= 0 )
                 {
                     ListDef::Pointer pList = GetList( pStyleSheetProperties->GetNumId() );
-                    if ( pList!=NULL )
+                    if ( pList!=0 )
                         return pList->GetAbstractDefinition();
                     else
                         pAbstractList = m_aAbstractLists[i];
diff --git a/writerfilter/source/doctok/DffImpl.cxx b/writerfilter/source/doctok/DffImpl.cxx
index 5457fefe352d..0d185a810578 100644
--- a/writerfilter/source/doctok/DffImpl.cxx
+++ b/writerfilter/source/doctok/DffImpl.cxx
@@ -39,7 +39,7 @@ protected:
 public:
     static Pointer_t Instance()
     {
-        if (pInstance == NULL)
+        if (pInstance == 0)
             pInstance = Pointer_t(new ShapeTypeToString());
 
         return pInstance;
diff --git a/writerfilter/source/doctok/WW8DocumentImpl.cxx b/writerfilter/source/doctok/WW8DocumentImpl.cxx
index cfdae5ff777c..9e914a4cab41 100644
--- a/writerfilter/source/doctok/WW8DocumentImpl.cxx
+++ b/writerfilter/source/doctok/WW8DocumentImpl.cxx
@@ -1174,7 +1174,7 @@ WW8DocumentImpl::getBlip(sal_uInt32 nBid)
 {
     writerfilter::Reference<Properties>::Pointer_t pResult;
 
-    if (mpDffBlock != NULL)
+    if (mpDffBlock != 0)
     {
         DffRecord::Pointer_t pDffRecord(mpDffBlock->getBlip(nBid));
 
diff --git a/writerfilter/source/doctok/WW8ResourceModelImpl.cxx b/writerfilter/source/doctok/WW8ResourceModelImpl.cxx
index c77b68249492..10f5891eb239 100644
--- a/writerfilter/source/doctok/WW8ResourceModelImpl.cxx
+++ b/writerfilter/source/doctok/WW8ResourceModelImpl.cxx
@@ -118,7 +118,7 @@ string WW8TableReference::getType() const
 
 void WW8PropertiesReference::resolve(Properties & rHandler)
 {
-    if (mpPropSet != NULL)
+    if (mpPropSet != 0)
     {
         if (mpPropSet->isPap())
         {
-- 
cgit