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>

8 files changed, 29 insertions, 29 deletions

diff --git a/cui/source/inc/acccfg.hxx b/cui/source/inc/acccfg.hxx
index ae83b9deb4eb..9e1413f3762b 100644
--- a/cui/source/inc/acccfg.hxx
+++ b/cui/source/inc/acccfg.hxx
@@ -162,7 +162,7 @@ private:
 
     OUString                    GetLabel4Command(const OUString& rCommand);
     void                        InitAccCfg();
-    sal_uInt16                  MapKeyCodeToPos( const KeyCode &rCode ) const;
+    sal_uLong                   MapKeyCodeToPos( const KeyCode &rCode ) const;
     css::uno::Reference< css::frame::XModel > SearchForAlreadyLoadedDoc(const OUString& sName);
     void                        StartFileDialog( WinBits nBits, const OUString& rTitle );
 
diff --git a/cui/source/inc/cfg.hxx b/cui/source/inc/cfg.hxx
index 8ab1fad446cc..d8cca470ee68 100644
--- a/cui/source/inc/cfg.hxx
+++ b/cui/source/inc/cfg.hxx
@@ -431,7 +431,7 @@ protected:
                                         SvxConfigEntry* pParentData );
 
     SvTreeListEntry*    InsertEntryIntoUI ( SvxConfigEntry* pNewEntryData,
-                                        sal_uLong nPos = LIST_APPEND );
+                                        sal_uLong nPos = TREELIST_APPEND );
 
     SvxEntries*     FindParentForChild( SvxEntries* pParentEntries,
                                         SvxConfigEntry* pChildData );
diff --git a/cui/source/inc/cuifmsearch.hxx b/cui/source/inc/cuifmsearch.hxx
index 4688403c92db..31acdbc87752 100644
--- a/cui/source/inc/cuifmsearch.hxx
+++ b/cui/source/inc/cuifmsearch.hxx
@@ -187,8 +187,8 @@ private:
 
 inline void FmSearchDialog::SetActiveField(const OUString& strField)
 {
-    sal_uInt16 nInitialField = m_lbField.GetEntryPos(strField);
-    if (nInitialField == COMBOBOX_ENTRY_NOTFOUND)
+    sal_Int32 nInitialField = m_lbField.GetEntryPos(strField);
+    if (nInitialField == LISTBOX_ENTRY_NOTFOUND)
         nInitialField = 0;
     m_lbField.SelectEntryPos(nInitialField);
     LINK(this, FmSearchDialog, OnFieldSelected).Call(&m_lbField);
diff --git a/cui/source/inc/cuitabarea.hxx b/cui/source/inc/cuitabarea.hxx
index 7bb862d55f5b..b3d34e3d46b9 100644
--- a/cui/source/inc/cuitabarea.hxx
+++ b/cui/source/inc/cuitabarea.hxx
@@ -64,7 +64,7 @@ private:
     ChangeType          mnHatchingListState;
 
     sal_uInt16          mnPageType;
-    sal_uInt16          mnPos;
+    sal_Int32           mnPos;
     sal_Bool            mbAreaTP;
 
     virtual void        PageCreated( sal_uInt16 nId, SfxTabPage &rPage );
@@ -245,7 +245,7 @@ private:
 
     sal_uInt16 nPageType;
     sal_uInt16 nDlgType;
-    sal_uInt16 nPos;
+    sal_Int32  nPos;
 
     sal_Bool*               pbAreaTP;
 
@@ -397,7 +397,7 @@ private:
     ChangeType*         pnColorListState;
     sal_uInt16*         pPageType;
     sal_uInt16          nDlgType;
-    sal_uInt16*         pPos;
+    sal_Int32*          pPos;
     sal_Bool*           pbAreaTP;
 
     XOutdevItemPool*    pXPool;
@@ -435,7 +435,7 @@ public:
 
     void    SetPageType( sal_uInt16* pInType ) { pPageType = pInType; }
     void    SetDlgType( sal_uInt16 nInType ) { nDlgType = nInType; }
-    void    SetPos( sal_uInt16* pInPos ) { pPos = pInPos; }
+    void    SetPos( sal_Int32* pInPos ) { pPos = pInPos; }
     void    SetAreaTP( sal_Bool* pIn ) { pbAreaTP = pIn; }
 
     void    SetGrdChgd( ChangeType* pIn ) { pnGradientListState = pIn; }
@@ -472,7 +472,7 @@ private:
     ChangeType*         pnColorListState;
     sal_uInt16*         pPageType;
     sal_uInt16          nDlgType;
-    sal_uInt16*         pPos;
+    sal_Int32*          pPos;
     sal_Bool*           pbAreaTP;
 
     XOutdevItemPool*    pXPool;
@@ -513,7 +513,7 @@ public:
 
     void    SetPageType( sal_uInt16* pInType ) { pPageType = pInType; }
     void    SetDlgType( sal_uInt16 nInType ) { nDlgType = nInType; }
-    void    SetPos( sal_uInt16* pInPos ) { pPos = pInPos; }
+    void    SetPos( sal_Int32* pInPos ) { pPos = pInPos; }
     void    SetAreaTP( sal_Bool* pIn ) { pbAreaTP = pIn; }
 
     void    SetHtchChgd( ChangeType* pIn ) { pnHatchingListState = pIn; }
@@ -555,7 +555,7 @@ private:
     ChangeType*         pnColorListState;
     sal_uInt16*         pPageType;
     sal_uInt16          nDlgType;
-    sal_uInt16*         pPos;
+    sal_Int32*          pPos;
     sal_Bool*           pbAreaTP;
 
     sal_Bool                bBmpChanged;
@@ -598,7 +598,7 @@ public:
 
     void    SetPageType( sal_uInt16* pInType ) { pPageType = pInType; }
     void    SetDlgType( sal_uInt16 nInType ) { nDlgType = nInType; }
-    void    SetPos( sal_uInt16* pInPos ) { pPos = pInPos; }
+    void    SetPos( sal_Int32* pInPos ) { pPos = pInPos; }
     void    SetAreaTP( sal_Bool* pIn ) { pbAreaTP = pIn; }
 
     void    SetBmpChgd( ChangeType* pIn ) { pnBitmapListState = pIn; }
@@ -678,7 +678,7 @@ private:
     ChangeType*         pnColorListState;
     sal_uInt16*         pPageType;
     sal_uInt16          nDlgType;
-    sal_uInt16*         pPos;
+    sal_Int32*          pPos;
     sal_Bool*           pbAreaTP;
 
     XFillStyleItem      aXFStyleItem;
@@ -736,7 +736,7 @@ public:
 
     void    SetPageType( sal_uInt16* pInType ) { pPageType = pInType; }
     void    SetDlgType( sal_uInt16 nInType ) { nDlgType = nInType; }
-    void    SetPos( sal_uInt16* pInPos ) { pPos = pInPos; }
+    void    SetPos( sal_Int32* pInPos ) { pPos = pInPos; }
     void    SetAreaTP( sal_Bool* pIn ) { pbAreaTP = pIn; }
 
     void    SetColorChgd( ChangeType* pIn ) { pnColorListState = pIn; }
diff --git a/cui/source/inc/cuitabline.hxx b/cui/source/inc/cuitabline.hxx
index 47269744d1c4..6d5cbd7ee7f1 100644
--- a/cui/source/inc/cuitabline.hxx
+++ b/cui/source/inc/cuitabline.hxx
@@ -49,8 +49,8 @@ private:
     ChangeType          mnColorListState;
 
     sal_uInt16          nPageType;
-    sal_uInt16          nPosDashLb;
-    sal_uInt16          nPosLineEndLb;
+    sal_Int32           nPosDashLb;
+    sal_Int32           nPosLineEndLb;
     sal_Bool            mbAreaTP;
 
     virtual void        PageCreated( sal_uInt16 nId, SfxTabPage &rPage );
@@ -164,8 +164,8 @@ private:
     ChangeType*         pnColorListState;
     sal_uInt16          nPageType;
     sal_uInt16          nDlgType;
-    sal_uInt16*         pPosDashLb;
-    sal_uInt16*         pPosLineEndLb;
+    sal_Int32*          pPosDashLb;
+    sal_Int32*          pPosLineEndLb;
 
     SfxMapUnit          ePoolUnit;
 
@@ -225,8 +225,8 @@ public:
 
     void    SetPageType( sal_uInt16 nInType ) { nPageType = nInType; }
     void    SetDlgType( sal_uInt16 nInType ) { nDlgType = nInType; }
-    void    SetPosDashLb( sal_uInt16* pInPos ) { pPosDashLb = pInPos; }
-    void    SetPosLineEndLb( sal_uInt16* pInPos ) { pPosLineEndLb = pInPos; }
+    void    SetPosDashLb( sal_Int32* pInPos ) { pPosDashLb = pInPos; }
+    void    SetPosLineEndLb( sal_Int32* pInPos ) { pPosLineEndLb = pInPos; }
 
     void    SetLineEndChgd( ChangeType* pIn ) { pnLineEndListState = pIn; }
     void    SetDashChgd( ChangeType* pIn ) { pnDashListState = pIn; }
@@ -276,7 +276,7 @@ private:
     ChangeType*         pnDashListState;
     sal_uInt16*         pPageType;
     sal_uInt16          nDlgType;
-    sal_uInt16*         pPosDashLb;
+    sal_Int32*          pPosDashLb;
 
     SfxMapUnit          ePoolUnit;
     FieldUnit           eFUnit;
@@ -315,7 +315,7 @@ public:
 
     void    SetPageType( sal_uInt16* pInType ) { pPageType = pInType; }
     void    SetDlgType( sal_uInt16 nInType ) { nDlgType = nInType; }
-    void    SetPosDashLb( sal_uInt16* pInPos ) { pPosDashLb = pInPos; }
+    void    SetPosDashLb( sal_Int32* pInPos ) { pPosDashLb = pInPos; }
 
     void    SetDashChgd( ChangeType* pIn ) { pnDashListState = pIn; }
 
@@ -355,7 +355,7 @@ private:
     ChangeType*         pnLineEndListState;
     sal_uInt16*         pPageType;
     sal_uInt16          nDlgType;
-    sal_uInt16*         pPosLineEndLb;
+    sal_Int32*          pPosLineEndLb;
 
     DECL_LINK( ClickAddHdl_Impl, void * );
     DECL_LINK( ClickModifyHdl_Impl, void * );
@@ -386,7 +386,7 @@ public:
 
     void    SetPageType( sal_uInt16* pInType ) { pPageType = pInType; }
     void    SetDlgType( sal_uInt16 nInType ) { nDlgType = nInType; }
-    void    SetPosLineEndLb( sal_uInt16* pInPos ) { pPosLineEndLb = pInPos; }
+    void    SetPosLineEndLb( sal_Int32* pInPos ) { pPosLineEndLb = pInPos; }
 
     void    SetLineEndChgd( ChangeType* pIn ) { pnLineEndListState = pIn; }
 
diff --git a/cui/source/inc/iconcdlg.hxx b/cui/source/inc/iconcdlg.hxx
index b7cbf674a43f..67706124bc16 100644
--- a/cui/source/inc/iconcdlg.hxx
+++ b/cui/source/inc/iconcdlg.hxx
@@ -199,7 +199,7 @@ public :
     SvxIconChoiceCtrlEntry* AddTabPage(
         sal_uInt16 nId, const OUString& rIconText, const Image& rChoiceIcon,
         CreatePage pCreateFunc /* != NULL */, GetPageRanges pRangesFunc = NULL /* NULL allowed*/,
-        sal_Bool bItemsOnDemand = sal_False, sal_uLong nPos = LIST_APPEND );
+        sal_Bool bItemsOnDemand = sal_False, sal_uLong nPos = TREELIST_APPEND );
 
     void                SetCurPageId( sal_uInt16 nId ) { mnCurrentPageId = nId; FocusOnIcon( nId ); }
     sal_uInt16              GetCurPageId() const       { return mnCurrentPageId; }
diff --git a/cui/source/inc/linkdlg.hxx b/cui/source/inc/linkdlg.hxx
index aab701c13fd3..889fb6a3e6f1 100644
--- a/cui/source/inc/linkdlg.hxx
+++ b/cui/source/inc/linkdlg.hxx
@@ -83,10 +83,10 @@ class SvBaseLinksDlg : public ModalDialog
     DECL_LINK( BreakLinkClickHdl, PushButton * );
     DECL_LINK( UpdateWaitingHdl, Timer * );
     DECL_LINK( EndEditHdl, sfx2::SvBaseLink* );
-    sfx2::SvBaseLink* GetSelEntry( sal_uInt16* pPos );
+    sfx2::SvBaseLink* GetSelEntry( sal_uLong* pPos );
     OUString ImplGetStateStr( const sfx2::SvBaseLink& );
-    void SetType( sfx2::SvBaseLink& rLink, sal_uInt16 nPos, sal_uInt16 nType );
-    void InsertEntry( const sfx2::SvBaseLink& rLink, sal_uInt16 nPos = LISTBOX_APPEND, sal_Bool bSelect = sal_False);
+    void SetType( sfx2::SvBaseLink& rLink, sal_uLong nPos, sal_uInt16 nType );
+    void InsertEntry( const sfx2::SvBaseLink& rLink, sal_uLong nPos = TREELIST_APPEND, sal_Bool bSelect = sal_False);
 
     void StartUpdateTimer()         { aUpdateTimer.Start(); }
 
diff --git a/cui/source/inc/optdict.hxx b/cui/source/inc/optdict.hxx
index 98ddd2d4461a..c72f687e94f4 100644
--- a/cui/source/inc/optdict.hxx
+++ b/cui/source/inc/optdict.hxx
@@ -141,7 +141,7 @@ private:
                             ::com::sun::star::linguistic2::XDictionary >  &xDic );
 
     void            RemoveDictEntry(SvTreeListEntry* pEntry);
-    sal_uInt16          GetLBInsertPos(const OUString &rDicWord);
+    sal_uLong       GetLBInsertPos(const OUString &rDicWord);
 
 protected: