summaryrefslogtreecommitdiff
path: root/svx
diff options
context:
space:
mode:
authorMike Kaganski <mike.kaganski@collabora.com>2019-02-07 14:40:49 +0300
committerMike Kaganski <mike.kaganski@collabora.com>2019-02-11 07:08:08 +0100
commit3165146f6deef86eb408837275ec3f7edda0183b (patch)
treeca899778648ab35eccfd6b520629b293db83ceeb /svx
parent774cc7e0930f223fded1a774e0b71e6b68d48f5f (diff)
tdf#120703 PVS: V560 A part of conditional expression is always true/false
Change-Id: I62cb3b8927d664b3d5359ee6ac7db30d354f4821 Reviewed-on: https://gerrit.libreoffice.org/67496 Tested-by: Jenkins Reviewed-by: Mike Kaganski <mike.kaganski@collabora.com>
Diffstat (limited to 'svx')
-rw-r--r--svx/source/engine3d/view3d.cxx4
-rw-r--r--svx/source/sdr/contact/viewcontactofe3dscene.cxx2
2 files changed, 3 insertions, 3 deletions
diff --git a/svx/source/engine3d/view3d.cxx b/svx/source/engine3d/view3d.cxx
index e3def1a409f6..a3b3af4d41b7 100644
--- a/svx/source/engine3d/view3d.cxx
+++ b/svx/source/engine3d/view3d.cxx
@@ -823,12 +823,12 @@ void E3dView::ImpCreate3DObject(E3dScene* pScene, SdrObject* pObj, bool bExtrude
ImpCreateSingle3DObjectFlat(pScene, pNewObj2, bExtrude, fDepth, rLatheMat);
// delete object in between
- if(pNewObj2 != pObj && pNewObj2 != pNewObj1 && pNewObj2)
+ if (pNewObj2 != pObj && pNewObj2 != pNewObj1)
SdrObject::Free( pNewObj2 );
}
// delete object in between
- if(pNewObj1 != pObj && pNewObj1)
+ if (pNewObj1 != pObj)
SdrObject::Free( pNewObj1 );
}
}
diff --git a/svx/source/sdr/contact/viewcontactofe3dscene.cxx b/svx/source/sdr/contact/viewcontactofe3dscene.cxx
index 86ca5f0ed09c..46ceeb6b7e45 100644
--- a/svx/source/sdr/contact/viewcontactofe3dscene.cxx
+++ b/svx/source/sdr/contact/viewcontactofe3dscene.cxx
@@ -119,7 +119,7 @@ void createSubPrimitive3DVector(
bVisible = rE3dObject.GetSelected();
}
- if(bVisible && o_pVisibleTarget)
+ if (bVisible)
{
// add to visible target vector
o_pVisibleTarget->append(xPrimitive3DSeq);