summaryrefslogtreecommitdiffstats
path: root/drawinglayer/source
diff options
context:
space:
mode:
authorMike Kaganski <mike.kaganski@collabora.com>2019-04-01 00:25:16 +0300
committerMike Kaganski <mike.kaganski@collabora.com>2019-04-01 00:49:12 +0200
commit85456fae54029edd26df2277a9eec5e2fe3d9739 (patch)
treefd55ad48b34c66f0b839edcbc952a8a5a0752c72 /drawinglayer/source
parenttdf#124362 hide Addressbook button in Online (diff)
downloadcore-85456fae54029edd26df2277a9eec5e2fe3d9739.tar.gz
core-85456fae54029edd26df2277a9eec5e2fe3d9739.zip
tdf#120703 PVS: Silence V522 warnings
V522 There might be dereferencing of a potential null pointer. Change-Id: Ie617b41a8f8d334022cf5313b242a236baedba48 Reviewed-on: https://gerrit.libreoffice.org/70017 Tested-by: Jenkins Reviewed-by: Mike Kaganski <mike.kaganski@collabora.com>
Diffstat (limited to 'drawinglayer/source')
-rw-r--r--drawinglayer/source/primitive2d/baseprimitive2d.cxx8
-rw-r--r--drawinglayer/source/primitive3d/baseprimitive3d.cxx8
2 files changed, 2 insertions, 14 deletions
diff --git a/drawinglayer/source/primitive2d/baseprimitive2d.cxx b/drawinglayer/source/primitive2d/baseprimitive2d.cxx
index 9646add14cf6..17ad2de6e06f 100644
--- a/drawinglayer/source/primitive2d/baseprimitive2d.cxx
+++ b/drawinglayer/source/primitive2d/baseprimitive2d.cxx
@@ -219,14 +219,8 @@ namespace drawinglayer
const BasePrimitive2D* pA(dynamic_cast< const BasePrimitive2D* >(rxA.get()));
const BasePrimitive2D* pB(dynamic_cast< const BasePrimitive2D* >(rxB.get()));
- const bool bAEqualZero(pA == nullptr);
- if(bAEqualZero != (pB == nullptr))
- {
- return false;
- }
-
- if(bAEqualZero)
+ if (!pA || !pB)
{
return false;
}
diff --git a/drawinglayer/source/primitive3d/baseprimitive3d.cxx b/drawinglayer/source/primitive3d/baseprimitive3d.cxx
index 828e4fdcf14c..3e184400f612 100644
--- a/drawinglayer/source/primitive3d/baseprimitive3d.cxx
+++ b/drawinglayer/source/primitive3d/baseprimitive3d.cxx
@@ -166,14 +166,8 @@ namespace drawinglayer
const BasePrimitive3D* pA(dynamic_cast< const BasePrimitive3D* >(rxA.get()));
const BasePrimitive3D* pB(dynamic_cast< const BasePrimitive3D* >(rxB.get()));
- const bool bAEqualZero(pA == nullptr);
- if(bAEqualZero != (pB == nullptr))
- {
- return false;
- }
-
- if(bAEqualZero)
+ if(!pA || !pB)
{
return false;
}