diff options
| author | Noel Grandin <noel@peralex.com> | 2016-07-25 07:47:46 +0200 |
|---|---|---|
| committer | Noel Grandin <noel@peralex.com> | 2016-07-25 07:48:28 +0200 |
| commit | b0b6d4cf70d7ed0eb4b656d0ef1fdeb1c60eae28 (patch) | |
| tree | ca70758347f2f8a5d16986aaa2daf6a7f7edd8fd /sw | |
| parent | 15ed9d81005149fce04a0597a52b20cd8d599235 (diff) | |
inconsistent default param override in SwComboBox::InsertEntry
Change-Id: Ica9f876747e039c1dfbac1f15db668724a49d096
Diffstat (limited to 'sw')
| -rw-r--r-- | sw/source/ui/config/optload.cxx | 4 | ||||
| -rw-r--r-- | sw/source/uibase/inc/swlbox.hxx | 2 |
2 files changed, 3 insertions, 3 deletions
diff --git a/sw/source/ui/config/optload.cxx b/sw/source/ui/config/optload.cxx index 4fa9271e39da..41c215ad4884 100644 --- a/sw/source/ui/config/optload.cxx +++ b/sw/source/ui/config/optload.cxx @@ -700,7 +700,7 @@ IMPL_LINK_NOARG_TYPED(SwCaptionOptPage, ShowEntryHdl, SvTreeListBox*, void) InsCaptionOpt* pOpt = static_cast<InsCaptionOpt*>(pSelEntry->GetUserData()); m_pCategoryBox->Clear(); - m_pCategoryBox->InsertEntry(m_sNone); + m_pCategoryBox->InsertEntry(m_sNone, 0); if (pSh) { const size_t nCount = pMgr->GetFieldTypeCount(); @@ -727,7 +727,7 @@ IMPL_LINK_NOARG_TYPED(SwCaptionOptPage, ShowEntryHdl, SvTreeListBox*, void) m_pCategoryBox->SetText(m_sNone); if (!pOpt->GetCategory().isEmpty() && m_pCategoryBox->GetEntryPos(pOpt->GetCategory()) == COMBOBOX_ENTRY_NOTFOUND) - m_pCategoryBox->InsertEntry(pOpt->GetCategory()); + m_pCategoryBox->InsertEntry(pOpt->GetCategory(), 0); if (m_pCategoryBox->GetText().isEmpty()) { sal_Int32 nPos = 0; diff --git a/sw/source/uibase/inc/swlbox.hxx b/sw/source/uibase/inc/swlbox.hxx index 94997a3f7487..3eb4860d5deb 100644 --- a/sw/source/uibase/inc/swlbox.hxx +++ b/sw/source/uibase/inc/swlbox.hxx @@ -60,7 +60,7 @@ public: virtual ~SwComboBox(); void InsertSwEntry(const SwBoxEntry&); - virtual sal_Int32 InsertEntry(const OUString& rStr, sal_Int32 = 0) override; + virtual sal_Int32 InsertEntry(const OUString& rStr, sal_Int32 = COMBOBOX_APPEND) override; virtual void RemoveEntryAt(sal_Int32 nPos) override; |