summaryrefslogtreecommitdiffstats
path: root/extensions
diff options
context:
space:
mode:
authorMatteo Casalin <matteo.casalin@yahoo.com>2015-08-30 23:08:29 +0200
committerMatteo Casalin <matteo.casalin@yahoo.com>2015-09-12 14:18:50 +0200
commitc5909e251871e5a38992fade94a489a9546e11b7 (patch)
tree7ef9bd642fb4799fb2a8d6d3529144c95a468dde /extensions
parentUse forward declaration and reduce include scope (diff)
downloadcore-c5909e251871e5a38992fade94a489a9546e11b7.tar.gz
core-c5909e251871e5a38992fade94a489a9546e11b7.zip
Update many ListBox users to its sal_Int32 interface
Change-Id: I6469ac5e2d17406bee9bc434930e2471cb3bae9f
Diffstat (limited to 'extensions')
-rw-r--r--extensions/source/bibliography/datman.cxx2
-rw-r--r--extensions/source/dbpilots/commonpagesdbp.cxx3
-rw-r--r--extensions/source/dbpilots/gridwizard.cxx6
-rw-r--r--extensions/source/propctrlr/listselectiondlg.cxx4
-rw-r--r--extensions/source/propctrlr/standardcontrol.cxx8
5 files changed, 11 insertions, 12 deletions
diff --git a/extensions/source/bibliography/datman.cxx b/extensions/source/bibliography/datman.cxx
index 6a6e44d6d273..860ab2dcb297 100644
--- a/extensions/source/bibliography/datman.cxx
+++ b/extensions/source/bibliography/datman.cxx
@@ -424,7 +424,7 @@ void MappingDialog_Impl::dispose()
IMPL_LINK(MappingDialog_Impl, ListBoxSelectHdl, ListBox*, pListBox)
{
- sal_uInt16 nEntryPos = pListBox->GetSelectEntryPos();
+ const sal_Int32 nEntryPos = pListBox->GetSelectEntryPos();
if(0 < nEntryPos)
{
for(sal_uInt16 i = 0; i < COLUMN_COUNT; i++)
diff --git a/extensions/source/dbpilots/commonpagesdbp.cxx b/extensions/source/dbpilots/commonpagesdbp.cxx
index 3cd5c75fb8e8..23edfb922aa4 100644
--- a/extensions/source/dbpilots/commonpagesdbp.cxx
+++ b/extensions/source/dbpilots/commonpagesdbp.cxx
@@ -244,10 +244,9 @@ namespace dbp
{
const OUString* pNames = _rNames.getConstArray();
const OUString* pNamesEnd = _rNames.getConstArray() + _rNames.getLength();
- sal_uInt16 nPos = 0;
while ( pNames != pNamesEnd )
{
- nPos = _rListBox.InsertEntry( *pNames++, _rImage );
+ const sal_Int32 nPos = _rListBox.InsertEntry( *pNames++, _rImage );
_rListBox.SetEntryData( nPos, reinterpret_cast< void* >( _nCommandType ) );
}
}
diff --git a/extensions/source/dbpilots/gridwizard.cxx b/extensions/source/dbpilots/gridwizard.cxx
index 480b9ec283b6..98e9f8358012 100644
--- a/extensions/source/dbpilots/gridwizard.cxx
+++ b/extensions/source/dbpilots/gridwizard.cxx
@@ -367,12 +367,12 @@ namespace dbp
return false;
OGridSettings& rSettings = getSettings();
- sal_uInt16 nSelected = m_pSelFields->GetEntryCount();
+ const sal_Int32 nSelected = m_pSelFields->GetEntryCount();
rSettings.aSelectedFields.realloc(nSelected);
OUString* pSelected = rSettings.aSelectedFields.getArray();
- for (sal_uInt16 i=0; i<nSelected; ++i, ++pSelected)
+ for (sal_Int32 i=0; i<nSelected; ++i, ++pSelected)
*pSelected = m_pSelFields->GetEntry(i);
return true;
@@ -417,7 +417,7 @@ namespace dbp
ListBox& rMoveTo = bMoveRight ? *m_pSelFields : *m_pExistFields;
// the index of the selected entry
- sal_uInt16 nSelected = bMoveRight ? m_pExistFields->GetSelectEntryPos() : m_pSelFields->GetSelectEntryPos();
+ const sal_Int32 nSelected = bMoveRight ? m_pExistFields->GetSelectEntryPos() : m_pSelFields->GetSelectEntryPos();
// the (original) relative position of the entry
sal_IntPtr nRelativeIndex = reinterpret_cast<sal_IntPtr>(bMoveRight ? m_pExistFields->GetEntryData(nSelected) : m_pSelFields->GetEntryData(nSelected));
diff --git a/extensions/source/propctrlr/listselectiondlg.cxx b/extensions/source/propctrlr/listselectiondlg.cxx
index 9b2bbedcb368..01b113438230 100644
--- a/extensions/source/propctrlr/listselectiondlg.cxx
+++ b/extensions/source/propctrlr/listselectiondlg.cxx
@@ -132,10 +132,10 @@ namespace pcr
void ListSelectionDialog::collectSelection( Sequence< sal_Int16 >& /* [out] */ _rSelection )
{
- sal_uInt16 nSelectedCount = m_pEntries->GetSelectEntryCount( );
+ const sal_Int32 nSelectedCount = m_pEntries->GetSelectEntryCount( );
_rSelection.realloc( nSelectedCount );
sal_Int16* pSelection = _rSelection.getArray();
- for ( sal_uInt16 selected = 0; selected < nSelectedCount; ++selected, ++pSelection )
+ for ( sal_Int32 selected = 0; selected < nSelectedCount; ++selected, ++pSelection )
*pSelection = static_cast< sal_Int16 >( m_pEntries->GetSelectEntryPos( selected ) );
}
diff --git a/extensions/source/propctrlr/standardcontrol.cxx b/extensions/source/propctrlr/standardcontrol.cxx
index b1c205ef4827..c4276e731899 100644
--- a/extensions/source/propctrlr/standardcontrol.cxx
+++ b/extensions/source/propctrlr/standardcontrol.cxx
@@ -863,10 +863,10 @@ namespace pcr
Sequence< OUString > SAL_CALL OListboxControl::getListEntries( ) throw (RuntimeException, std::exception)
{
- const sal_uInt16 nCount = getTypedControlWindow()->GetEntryCount();
+ const sal_Int32 nCount = getTypedControlWindow()->GetEntryCount();
Sequence< OUString > aRet(nCount);
OUString* pIter = aRet.getArray();
- for (sal_uInt16 i = 0; i < nCount ; ++i,++pIter)
+ for (sal_Int32 i = 0; i < nCount ; ++i,++pIter)
*pIter = getTypedControlWindow()->GetEntry(i);
return aRet;
@@ -933,10 +933,10 @@ namespace pcr
Sequence< OUString > SAL_CALL OComboboxControl::getListEntries( ) throw (RuntimeException, std::exception)
{
- const sal_uInt16 nCount = getTypedControlWindow()->GetEntryCount();
+ const sal_Int32 nCount = getTypedControlWindow()->GetEntryCount();
Sequence< OUString > aRet(nCount);
OUString* pIter = aRet.getArray();
- for (sal_uInt16 i = 0; i < nCount ; ++i,++pIter)
+ for (sal_Int32 i = 0; i < nCount ; ++i,++pIter)
*pIter = getTypedControlWindow()->GetEntry(i);
return aRet;