diff options
| author | Stephan Bergmann <sbergman@redhat.com> | 2014-06-10 12:55:56 +0200 |
|---|---|---|
| committer | Stephan Bergmann <sbergman@redhat.com> | 2014-06-10 17:25:22 +0200 |
| commit | 989527ab41efce2b389fd2d319c87c3f237510f3 (patch) | |
| tree | dc124b7e749f2a2221030152caed9e978a971ea1 /svx | |
| parent | 147d3f61c4730ac1e545b02888a043f88dc8e3ad (diff) | |
-Werror,-Wtautological-undefined-compare
Change-Id: Ib3334c2bc66bd64711542a7d3e84b27900cda53d
Diffstat (limited to 'svx')
| -rw-r--r-- | svx/source/svdraw/svdmrkv1.cxx | 3 |
1 files changed, 1 insertions, 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(); |