[Libreoffice-commits] core.git: writerfilter/source

[Tor Lillqvist]

 writerfilter/source/dmapper/DomainMapper_Impl.cxx |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

New commits:
commit 9d225c9d3a153d54bcdf4260390db8224816e4e5
Author: Tor Lillqvist <tml at collabora.com>
Date:   Sun Sep 28 08:55:35 2014 +0300

    WaE: implicit conversion of NULL constant to 'boost::detail::sp_nullptr_t'
    
    Change-Id: Icaf39aaedab9663353268ee56063f2ed0ebbe57d

diff --git a/writerfilter/source/dmapper/DomainMapper_Impl.cxx b/writerfilter/source/dmapper/DomainMapper_Impl.cxx
index 1f72e0f..a416ea1 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() )
     {