diff options
| author | Jan-Marek Glogowski <glogow@fbihome.de> | 2014-10-03 01:42:13 +0200 |
|---|---|---|
| committer | Andras Timar <andras.timar@collabora.com> | 2014-10-14 15:27:57 +0200 |
| commit | 157c5c4d27b6a23faad4ed027e228bedee41c8be (patch) | |
| tree | 8896727ae08bd72f77b51edc087c98c74e591705 /writerfilter | |
| parent | 36ab4cca2ee98b51014b3a96b5f36a3bdde4661b (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() ) { |