diff options
author | Jan-Marek Glogowski <glogow@fbihome.de> | 2014-10-03 01:42:13 +0200 |
---|---|---|
committer | David Tardon <dtardon@redhat.com> | 2014-10-03 07:35:10 +0000 |
commit | 5401e1b618a59c4a4df7fa073b4a5f481bd1ede7 (patch) | |
tree | d06d5d7f1c27f19779638a4f01cfcf4cea512af6 /writerfilter | |
parent | 89a08d5528ed70f3c3e5de6143cf403a79e716ca (diff) |
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@redhat.com>
Tested-by: David Tardon <dtardon@redhat.com>
Diffstat (limited to 'writerfilter')
-rw-r--r-- | writerfilter/source/dmapper/DomainMapper_Impl.cxx | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/writerfilter/source/dmapper/DomainMapper_Impl.cxx b/writerfilter/source/dmapper/DomainMapper_Impl.cxx index 075a3fabe376..23b976bee9ee 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() ) { |