[Libreoffice-commits] core.git: Branch 'libreoffice-4-3' - writerfilter/source

[Jan-Marek Glogowski]

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

New commits:
commit 5401e1b618a59c4a4df7fa073b4a5f481bd1ede7
Author: Jan-Marek Glogowski <glogow at fbihome.de>
Date:   Fri Oct 3 01:42:13 2014 +0200

    Don't assign NULL to boost::shared_ptr
    
    This is already done by the constructor.
    
    Fixes the libreoffic-4-3 build on Ubuntu 12.04.
    
    Change-Id: I7bbec905c0d1efb5670c61c975f36f2e37a74cac
    Reviewed-on: https://gerrit.libreoffice.org/11778
    Reviewed-by: David Tardon <dtardon at redhat.com>
    Tested-by: David Tardon <dtardon at redhat.com>

diff --git a/writerfilter/source/dmapper/DomainMapper_Impl.cxx b/writerfilter/source/dmapper/DomainMapper_Impl.cxx
index 075a3fa..23b976b 100644
--- a/writerfilter/source/dmapper/DomainMapper_Impl.cxx
+++ b/writerfilter/source/dmapper/DomainMapper_Impl.cxx
@@ -3288,7 +3288,8 @@ void DomainMapper_Impl::CloseFieldCommand()
     dmapper_logger->element("closeFieldCommand");
 #endif
 
-    FieldContextPtr pContext = m_aFieldStack.empty() ? NULL : m_aFieldStack.top();
+    FieldContextPtr pContext;
+    if (!m_aFieldStack.empty()) pContext = m_aFieldStack.top();
     OSL_ENSURE( pContext.get(), "no field context available");
     if( pContext.get() )
     {