diff options
| author | Jochen Nitschke <j.nitschke+logerrit@ok.de> | 2017-02-19 22:58:40 +0100 |
|---|---|---|
| committer | Noel Grandin <noel.grandin@collabora.co.uk> | 2017-02-20 06:02:14 +0000 |
| commit | 673dddaf9d6f49ff43724ff84122451bb4df94f2 (patch) | |
| tree | bd58cbf88f0d50efafca8c6dcde0b83f06faf7f7 /editeng | |
| parent | 76f9e3b417f19c0a16477e0a0e68e2da31d1de6f (diff) | |
this can't be nullptr
Change-Id: I33a18fe4c03a921e834ac6ea4234ddaf42a390e2
Reviewed-on: https://gerrit.libreoffice.org/34435
Tested-by: Jenkins <ci@libreoffice.org>
Reviewed-by: Noel Grandin <noel.grandin@collabora.co.uk>
Diffstat (limited to 'editeng')
| -rw-r--r-- | editeng/source/editeng/editobj.cxx | 7 |
1 files changed, 2 insertions, 5 deletions
diff --git a/editeng/source/editeng/editobj.cxx b/editeng/source/editeng/editobj.cxx index 3e3e8b7d3ec3..7e9cccb0c9d0 100644 --- a/editeng/source/editeng/editobj.cxx +++ b/editeng/source/editeng/editobj.cxx @@ -476,7 +476,7 @@ void EditTextObject::dumpAsXml(xmlTextWriterPtr pWriter) const // from SfxItemPoolUser void EditTextObjectImpl::ObjectInDestruction(const SfxItemPool& rSfxItemPool) { - if(!bOwnerOfPool && pPool && pPool == &rSfxItemPool) + if(!bOwnerOfPool && pPool == &rSfxItemPool) { // The pool we are based on gets destructed; get owner of pool by creating own one. // No need to call RemoveSfxItemPoolUser(), this is done from the pool's destructor @@ -484,10 +484,7 @@ void EditTextObjectImpl::ObjectInDestruction(const SfxItemPool& rSfxItemPool) // pool if needed, but only text attributes should be used. SfxItemPool* pNewPool = EditEngine::CreatePool(); - if(pPool) - { - pNewPool->SetDefaultMetric(pPool->GetMetric(DEF_METRIC)); - } + pNewPool->SetDefaultMetric(pPool->GetMetric(DEF_METRIC)); ContentInfosType aReplaced; aReplaced.reserve(aContents.size()); |