diff options
| author | Noel Grandin <noelgrandin@gmail.com> | 2018-08-09 16:30:17 +0200 |
|---|---|---|
| committer | Noel Grandin <noel.grandin@collabora.co.uk> | 2018-08-10 08:20:28 +0200 |
| commit | 7fdd5a12f6d20422ebda1d3afd5e5146cadbe0e5 (patch) | |
| tree | 0370d19faf39b778517b2bce6c483cc0c82a11e0 /svx/source/sdr | |
| parent | b268ef57e97e692644335afeae834205ecb73557 (diff) | |
unnecessary null check before dynamic_cast, in svx
Change-Id: I5174c9530d18e5d88ad8a41cc2bb02c6d090f3cf
Reviewed-on: https://gerrit.libreoffice.org/58771
Tested-by: Jenkins
Reviewed-by: Noel Grandin <noel.grandin@collabora.co.uk>
Diffstat (limited to 'svx/source/sdr')
| -rw-r--r-- | svx/source/sdr/properties/e3dsceneproperties.cxx | 4 | ||||
| -rw-r--r-- | svx/source/sdr/properties/textproperties.cxx | 2 |
2 files changed, 3 insertions, 3 deletions
diff --git a/svx/source/sdr/properties/e3dsceneproperties.cxx b/svx/source/sdr/properties/e3dsceneproperties.cxx index 696e42b78f19..4548c796489a 100644 --- a/svx/source/sdr/properties/e3dsceneproperties.cxx +++ b/svx/source/sdr/properties/e3dsceneproperties.cxx @@ -75,7 +75,7 @@ namespace sdr { SdrObject* pObj = pSub->GetObj(a); - if(pObj && dynamic_cast<const E3dCompoundObject* >(pObj) != nullptr) + if(dynamic_cast<const E3dCompoundObject* >(pObj)) { const SfxItemSet& rSet = pObj->GetMergedItemSet(); SfxWhichIter aIter(rSet); @@ -131,7 +131,7 @@ namespace sdr { SdrObject* pObj = pSub->GetObj(a); - if(pObj && dynamic_cast<const E3dCompoundObject* >(pObj) != nullptr) + if(dynamic_cast<const E3dCompoundObject* >(pObj)) { // set merged ItemSet at contained 3d object. pObj->SetMergedItemSet(*pNewSet, bClearAllItems); diff --git a/svx/source/sdr/properties/textproperties.cxx b/svx/source/sdr/properties/textproperties.cxx index 1ca04d65a628..2ce79e9be992 100644 --- a/svx/source/sdr/properties/textproperties.cxx +++ b/svx/source/sdr/properties/textproperties.cxx @@ -464,7 +464,7 @@ namespace sdr { const SvxFieldData* pData = pFieldItem->GetField(); - if(pData && dynamic_cast<const SvxURLField*>( pData) != nullptr) + if(dynamic_cast<const SvxURLField*>( pData)) { bHasURL = true; break; |