diff options
| author | Eike Rathke <erack@redhat.com> | 2014-03-01 03:13:28 +0100 |
|---|---|---|
| committer | Eike Rathke <erack@redhat.com> | 2014-03-05 07:31:19 -0600 |
| commit | 68ec95b3f80408ae50897b043eed69a07d084df9 (patch) | |
| tree | 5d32076e843fae44f28e3c8d9dbbacf7648fecbc /include/svx/langbox.hxx | |
| parent | c3403ac888c2e62edaf8befe7982f5f8cc95c16f (diff) | |
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>
Diffstat (limited to 'include/svx/langbox.hxx')
| -rw-r--r-- | include/svx/langbox.hxx | 14 |
1 files changed, 7 insertions, 7 deletions
diff --git a/include/svx/langbox.hxx b/include/svx/langbox.hxx index f978e7b35eb5..c6c6de6c8d3e 100644 --- a/include/svx/langbox.hxx +++ b/include/svx/langbox.hxx @@ -64,8 +64,8 @@ private: sal_Bool m_bWithCheckmark; SVX_DLLPRIVATE void Init(); - SVX_DLLPRIVATE sal_uInt16 ImplInsertImgEntry( const OUString& rEntry, sal_uInt16 nPos, bool bChecked ); - SVX_DLLPRIVATE sal_uInt16 ImplInsertLanguage(LanguageType, sal_uInt16, sal_Int16 ); + SVX_DLLPRIVATE sal_Int32 ImplInsertImgEntry( const OUString& rEntry, sal_Int32 nPos, bool bChecked ); + SVX_DLLPRIVATE sal_Int32 ImplInsertLanguage(LanguageType, sal_Int32 nPos, sal_Int16 nType); public: SvxLanguageBox(Window* pParent, WinBits nBits, sal_Bool bCheck = sal_False); @@ -75,11 +75,11 @@ public: sal_Bool bHasLangNone, sal_Bool bLangNoneIsLangAll = sal_False, sal_Bool bCheckSpellAvail = sal_False ); - sal_uInt16 InsertLanguage( const LanguageType eLangType, sal_uInt16 nPos = LISTBOX_APPEND ); - sal_uInt16 InsertDefaultLanguage( sal_Int16 nType, sal_uInt16 nPos = LISTBOX_APPEND ); - sal_uInt16 InsertSystemLanguage( sal_uInt16 nPos = LISTBOX_APPEND ); - sal_uInt16 InsertLanguage( const LanguageType eLangType, - sal_Bool bCheckEntry, sal_uInt16 nPos = LISTBOX_APPEND ); + sal_Int32 InsertLanguage( const LanguageType eLangType, sal_Int32 nPos = LISTBOX_APPEND ); + sal_Int32 InsertDefaultLanguage( sal_Int16 nType, sal_Int32 nPos = LISTBOX_APPEND ); + sal_Int32 InsertSystemLanguage( sal_Int32 nPos = LISTBOX_APPEND ); + sal_Int32 InsertLanguage( const LanguageType eLangType, + sal_Bool bCheckEntry, sal_Int32 nPos = LISTBOX_APPEND ); void RemoveLanguage( const LanguageType eLangType ); void SelectLanguage( const LanguageType eLangType, sal_Bool bSelect = sal_True ); LanguageType GetSelectLanguage() const; |