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>

4 files changed, 18 insertions, 18 deletions

diff --git a/sw/source/ui/inc/bookmark.hxx b/sw/source/ui/inc/bookmark.hxx
index c93d1fe50edb..2c896c17d3eb 100644
--- a/sw/source/ui/inc/bookmark.hxx
+++ b/sw/source/ui/inc/bookmark.hxx
@@ -31,16 +31,16 @@ class SfxRequest;
 
 class BookmarkCombo : public SwComboBox
 {
-    sal_uInt16          GetFirstSelEntryPos() const;
-    sal_uInt16          GetNextSelEntryPos(sal_uInt16 nPos) const;
-    sal_uInt16          GetSelEntryPos(sal_uInt16 nPos) const;
+    sal_Int32           GetFirstSelEntryPos() const;
+    sal_Int32           GetNextSelEntryPos(sal_Int32  nPos) const;
+    sal_Int32           GetSelEntryPos(sal_Int32  nPos) const;
 
     virtual bool    PreNotify(NotifyEvent& rNEvt);
 public:
     BookmarkCombo(Window* pWin, WinBits nStyle);
 
-    sal_uInt16          GetSelectEntryCount() const;
-    sal_uInt16          GetSelectEntryPos( sal_uInt16 nSelIndex = 0 ) const;
+    sal_Int32           GetSelectEntryCount() const;
+    sal_Int32           GetSelectEntryPos( sal_Int32  nSelIndex = 0 ) const;
 
     static const OUString aForbiddenChars;
 };
diff --git a/sw/source/ui/inc/frmpage.hxx b/sw/source/ui/inc/frmpage.hxx
index b9dfbb5b87bc..5949195c81c8 100644
--- a/sw/source/ui/inc/frmpage.hxx
+++ b/sw/source/ui/inc/frmpage.hxx
@@ -155,20 +155,20 @@ class SwFrmPage: public SfxTabPage
     void            Init(const SfxItemSet& rSet, sal_Bool bReset = sal_False);
     // OD 12.11.2003 #i22341# - adjustment to handle maps, that are ambigous
     //                          in the alignment.
-    sal_uInt16          FillPosLB( const FrmMap* _pMap,
+    sal_Int32       FillPosLB( const FrmMap* _pMap,
                                const sal_uInt16 _nAlign,
                                const sal_uInt16 _nRel,
                                ListBox& _rLB );
     // OD 14.11.2003 #i22341# - adjustment to handle maps, that are ambigous
     //                          in their string entries.
-    sal_uLong           FillRelLB( const FrmMap* _pMap,
+    sal_uLong       FillRelLB( const FrmMap* _pMap,
                                const sal_uInt16 _nLBSelPos,
                                const sal_uInt16 _nAlign,
                                sal_uInt16 _nRel,
                                ListBox& _rLB,
                                FixedText& _rFT );
-    sal_uInt16          GetMapPos( const FrmMap *pMap, ListBox &rAlignLB );
-    short           GetAlignment(FrmMap *pMap, sal_uInt16 nMapPos, ListBox &rAlignLB, ListBox &rRelationLB);
+    sal_Int32       GetMapPos( const FrmMap *pMap, ListBox &rAlignLB );
+    short           GetAlignment(FrmMap *pMap, sal_Int32 nMapPos, ListBox &rAlignLB, ListBox &rRelationLB);
     short           GetRelation(FrmMap *pMap, ListBox &rRelationLB);
     RndStdIds       GetAnchor();
 
diff --git a/sw/source/ui/inc/optload.hxx b/sw/source/ui/inc/optload.hxx
index 0ee5023e89a6..6013d8b8dfc3 100644
--- a/sw/source/ui/inc/optload.hxx
+++ b/sw/source/ui/inc/optload.hxx
@@ -152,7 +152,7 @@ private:
     DECL_LINK(SaveEntryHdl, void *);
 
     void                DelUserData();
-    void                SetOptions( const sal_uInt16 nPos,
+    void                SetOptions( const sal_uLong nPos,
                                     const SwCapObjType eType,
                                     const SvGlobalName *pOleId = 0);
     void                SaveEntry( SvTreeListEntry* pEntry );
diff --git a/sw/source/ui/inc/swlbox.hxx b/sw/source/ui/inc/swlbox.hxx
index 502e48370fce..49ac2b096892 100644
--- a/sw/source/ui/inc/swlbox.hxx
+++ b/sw/source/ui/inc/swlbox.hxx
@@ -40,10 +40,10 @@ class SW_DLLPUBLIC SwBoxEntry
     sal_Bool    bNew : 1;
 
     OUString    aName;
-    sal_uInt16  nId;
+    sal_Int32   nId;
 
 public:
-    SwBoxEntry(const OUString& aName, sal_uInt16 nId=0);
+    SwBoxEntry(const OUString& aName, sal_Int32 nId=0);
     SwBoxEntry(const SwBoxEntry& rOrg);
     SwBoxEntry();
 
@@ -70,15 +70,15 @@ public:
     ~SwComboBox();
 
     void                    InsertSwEntry(const SwBoxEntry&);
-    virtual sal_uInt16      InsertEntry(const OUString& rStr, sal_uInt16 = 0) SAL_OVERRIDE;
+    virtual sal_Int32       InsertEntry(const OUString& rStr, sal_Int32 = 0) SAL_OVERRIDE;
 
-    virtual void            RemoveEntryAt(sal_uInt16 nPos) SAL_OVERRIDE;
+    virtual void            RemoveEntryAt(sal_Int32 nPos) SAL_OVERRIDE;
 
-    sal_uInt16              GetSwEntryPos(const SwBoxEntry& rEntry) const;
-    const SwBoxEntry&       GetSwEntry(sal_uInt16) const;
+    sal_Int32               GetSwEntryPos(const SwBoxEntry& rEntry) const;
+    const SwBoxEntry&       GetSwEntry(sal_Int32) const;
 
-    sal_uInt16                  GetRemovedCount() const;
-    const SwBoxEntry&       GetRemovedEntry(sal_uInt16 nPos) const;
+    sal_Int32               GetRemovedCount() const;
+    const SwBoxEntry&       GetRemovedEntry(sal_Int32 nPos) const;
 };
 
 #endif // INCLUDED_SW_SOURCE_UI_INC_SWLBOX_HXX