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 /basctl | |
| 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 'basctl')
| -rw-r--r-- | basctl/source/dlged/dlged.cxx | 8 | ||||
| -rw-r--r-- | basctl/source/dlged/propbrw.cxx | 6 |
2 files changed, 7 insertions, 7 deletions
diff --git a/basctl/source/dlged/dlged.cxx b/basctl/source/dlged/dlged.cxx index b4f0d27bb8f1..c34a3b7e2602 100644 --- a/basctl/source/dlged/dlged.cxx +++ b/basctl/source/dlged/dlged.cxx @@ -704,8 +704,8 @@ void DlgEditor::Copy() } // insert control models of marked objects into clipboard dialog model - sal_uLong nMark = pDlgEdView->GetMarkedObjectList().GetMarkCount(); - for( sal_uLong i = 0; i < nMark; i++ ) + const size_t nMark = pDlgEdView->GetMarkedObjectList().GetMarkCount(); + for( size_t i = 0; i < nMark; ++i ) { SdrObject* pObj = pDlgEdView->GetMarkedObjectList().GetMark(i)->GetMarkedSdrObj(); DlgEdObj* pDlgEdObj = dynamic_cast<DlgEdObj*>(pObj); @@ -1017,9 +1017,9 @@ void DlgEditor::Delete() return; // remove control models of marked objects from dialog model - sal_uLong nMark = pDlgEdView->GetMarkedObjectList().GetMarkCount(); + const size_t nMark = pDlgEdView->GetMarkedObjectList().GetMarkCount(); - for( sal_uLong i = 0; i < nMark; i++ ) + for( size_t i = 0; i < nMark; ++i ) { SdrObject* pObj = pDlgEdView->GetMarkedObjectList().GetMark(i)->GetMarkedSdrObj(); DlgEdObj* pDlgEdObj = dynamic_cast<DlgEdObj*>(pObj); diff --git a/basctl/source/dlged/propbrw.cxx b/basctl/source/dlged/propbrw.cxx index e68f7ebd0a44..c7346c8f3dbf 100644 --- a/basctl/source/dlged/propbrw.cxx +++ b/basctl/source/dlged/propbrw.cxx @@ -236,8 +236,8 @@ Sequence< Reference< XInterface > > Sequence< Reference< XInterface > > aSeq; InterfaceArray aInterfaces; - sal_uInt32 nMarkCount = _rMarkList.GetMarkCount(); - for( sal_uInt32 i = 0 ; i < nMarkCount ; i++ ) + const size_t nMarkCount = _rMarkList.GetMarkCount(); + for( size_t i = 0 ; i < nMarkCount ; ++i ) { SdrObject* pCurrent = _rMarkList.GetMark(i)->GetMarkedSdrObj(); @@ -471,7 +471,7 @@ void PropBrw::ImplUpdate( const Reference< XModel >& _rxContextDocument, SdrView } const SdrMarkList& rMarkList = pView->GetMarkedObjectList(); - sal_uInt32 nMarkCount = rMarkList.GetMarkCount(); + const size_t nMarkCount = rMarkList.GetMarkCount(); if ( nMarkCount == 0 ) { |