diff options
author | Tor Lillqvist <tml@collabora.com> | 2014-09-28 08:55:35 +0300 |
---|---|---|
committer | Tor Lillqvist <tml@collabora.com> | 2014-09-28 08:55:51 +0300 |
commit | 9d225c9d3a153d54bcdf4260390db8224816e4e5 (patch) | |
tree | 204ff7f3c8f2d896ee9675494ac769fff3847f09 /writerfilter | |
parent | e234e9ca0f993ebe298ac5c2c6d7fc79ee3f12c0 (diff) |
WaE: implicit conversion of NULL constant to 'boost::detail::sp_nullptr_t'
Change-Id: Icaf39aaedab9663353268ee56063f2ed0ebbe57d
Diffstat (limited to 'writerfilter')
-rw-r--r-- | writerfilter/source/dmapper/DomainMapper_Impl.cxx | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/writerfilter/source/dmapper/DomainMapper_Impl.cxx b/writerfilter/source/dmapper/DomainMapper_Impl.cxx index 1f72e0fa1560..a416ea1dc6e5 100644 --- a/writerfilter/source/dmapper/DomainMapper_Impl.cxx +++ b/writerfilter/source/dmapper/DomainMapper_Impl.cxx @@ -3356,7 +3356,7 @@ void DomainMapper_Impl::CloseFieldCommand() dmapper_logger->element("closeFieldCommand"); #endif - FieldContextPtr pContext = m_aFieldStack.empty() ? NULL : m_aFieldStack.top(); + FieldContextPtr pContext = m_aFieldStack.empty() ? nullptr : m_aFieldStack.top(); OSL_ENSURE( pContext.get(), "no field context available"); if( pContext.get() ) { |