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>

5 files changed, 24 insertions, 24 deletions

diff --git a/sw/source/ui/misc/bookmark.cxx b/sw/source/ui/misc/bookmark.cxx
index 0367f40b75a5..f8b383cce5fe 100644
--- a/sw/source/ui/misc/bookmark.cxx
+++ b/sw/source/ui/misc/bookmark.cxx
@@ -72,7 +72,7 @@ IMPL_LINK_NOARG(SwInsertBookmarkDlg, DeleteHdl)
 {
     // remove text marks from the ComboBox
 
-    for (sal_uInt16 i = m_pBookmarkBox->GetSelectEntryCount(); i; i-- )
+    for (sal_Int32 i = m_pBookmarkBox->GetSelectEntryCount(); i; i-- )
         m_pBookmarkBox->RemoveEntryAt(m_pBookmarkBox->GetSelectEntryPos(i - 1));
 
     m_pBookmarkBox->SetText(OUString());
@@ -90,7 +90,7 @@ void SwInsertBookmarkDlg::Apply()
 {
     //at first remove deleted bookmarks to prevent multiple bookmarks with the same
     //name
-    for (sal_uInt16 nCount = m_pBookmarkBox->GetRemovedCount(); nCount > 0; nCount--)
+    for (sal_Int32 nCount = m_pBookmarkBox->GetRemovedCount(); nCount > 0; nCount--)
     {
         OUString sRemoved = m_pBookmarkBox->GetRemovedEntry( nCount -1 ).GetName();
         IDocumentMarkAccess* const pMarkAccess = rSh.getIDocumentMarkAccess();
@@ -160,21 +160,21 @@ BookmarkCombo::BookmarkCombo(Window* pWin, WinBits nStyle)
 {
 }
 
-sal_uInt16 BookmarkCombo::GetFirstSelEntryPos() const
+sal_Int32 BookmarkCombo::GetFirstSelEntryPos() const
 {
     return GetSelEntryPos(0);
 }
 
-sal_uInt16 BookmarkCombo::GetNextSelEntryPos(sal_uInt16 nPos) const
+sal_Int32 BookmarkCombo::GetNextSelEntryPos(sal_Int32 nPos) const
 {
     return GetSelEntryPos(nPos + 1);
 }
 
-sal_uInt16 BookmarkCombo::GetSelEntryPos(sal_uInt16 nPos) const
+sal_Int32 BookmarkCombo::GetSelEntryPos(sal_Int32 nPos) const
 {
     sal_Unicode cSep = GetMultiSelectionSeparator();
 
-    sal_uInt16 nCnt = comphelper::string::getTokenCount(GetText(), cSep);
+    sal_Int32 nCnt = comphelper::string::getTokenCount(GetText(), cSep);
 
     for (; nPos < nCnt; nPos++)
     {
@@ -186,11 +186,11 @@ sal_uInt16 BookmarkCombo::GetSelEntryPos(sal_uInt16 nPos) const
     return COMBOBOX_ENTRY_NOTFOUND;
 }
 
-sal_uInt16 BookmarkCombo::GetSelectEntryCount() const
+sal_Int32 BookmarkCombo::GetSelectEntryCount() const
 {
-    sal_uInt16 nCnt = 0;
+    sal_Int32 nCnt = 0;
 
-    sal_uInt16 nPos = GetFirstSelEntryPos();
+    sal_Int32 nPos = GetFirstSelEntryPos();
     while (nPos != COMBOBOX_ENTRY_NOTFOUND)
     {
         nPos = GetNextSelEntryPos(nPos);
@@ -203,10 +203,10 @@ sal_uInt16 BookmarkCombo::GetSelectEntryCount() const
 /*------------------------------------------------------------------------
      Description: position inside of the listbox (the ComboBox)
  -----------------------------------------------------------------------*/
-sal_uInt16 BookmarkCombo::GetSelectEntryPos( sal_uInt16 nSelIndex ) const
+sal_Int32 BookmarkCombo::GetSelectEntryPos( sal_Int32 nSelIndex ) const
 {
-    sal_uInt16 nCnt = 0;
-    sal_uInt16 nPos = GetFirstSelEntryPos();
+    sal_Int32 nCnt = 0;
+    sal_Int32 nPos = GetFirstSelEntryPos();
 
     while (nPos != COMBOBOX_ENTRY_NOTFOUND)
     {
diff --git a/sw/source/ui/misc/docfnote.cxx b/sw/source/ui/misc/docfnote.cxx
index 7c8ee93a2e22..88f32450f97a 100644
--- a/sw/source/ui/misc/docfnote.cxx
+++ b/sw/source/ui/misc/docfnote.cxx
@@ -188,7 +188,7 @@ void SwEndNoteOptionPage::Reset( const SfxItemSet& )
     else
     {
         OSL_ENSURE(!pColl->IsDefault(), "default style for footnotes is wrong");
-        const sal_uInt16 nPos = m_pParaTemplBox->GetEntryPos(pColl->GetName());
+        const sal_Int32 nPos = m_pParaTemplBox->GetEntryPos(pColl->GetName());
         if( LISTBOX_ENTRY_NOTFOUND != nPos )
             m_pParaTemplBox->SelectEntryPos( nPos );
         else
@@ -253,7 +253,7 @@ void SwEndNoteOptionPage::SelectNumbering(int eNum)
 
 int SwEndNoteOptionPage::GetNumbering() const
 {
-    const sal_uInt16 nPos = m_pNumCountBox->GetSelectEntryPos();
+    const sal_Int32 nPos = m_pNumCountBox->GetSelectEntryPos();
     return (int) bPosDoc? nPos + 1: nPos;
 }
 
@@ -364,7 +364,7 @@ sal_Bool SwEndNoteOptionPage::FillItemSet( SfxItemSet & )
                         m_pFtnCharAnchorTemplBox->GetSelectEntry() ) );
 
     // paragraph template
-    sal_uInt16 nPos = m_pParaTemplBox->GetSelectEntryPos();
+    sal_Int32 nPos = m_pParaTemplBox->GetSelectEntryPos();
     if(LISTBOX_ENTRY_NOTFOUND != nPos)
     {
         const OUString aFmtName( m_pParaTemplBox->GetSelectEntry() );
diff --git a/sw/source/ui/misc/linenum.cxx b/sw/source/ui/misc/linenum.cxx
index da2d76abbdf6..d37c1d66ebbd 100644
--- a/sw/source/ui/misc/linenum.cxx
+++ b/sw/source/ui/misc/linenum.cxx
@@ -75,7 +75,7 @@ SwLineNumberingDlg::SwLineNumberingDlg(SwView *pVw)
     IDocumentStylePoolAccess* pIDSPA = pSh->getIDocumentStylePoolAccess();
 
     OUString sStyleName(rInf.GetCharFmt( *pIDSPA )->GetName());
-    const sal_uInt16 nPos = m_pCharStyleLB->GetEntryPos(sStyleName);
+    const sal_Int32 nPos = m_pCharStyleLB->GetEntryPos(sStyleName);
 
     if (nPos != LISTBOX_ENTRY_NOTFOUND)
         m_pCharStyleLB->SelectEntryPos(nPos);
@@ -94,7 +94,7 @@ SwLineNumberingDlg::SwLineNumberingDlg(SwView *pVw)
     m_pFormatLB->SelectNumberingType(nSelFmt);
 
     // position
-    m_pPosLB->SelectEntryPos((sal_uInt16)rInf.GetPos());
+    m_pPosLB->SelectEntryPos((sal_Int32)rInf.GetPos());
 
     // offset
     sal_uInt16 nOffset = rInf.GetPosFromLeft();
diff --git a/sw/source/ui/misc/numberingtypelistbox.cxx b/sw/source/ui/misc/numberingtypelistbox.cxx
index abf041025090..d319a131e3df 100644
--- a/sw/source/ui/misc/numberingtypelistbox.cxx
+++ b/sw/source/ui/misc/numberingtypelistbox.cxx
@@ -85,7 +85,7 @@ void SwNumberingTypeListBox::Reload(sal_uInt16 nTypeFlags)
     {
         sal_IntPtr nValue = rNames.GetValue(i);
         bool bInsert = true;
-        sal_uInt16 nPos = LISTBOX_APPEND;
+        sal_Int32 nPos = LISTBOX_APPEND;
         switch(nValue)
         {
             case  style::NumberingType::NUMBER_NONE:
@@ -115,7 +115,7 @@ void SwNumberingTypeListBox::Reload(sal_uInt16 nTypeFlags)
         }
         if(bInsert)
         {
-            sal_uInt16 nEntry = InsertEntry(rNames.GetString(i), nPos);
+            sal_Int32 nEntry = InsertEntry(rNames.GetString(i), nPos);
             SetEntryData( nEntry, (void*)nValue );
         }
     }
@@ -131,7 +131,7 @@ void SwNumberingTypeListBox::Reload(sal_uInt16 nTypeFlags)
                     if(LISTBOX_ENTRY_NOTFOUND == GetEntryPos((void*)(sal_uLong)nCurrent))
                     {
                         OUString aIdent = pImpl->xInfo->getNumberingIdentifier( nCurrent );
-                        sal_uInt16 nPos = InsertEntry(aIdent);
+                        sal_Int32 nPos = InsertEntry(aIdent);
                         SetEntryData(nPos,(void*)(sal_uLong)nCurrent);
                     }
                 }
@@ -144,7 +144,7 @@ void SwNumberingTypeListBox::Reload(sal_uInt16 nTypeFlags)
 sal_Int16   SwNumberingTypeListBox::GetSelectedNumberingType()
 {
     sal_Int16 nRet = 0;
-    sal_uInt16 nSelPos = GetSelectEntryPos();
+    sal_Int32 nSelPos = GetSelectEntryPos();
     if(LISTBOX_ENTRY_NOTFOUND != nSelPos)
         nRet = (sal_Int16)(sal_uLong)GetEntryData(nSelPos);
 #if OSL_DEBUG_LEVEL > 0
@@ -156,7 +156,7 @@ sal_Int16   SwNumberingTypeListBox::GetSelectedNumberingType()
 
 sal_Bool    SwNumberingTypeListBox::SelectNumberingType(sal_Int16 nType)
 {
-    sal_uInt16 nPos = GetEntryPos((void*)(sal_uLong)nType);
+    sal_Int32 nPos = GetEntryPos((void*)(sal_uLong)nType);
     SelectEntryPos( nPos );
     return LISTBOX_ENTRY_NOTFOUND != nPos;
 }
diff --git a/sw/source/ui/misc/pgfnote.cxx b/sw/source/ui/misc/pgfnote.cxx
index 372b6526b2da..3e356866548f 100644
--- a/sw/source/ui/misc/pgfnote.cxx
+++ b/sw/source/ui/misc/pgfnote.cxx
@@ -231,7 +231,7 @@ void SwFootNotePage::Reset(const SfxItemSet &rSet)
     }
 
     // select color in the list or add it as a user color
-    sal_uInt16 nSelPos = m_pLineColorBox->GetEntryPos( pFtnInfo->GetLineColor() );
+    sal_Int32 nSelPos = m_pLineColorBox->GetEntryPos( pFtnInfo->GetLineColor() );
     if( nSelPos == LISTBOX_ENTRY_NOTFOUND )
         nSelPos = m_pLineColorBox->InsertEntry( pFtnInfo->GetLineColor(),
                 OUString( SW_RES( RID_SVXSTR_COLOR_USER ) ) );
@@ -241,7 +241,7 @@ void SwFootNotePage::Reset(const SfxItemSet &rSet)
     m_pLineTypeBox->SetColor( pFtnInfo->GetLineColor() );
 
     // position
-    m_pLinePosBox->SelectEntryPos( static_cast< sal_uInt16 >(pFtnInfo->GetAdj()) );
+    m_pLinePosBox->SelectEntryPos( static_cast< sal_Int32 >(pFtnInfo->GetAdj()) );
 
         // width
     Fraction aTmp( 100, 1 );