diff options
| author | Christian Lohmaier <lohmaier+LibreOffice@googlemail.com> | 2014-10-02 17:21:36 +0200 |
|---|---|---|
| committer | David Tardon <dtardon@redhat.com> | 2014-10-03 06:10:14 +0000 |
| commit | 5fed928a925b6a66a1c271ffbac7e1451267d429 (patch) | |
| tree | 0a09165b8e0f702ed39c35dea888849e8642acb0 /writerfilter | |
| parent | 787672019447b787c8ef8343f30f181be87c2517 (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>
(cherry picked from commit 055e19c749caae1c72ec3fb06bd72e52d51c40c4)
Reviewed-on: https://gerrit.libreoffice.org/11771
Reviewed-by: Caolán McNamara <caolanm@redhat.com>
Tested-by: Caolán McNamara <caolanm@redhat.com>
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 | 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 87b0241cbfdb..6b5b86bdf80c 100644 --- a/writerfilter/source/dmapper/DomainMapper_Impl.cxx +++ b/writerfilter/source/dmapper/DomainMapper_Impl.cxx @@ -3062,7 +3062,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() ) { |