diff options
| author | Matteo Casalin <matteo.casalin@yahoo.com> | 2014-08-05 22:30:24 +0200 |
|---|---|---|
| committer | Matteo Casalin <matteo.casalin@yahoo.com> | 2014-08-16 21:52:28 +0200 |
| commit | 384cb5ff7b9227002206422d0bf4e75795d5f5cc (patch) | |
| tree | 21a15556a592c9bc42893c69d98d23b64c1a9464 /svx/source/table | |
| parent | 7e605f124f78a7f8b97385fcb8b91dce2ec735d8 (diff) | |
Consistently use size_t and SAL_MAX_SIZE
Instead of a mix of sal_uIntPtr, sal_uLong, int, and so on.
Also change CONTAINER_ENTRY_NOTFOUND=ULONG_MAX to SAL_MAX_SIZE as
return value in case of failure and in the related tests.
Change-Id: Ie778a849253b4be84fbcdab9557b7c4240233927
Diffstat (limited to 'svx/source/table')
| -rw-r--r-- | svx/source/table/svdotable.cxx | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/svx/source/table/svdotable.cxx b/svx/source/table/svdotable.cxx index 57b507c54d6b..9009414e1821 100644 --- a/svx/source/table/svdotable.cxx +++ b/svx/source/table/svdotable.cxx @@ -2225,8 +2225,8 @@ void SdrTableObj::AddToHdlList(SdrHdlList& rHdlList) const rHdlList.AddHdl( pH = new SdrHdl(aRect.BottomCenter(),HDL_LOWER) ); pH->SetMoveOutside( true ); rHdlList.AddHdl( pH = new SdrHdl(aRect.BottomRight(),HDL_LWRGT) ); pH->SetMoveOutside( true ); - sal_uIntPtr nHdlCount = rHdlList.GetHdlCount(); - for( sal_uIntPtr nHdl = 0; nHdl < nHdlCount; nHdl++ ) + const size_t nHdlCount = rHdlList.GetHdlCount(); + for( size_t nHdl = 0; nHdl < nHdlCount; ++nHdl ) rHdlList.GetHdl(nHdl)->SetObj((SdrObject*)this); } @@ -2242,9 +2242,9 @@ SdrHdl* SdrTableObj::GetHdl(sal_uInt32 nHdlNum) const SdrHdl* pRetval = 0; SdrHdlList aLocalList(0); AddToHdlList(aLocalList); - const sal_uInt32 nHdlCount(aLocalList.GetHdlCount()); + const size_t nHdlCount(aLocalList.GetHdlCount()); - if(nHdlCount && nHdlNum < nHdlCount) + if(nHdlCount && static_cast<size_t>(nHdlNum) < nHdlCount) { // remove and remember. The other created handles will be deleted again with the // destruction of the local list |