made ListBox handle more than 64k elements, fdo#61520 related

ListBox and related now handle up to sal_Int32 elements correctly.
sal_Int32 instead of sal_Size or size_t because of UNO and a11y API.
Also disentangled some of the mess of SvTreeList and other containers
regarding sal_uInt16, sal_uLong, long, size_t, ... type mixtures.

Change-Id: Idb6e0ae689dc5bc2cf980721972b57b0261e688a
Reviewed-on: https://gerrit.libreoffice.org/8460
Reviewed-by: Eike Rathke <erack@redhat.com>
Tested-by: Eike Rathke <erack@redhat.com>

3 files changed, 13 insertions, 13 deletions

diff --git a/sfx2/source/appl/newhelp.cxx b/sfx2/source/appl/newhelp.cxx
index f7199a43f189..569c2d7ac185 100644
--- a/sfx2/source/appl/newhelp.cxx
+++ b/sfx2/source/appl/newhelp.cxx
@@ -506,13 +506,13 @@ bool IndexBox_Impl::Notify( NotifyEvent& rNEvt )
 
 void IndexBox_Impl::SelectExecutableEntry()
 {
-    sal_uInt16 nPos = GetEntryPos( GetText() );
+    sal_Int32 nPos = GetEntryPos( GetText() );
     if ( nPos != COMBOBOX_ENTRY_NOTFOUND )
     {
-        sal_uInt16 nOldPos = nPos;
+        sal_Int32 nOldPos = nPos;
         OUString aEntryText;
         IndexEntry_Impl* pEntry = (IndexEntry_Impl*)(sal_uIntPtr)GetEntryData( nPos );
-        sal_uInt16 nCount = GetEntryCount();
+        sal_Int32 nCount = GetEntryCount();
         while ( nPos < nCount && ( !pEntry || pEntry->m_aURL.isEmpty() ) )
         {
             pEntry = (IndexEntry_Impl*)(sal_uIntPtr)GetEntryData( ++nPos );
@@ -809,7 +809,7 @@ sal_Bool IndexTabPage_Impl::HasKeyword() const
     sal_Bool bRet = sal_False;
     if ( !sKeyword.isEmpty() )
     {
-        sal_uInt16 nPos = m_pIndexCB->GetEntryPos( sKeyword );
+        sal_Int32 nPos = m_pIndexCB->GetEntryPos( sKeyword );
         bRet = ( nPos != LISTBOX_ENTRY_NOTFOUND );
     }
 
@@ -823,10 +823,10 @@ sal_Bool IndexTabPage_Impl::HasKeywordIgnoreCase()
     sal_Bool bRet = sal_False;
     if ( !sKeyword.isEmpty() )
     {
-        sal_uInt16 nEntries = m_pIndexCB->GetEntryCount();
+        sal_Int32 nEntries = m_pIndexCB->GetEntryCount();
         OUString sIndexItem;
         const vcl::I18nHelper& rI18nHelper = GetSettings().GetLocaleI18nHelper();
-        for ( sal_uInt16 n = 0; n < nEntries; n++)
+        for ( sal_Int32 n = 0; n < nEntries; n++)
         {
             sIndexItem = m_pIndexCB->GetEntry( n );
             if (rI18nHelper.MatchString( sIndexItem, sKeyword ))
@@ -972,9 +972,9 @@ SearchTabPage_Impl::~SearchTabPage_Impl()
     nChecked = m_pScopeCB->IsChecked() ? 1 : 0;
     aUserData += OUString::number( nChecked );
     aUserData += ";";
-    sal_uInt16 nCount = std::min( m_pSearchED->GetEntryCount(), (sal_uInt16)10 );  // save only 10 entries
+    sal_Int32 nCount = std::min( m_pSearchED->GetEntryCount(), (sal_Int32)10 );  // save only 10 entries
 
-    for ( sal_uInt16 i = 0; i < nCount; ++i )
+    for ( sal_Int32 i = 0; i < nCount; ++i )
     {
         OUString aText = m_pSearchED->GetEntry(i);
         aUserData += INetURLObject::encode(
@@ -1187,7 +1187,7 @@ void BookmarksBox_Impl::DoAction( sal_uInt16 nAction )
 
         case MID_RENAME :
            {
-            sal_uInt16 nPos = GetSelectEntryPos();
+            sal_Int32 nPos = GetSelectEntryPos();
             if ( nPos != LISTBOX_ENTRY_NOTFOUND )
             {
                 SfxAddHelpBookmarkDialog_Impl aDlg( this, sal_True );
@@ -1209,7 +1209,7 @@ void BookmarksBox_Impl::DoAction( sal_uInt16 nAction )
 
         case MID_DELETE :
         {
-            sal_uInt16 nPos = GetSelectEntryPos();
+            sal_Int32 nPos = GetSelectEntryPos();
             if ( nPos != LISTBOX_ENTRY_NOTFOUND )
             {
                 RemoveEntry( nPos );
diff --git a/sfx2/source/dialog/mgetempl.cxx b/sfx2/source/dialog/mgetempl.cxx
index f33ce5000f3e..3cf107a48bdf 100644
--- a/sfx2/source/dialog/mgetempl.cxx
+++ b/sfx2/source/dialog/mgetempl.cxx
@@ -374,7 +374,7 @@ sal_Bool SfxManageStyleSheetPage::FillItemSet( SfxItemSet& rSet )
 */
 
 {
-    const sal_uInt16 nFilterIdx = m_pFilterLb->GetSelectEntryPos();
+    const sal_Int32 nFilterIdx = m_pFilterLb->GetSelectEntryPos();
 
     // Set Filter
 
diff --git a/sfx2/source/dialog/srchdlg.cxx b/sfx2/source/dialog/srchdlg.cxx
index 3dada2fd5621..51744cf97cf3 100644
--- a/sfx2/source/dialog/srchdlg.cxx
+++ b/sfx2/source/dialog/srchdlg.cxx
@@ -100,7 +100,7 @@ void SearchDialog::SaveConfig()
     SvtViewOptions aViewOpt( E_DIALOG, m_sConfigName );
     aViewOpt.SetWindowState(OStringToOUString(m_sWinState, RTL_TEXTENCODING_ASCII_US));
     OUString sUserData;
-    sal_uInt16 i = 0, nCount = std::min( m_pSearchEdit->GetEntryCount(), MAX_SAVE_COUNT );
+    sal_Int32 i = 0, nCount = std::min( m_pSearchEdit->GetEntryCount(), static_cast<sal_Int32>(MAX_SAVE_COUNT) );
     for ( ; i < nCount; ++i )
     {
         sUserData += m_pSearchEdit->GetEntry(i);
@@ -123,7 +123,7 @@ void SearchDialog::SaveConfig()
 IMPL_LINK_NOARG(SearchDialog, FindHdl)
 {
     OUString sSrchTxt = m_pSearchEdit->GetText();
-    sal_uInt16 nPos = m_pSearchEdit->GetEntryPos( sSrchTxt );
+    sal_Int32 nPos = m_pSearchEdit->GetEntryPos( sSrchTxt );
     if ( nPos > 0 && nPos != COMBOBOX_ENTRY_NOTFOUND )
         m_pSearchEdit->RemoveEntryAt(nPos);
     if ( nPos > 0 )