diff options
| author | Tor Lillqvist <tml@iki.fi> | 2013-05-22 20:16:28 +0300 |
|---|---|---|
| committer | Tor Lillqvist <tml@iki.fi> | 2013-05-24 12:40:46 +0300 |
| commit | 6cf30940750607eeb062113dbee9968769d7bd06 (patch) | |
| tree | 5d30410c5f32f45105d896c065da3fffbd5edf88 /writerfilter/source/doctok | |
| parent | 503b248127a92b9ad190e05f6a1d50574183cd47 (diff) | |
WaE: implicit conversion of NULL constant to nullptr_t
Change-Id: I2eefbca1ef986219f04504cba4ca09a22972e8cb
Diffstat (limited to 'writerfilter/source/doctok')
| -rw-r--r-- | writerfilter/source/doctok/DffImpl.cxx | 2 | ||||
| -rw-r--r-- | writerfilter/source/doctok/WW8DocumentImpl.cxx | 2 | ||||
| -rw-r--r-- | writerfilter/source/doctok/WW8ResourceModelImpl.cxx | 2 |
3 files changed, 3 insertions, 3 deletions
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()) { |