diff options
| author | Christian Lohmaier <lohmaier+LibreOffice@googlemail.com> | 2014-10-02 17:21:36 +0200 |
|---|---|---|
| committer | Andras Timar <andras.timar@collabora.com> | 2014-10-03 10:32:39 +0200 |
| commit | ab218d72e9c044541f855f6e39cd9a7b0346fa8f (patch) | |
| tree | a31813d10f77bf222fa2dfa76fedf3a9c769b8be /writerfilter | |
| parent | 2374173a331db79425ffe28ed0765b16817e5d6b (diff) | |
shared_ptr is too smart to accept NULL
Change-Id: Id1bc223ffe2a8811219cdc47d145cd139199281a
Reviewed-on: https://gerrit.libreoffice.org/11767
Reviewed-by: Norbert Thiebaud <nthiebaud@gmail.com>
Reviewed-by: Christian Lohmaier <lohmaier+LibreOffice@googlemail.com>
Tested-by: Christian Lohmaier <lohmaier+LibreOffice@googlemail.com>
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 f564407d9378..cdb11983b885 100644 --- a/writerfilter/source/dmapper/DomainMapper_Impl.cxx +++ b/writerfilter/source/dmapper/DomainMapper_Impl.cxx @@ -3088,7 +3088,7 @@ void DomainMapper_Impl::CloseFieldCommand() dmapper_logger->element("closeFieldCommand"); #endif - FieldContextPtr pContext = m_aFieldStack.empty() ? NULL : m_aFieldStack.top(); + FieldContextPtr pContext = m_aFieldStack.empty() ? boost::shared_ptr<FieldContext>() : m_aFieldStack.top(); OSL_ENSURE( pContext.get(), "no field context available"); if( pContext.get() ) { |