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 /sw/source/ui/dbui/mmgreetingspage.cxx | |
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 'sw/source/ui/dbui/mmgreetingspage.cxx')
-rw-r--r-- | sw/source/ui/dbui/mmgreetingspage.cxx | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/sw/source/ui/dbui/mmgreetingspage.cxx b/sw/source/ui/dbui/mmgreetingspage.cxx index 037da8c6e999..da9d8fa90e02 100644 --- a/sw/source/ui/dbui/mmgreetingspage.cxx +++ b/sw/source/ui/dbui/mmgreetingspage.cxx @@ -62,7 +62,7 @@ static void lcl_StoreGreetingsBox(ListBox& rBox, { Sequence< OUString> aEntries(rBox.GetEntryCount()); OUString* pEntries = aEntries.getArray(); - for(sal_uInt16 nEntry = 0; nEntry < rBox.GetEntryCount(); ++nEntry) + for(sal_Int32 nEntry = 0; nEntry < rBox.GetEntryCount(); ++nEntry) pEntries[nEntry] = rBox.GetEntry(nEntry); rConfig.SetGreetings(eType, aEntries); rConfig.SetCurrentGreeting(eType, rBox.GetSelectEntryPos()); @@ -74,7 +74,7 @@ static void lcl_StoreGreetingsBox(ComboBox& rBox, { Sequence< OUString> aEntries(rBox.GetEntryCount()); OUString* pEntries = aEntries.getArray(); - for(sal_uInt16 nEntry = 0; nEntry < rBox.GetEntryCount(); ++nEntry) + for(sal_Int32 nEntry = 0; nEntry < rBox.GetEntryCount(); ++nEntry) pEntries[nEntry] = rBox.GetEntry(nEntry); rConfig.SetGreetings(eType, aEntries); rConfig.SetCurrentGreeting(eType, rBox.GetSelectEntryPos()); @@ -364,10 +364,10 @@ sal_Bool SwMailMergeGreetingsPage::commitPage( ::svt::WizardTypes::CommitPage lcl_StoreGreetingsBox(m_aFemaleLB, rConfig, SwMailMergeConfigItem::FEMALE); lcl_StoreGreetingsBox(m_aMaleLB, rConfig, SwMailMergeConfigItem::MALE); - sal_uInt16 nCurrentTextPos = m_aNeutralCB.GetEntryPos( m_aNeutralCB.GetText() ); - if(LISTBOX_ENTRY_NOTFOUND == nCurrentTextPos) + sal_Int32 nCurrentTextPos = m_aNeutralCB.GetEntryPos( m_aNeutralCB.GetText() ); + if(COMBOBOX_ENTRY_NOTFOUND == nCurrentTextPos) { - sal_uInt16 nCount = m_aNeutralCB.GetEntryCount(); + sal_Int32 nCount = m_aNeutralCB.GetEntryCount(); m_aNeutralCB.InsertEntry( m_aNeutralCB.GetText(), nCount ); m_aNeutralCB.SelectEntryPos(nCount); } |