diff options
Diffstat (limited to 'svx/source/svdraw/svdhlpln.cxx')
-rwxr-xr-x[-rw-r--r--] | svx/source/svdraw/svdhlpln.cxx | 22 |
1 files changed, 11 insertions, 11 deletions
diff --git a/svx/source/svdraw/svdhlpln.cxx b/svx/source/svdraw/svdhlpln.cxx index 409720ba0dc6..30d4dd31824b 100644..100755 --- a/svx/source/svdraw/svdhlpln.cxx +++ b/svx/source/svdraw/svdhlpln.cxx @@ -48,7 +48,7 @@ Pointer SdrHelpLine::GetPointer() const } // switch } -bool SdrHelpLine::IsHit(const Point& rPnt, USHORT nTolLog, const OutputDevice& rOut) const +bool SdrHelpLine::IsHit(const Point& rPnt, sal_uInt16 nTolLog, const OutputDevice& rOut) const { Size a1Pix(rOut.PixelToLogic(Size(1,1))); bool bXHit=rPnt.X()>=aPos.X()-nTolLog && rPnt.X()<=aPos.X()+nTolLog+a1Pix.Width(); @@ -64,7 +64,7 @@ bool SdrHelpLine::IsHit(const Point& rPnt, USHORT nTolLog, const OutputDevice& r } } break; } // switch - return FALSE; + return sal_False; } Rectangle SdrHelpLine::GetBoundRect(const OutputDevice& rOut) const @@ -106,8 +106,8 @@ bool SdrHelpLine::IsVisibleEqual( const SdrHelpLine& rHelpLine, const OutputDevi void SdrHelpLineList::Clear() { - USHORT nAnz=GetCount(); - for (USHORT i=0; i<nAnz; i++) { + sal_uInt16 nAnz=GetCount(); + for (sal_uInt16 i=0; i<nAnz; i++) { delete GetObject(i); } aList.Clear(); @@ -116,8 +116,8 @@ void SdrHelpLineList::Clear() void SdrHelpLineList::operator=(const SdrHelpLineList& rSrcList) { Clear(); - USHORT nAnz=rSrcList.GetCount(); - for (USHORT i=0; i<nAnz; i++) { + sal_uInt16 nAnz=rSrcList.GetCount(); + for (sal_uInt16 i=0; i<nAnz; i++) { Insert(rSrcList[i]); } } @@ -125,10 +125,10 @@ void SdrHelpLineList::operator=(const SdrHelpLineList& rSrcList) bool SdrHelpLineList::operator==(const SdrHelpLineList& rSrcList) const { bool bEqual = false; - USHORT nAnz=GetCount(); + sal_uInt16 nAnz=GetCount(); if (nAnz==rSrcList.GetCount()) { bEqual = true; - for (USHORT i=0; i<nAnz && bEqual; i++) { + for (sal_uInt16 i=0; i<nAnz && bEqual; i++) { if (*GetObject(i)!=*rSrcList.GetObject(i)) { bEqual = false; } @@ -137,10 +137,10 @@ bool SdrHelpLineList::operator==(const SdrHelpLineList& rSrcList) const return bEqual; } -USHORT SdrHelpLineList::HitTest(const Point& rPnt, USHORT nTolLog, const OutputDevice& rOut) const +sal_uInt16 SdrHelpLineList::HitTest(const Point& rPnt, sal_uInt16 nTolLog, const OutputDevice& rOut) const { - USHORT nAnz=GetCount(); - for (USHORT i=nAnz; i>0;) { + sal_uInt16 nAnz=GetCount(); + for (sal_uInt16 i=nAnz; i>0;) { i--; if (GetObject(i)->IsHit(rPnt,nTolLog,rOut)) return i; } |