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 /cui | |
| 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 'cui')
| -rw-r--r-- | cui/source/tabpages/swpossizetabpage.cxx | 4 | ||||
| -rw-r--r-- | cui/source/tabpages/transfrm.cxx | 2 |
2 files changed, 3 insertions, 3 deletions
diff --git a/cui/source/tabpages/swpossizetabpage.cxx b/cui/source/tabpages/swpossizetabpage.cxx index b4710781ceb2..ca0cff406751 100644 --- a/cui/source/tabpages/swpossizetabpage.cxx +++ b/cui/source/tabpages/swpossizetabpage.cxx @@ -1862,14 +1862,14 @@ void SvxSwPosSizeTabPage::SetView( const SdrView* pSdrView ) // consider anchor position (for Writer) const SdrMarkList& rMarkList = m_pSdrView->GetMarkedObjectList(); - if( rMarkList.GetMarkCount() >= 1 ) + if( rMarkList.GetMarkCount() > 0 ) { const SdrObject* pObj = rMarkList.GetMark( 0 )->GetMarkedSdrObj(); m_aAnchorPos = pObj->GetAnchorPos(); if( m_aAnchorPos != Point(0,0) ) // -> Writer { - for( sal_uLong i = 1; i < rMarkList.GetMarkCount(); i++ ) + for( size_t i = 1; i < rMarkList.GetMarkCount(); ++i ) { pObj = rMarkList.GetMark( i )->GetMarkedSdrObj(); if( m_aAnchorPos != pObj->GetAnchorPos() ) diff --git a/cui/source/tabpages/transfrm.cxx b/cui/source/tabpages/transfrm.cxx index 722d38bfee25..54485a8be001 100644 --- a/cui/source/tabpages/transfrm.cxx +++ b/cui/source/tabpages/transfrm.cxx @@ -715,7 +715,7 @@ void SvxPositionSizeTabPage::Construct() if(!maAnchor.equalZero()) // -> Writer { - for(sal_uInt16 i(1); i < rMarkList.GetMarkCount(); i++) + for(size_t i = 1; i < rMarkList.GetMarkCount(); ++i) { pObj = rMarkList.GetMark(i)->GetMarkedSdrObj(); |