From 989527ab41efce2b389fd2d319c87c3f237510f3 Mon Sep 17 00:00:00 2001 From: Stephan Bergmann Date: Tue, 10 Jun 2014 12:55:56 +0200 Subject: -Werror,-Wtautological-undefined-compare Change-Id: Ib3334c2bc66bd64711542a7d3e84b27900cda53d --- svx/source/svdraw/svdmrkv1.cxx | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/svx/source/svdraw/svdmrkv1.cxx b/svx/source/svdraw/svdmrkv1.cxx index 4cf1d3cee59f..e024082c218b 100644 --- a/svx/source/svdraw/svdmrkv1.cxx +++ b/svx/source/svdraw/svdmrkv1.cxx @@ -102,7 +102,7 @@ sal_uIntPtr SdrMarkView::GetMarkedPointCount() const bool SdrMarkView::IsPointMarkable(const SdrHdl& rHdl) const { - return !ImpIsFrameHandles() && &rHdl!=NULL && !rHdl.IsPlusHdl() && rHdl.GetKind()!=HDL_GLUE && rHdl.GetKind()!=HDL_SMARTTAG && rHdl.GetObj()!=NULL && rHdl.GetObj()->IsPolyObj(); + return !ImpIsFrameHandles() && !rHdl.IsPlusHdl() && rHdl.GetKind()!=HDL_GLUE && rHdl.GetKind()!=HDL_SMARTTAG && rHdl.GetObj()!=NULL && rHdl.GetObj()->IsPolyObj(); } bool SdrMarkView::MarkPointHelper(SdrHdl* pHdl, SdrMark* pMark, bool bUnmark) @@ -189,7 +189,6 @@ bool SdrMarkView::ImpMarkPoint(SdrHdl* pHdl, SdrMark* pMark, bool bUnmark) bool SdrMarkView::MarkPoint(SdrHdl& rHdl, bool bUnmark) { - if (&rHdl==NULL) return false; ForceUndirtyMrkPnt(); bool bRet=false; const SdrObject* pObj=rHdl.GetObj(); -- cgit