diff options
| author | Caolán McNamara <caolanm@redhat.com> | 2018-09-14 14:43:07 +0100 |
|---|---|---|
| committer | Caolán McNamara <caolanm@redhat.com> | 2018-09-17 10:02:23 +0200 |
| commit | 2419fa71d8b2223a50f596d5db7721f6213d4f87 (patch) | |
| tree | 5e85620bd2b8087d60649e6cb6da269e737f5fcf /sw | |
| parent | 35109fe7c058cf6d961245fc24550d1c1d39a300 (diff) | |
add image support to weld::ComboBoxText
Change-Id: Ie7f00ed4aef5318a525a526d0377bb7952bdd5a0
Reviewed-on: https://gerrit.libreoffice.org/60499
Tested-by: Jenkins
Reviewed-by: Caolán McNamara <caolanm@redhat.com>
Tested-by: Caolán McNamara <caolanm@redhat.com>
Diffstat (limited to 'sw')
| -rw-r--r-- | sw/source/ui/frmdlg/column.cxx | 2 | ||||
| -rw-r--r-- | sw/source/uibase/misc/numberingtypelistbox.cxx | 4 | ||||
| -rw-r--r-- | sw/source/uibase/utlui/uitool.cxx | 2 |
3 files changed, 4 insertions, 4 deletions
diff --git a/sw/source/ui/frmdlg/column.cxx b/sw/source/ui/frmdlg/column.cxx index cc3adc0c97f5..1332b6040ae4 100644 --- a/sw/source/ui/frmdlg/column.cxx +++ b/sw/source/ui/frmdlg/column.cxx @@ -189,7 +189,7 @@ SwColumnDlg::SwColumnDlg(weld::Window* pParent, SwWrtShell& rSh) { const OUString sPageStr = pApplyToLB->get_text(nPagePos) + pPageDesc->GetName(); pApplyToLB->remove(nPagePos); - pApplyToLB->insert(nPagePos, OUString::number(LISTBOX_PAGE), sPageStr); + pApplyToLB->insert(nPagePos, OUString::number(LISTBOX_PAGE), sPageStr, nullptr); } else pApplyToLB->remove( nPagePos ); diff --git a/sw/source/uibase/misc/numberingtypelistbox.cxx b/sw/source/uibase/misc/numberingtypelistbox.cxx index 5f824d95a044..71f186d948b6 100644 --- a/sw/source/uibase/misc/numberingtypelistbox.cxx +++ b/sw/source/uibase/misc/numberingtypelistbox.cxx @@ -113,7 +113,7 @@ void SwNumberingTypeListBox::Reload(SwInsertNumTypes nTypeFlags) } if (bInsert) { - m_xWidget->insert(nPos, OUString::number(nValue), SvxNumberingTypeTable::GetString(i)); + m_xWidget->insert(nPos, OUString::number(nValue), SvxNumberingTypeTable::GetString(i), nullptr); } } if (nTypeFlags & SwInsertNumTypes::Extended) @@ -127,7 +127,7 @@ void SwNumberingTypeListBox::Reload(SwInsertNumTypes nTypeFlags) { if (m_xWidget->find_id(OUString::number(nCurrent)) == -1) { - m_xWidget->insert(-1, OUString::number(nCurrent), m_xImpl->xInfo->getNumberingIdentifier(nCurrent)); + m_xWidget->append(OUString::number(nCurrent), m_xImpl->xInfo->getNumberingIdentifier(nCurrent)); } } } diff --git a/sw/source/uibase/utlui/uitool.cxx b/sw/source/uibase/utlui/uitool.cxx index e2a3276464f1..09bb27b81c9a 100644 --- a/sw/source/uibase/utlui/uitool.cxx +++ b/sw/source/uibase/utlui/uitool.cxx @@ -687,7 +687,7 @@ void InsertStringSorted(const OUString& rId, const OUString& rEntry, weld::Combo break; ++nOffset; } - rToFill.insert(nOffset, rId, rEntry); + rToFill.insert(nOffset, rId, rEntry, nullptr); } void FillCharStyleListBox(ListBox& rToFill, SwDocShell* pDocSh, bool bSorted, bool bWithDefault) |