summaryrefslogtreecommitdiff
path: root/sfx2
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 /sfx2
parente76d07c6185512e47947dbe1b6a83fb944b8198f (diff)
Update many ListBox users to its sal_Int32 interface
Change-Id: I6469ac5e2d17406bee9bc434930e2471cb3bae9f
Diffstat (limited to 'sfx2')
-rw-r--r--sfx2/source/appl/newhelp.cxx22
-rw-r--r--sfx2/source/dialog/templdlg.cxx2
2 files changed, 12 insertions, 12 deletions
diff --git a/sfx2/source/appl/newhelp.cxx b/sfx2/source/appl/newhelp.cxx
index 964282975222..c096c0a2f551 100644
--- a/sfx2/source/appl/newhelp.cxx
+++ b/sfx2/source/appl/newhelp.cxx
@@ -650,7 +650,7 @@ void IndexTabPage_Impl::InitializeIndex()
if ( ( aAnySeq[0] >>= aKeywordList ) && ( aAnySeq[1] >>= aKeywordRefList ) &&
( aAnySeq[2] >>= aAnchorRefList ) && ( aAnySeq[3] >>= aTitleRefList ) )
{
- sal_uInt16 nPos;
+ sal_Int32 nPos;
int ndx,tmp;
OUString aIndex, aTempString;
OUStringBuffer aData( 128 ); // Capacity of up to 128 characters
@@ -729,8 +729,8 @@ void IndexTabPage_Impl::InitializeIndex()
void IndexTabPage_Impl::ClearIndex()
{
- sal_uInt16 nCount = m_pIndexCB->GetEntryCount();
- for ( sal_uInt16 i = 0; i < nCount; ++i )
+ const sal_Int32 nCount = m_pIndexCB->GetEntryCount();
+ for ( sal_Int32 i = 0; i < nCount; ++i )
delete static_cast<IndexEntry_Impl*>(m_pIndexCB->GetEntryData(i));
m_pIndexCB->Clear();
}
@@ -1015,8 +1015,8 @@ void SearchTabPage_Impl::dispose()
void SearchTabPage_Impl::ClearSearchResults()
{
- sal_uInt16 nCount = m_pResultsLB->GetEntryCount();
- for ( sal_uInt16 i = 0; i < nCount; ++i )
+ const sal_Int32 nCount = m_pResultsLB->GetEntryCount();
+ for ( sal_Int32 i = 0; i < nCount; ++i )
delete static_cast<OUString*>(m_pResultsLB->GetEntryData(i));
m_pResultsLB->Clear();
m_pResultsLB->Update();
@@ -1070,7 +1070,7 @@ IMPL_LINK_NOARG(SearchTabPage_Impl, SearchHdl)
OUString aTitle = rRow.getToken( 0, '\t', nIdx );
nIdx = 0;
OUString* pURL = new OUString( rRow.getToken( 2, '\t', nIdx ) );
- sal_uInt16 nPos = m_pResultsLB->InsertEntry( aTitle );
+ const sal_Int32 nPos = m_pResultsLB->InsertEntry( aTitle );
m_pResultsLB->SetEntryData( nPos, pURL );
}
LeaveWait();
@@ -1194,8 +1194,8 @@ void BookmarksBox_Impl::dispose()
// save bookmarks to configuration
SvtHistoryOptions aHistOpt;
aHistOpt.Clear( eHELPBOOKMARKS );
- sal_uInt16 nCount = GetEntryCount();
- for ( sal_uInt16 i = 0; i < nCount; ++i )
+ const sal_Int32 nCount = GetEntryCount();
+ for ( sal_Int32 i = 0; i < nCount; ++i )
{
OUString aTitle = GetEntry(i);
OUString* pURL = static_cast<OUString*>(GetEntryData(i));
@@ -1243,7 +1243,7 @@ void BookmarksBox_Impl::DoAction( sal_uInt16 nAction )
if ( nPos != LISTBOX_ENTRY_NOTFOUND )
{
RemoveEntry( nPos );
- sal_uInt16 nCount = GetEntryCount();
+ const sal_Int32 nCount = GetEntryCount();
if ( nCount )
{
if ( nPos >= nCount )
@@ -1370,7 +1370,7 @@ void BookmarksTabPage_Impl::AddBookmarks( const OUString& rTitle, const OUString
{
OUString aImageURL = IMAGE_URL;
aImageURL += INetURLObject( rURL ).GetHost();
- sal_uInt16 nPos = m_pBookmarksBox->InsertEntry( rTitle, SvFileInformationManager::GetImage( INetURLObject(aImageURL) ) );
+ const sal_Int32 nPos = m_pBookmarksBox->InsertEntry( rTitle, SvFileInformationManager::GetImage( INetURLObject(aImageURL) ) );
m_pBookmarksBox->SetEntryData( nPos, new OUString( rURL ) );
}
@@ -1516,7 +1516,7 @@ void SfxHelpIndexWindow_Impl::Initialize()
nIdx = 0;
OUString aURL = rRow.getToken( 2, '\t', nIdx );
OUString* pFactory = new OUString( INetURLObject( aURL ).GetHost() );
- sal_uInt16 nPos = m_pActiveLB->InsertEntry( aTitle );
+ const sal_Int32 nPos = m_pActiveLB->InsertEntry( aTitle );
m_pActiveLB->SetEntryData( nPos, pFactory );
}
diff --git a/sfx2/source/dialog/templdlg.cxx b/sfx2/source/dialog/templdlg.cxx
index 52ab26072267..fb78251687e2 100644
--- a/sfx2/source/dialog/templdlg.cxx
+++ b/sfx2/source/dialog/templdlg.cxx
@@ -1178,7 +1178,7 @@ void SfxCommonTemplateDialog_Impl::UpdateStyles_Impl(sal_uInt16 nFlags)
aFilterLb->SetUpdateMode(false);
aFilterLb->Clear();
//insert hierarchical at the beginning
- sal_uInt16 nPos = aFilterLb->InsertEntry(SfxResId(STR_STYLE_FILTER_HIERARCHICAL).toString(), 0);
+ sal_Int32 nPos = aFilterLb->InsertEntry(SfxResId(STR_STYLE_FILTER_HIERARCHICAL).toString(), 0);
aFilterLb->SetEntryData( nPos, reinterpret_cast<void*>(SFXSTYLEBIT_ALL) );
const SfxStyleFilter& rFilter = pItem->GetFilterList();
for( size_t i = 0; i < rFilter.size(); ++i)