diff options
| author | Jochen Nitschke <j.nitschke+logerrit@ok.de> | 2016-08-26 01:26:38 +0200 |
|---|---|---|
| committer | Noel Grandin <noelgrandin@gmail.com> | 2016-08-26 07:51:19 +0000 |
| commit | ef699b4d41cc602322d980027956aab636c776d5 (patch) | |
| tree | 65856032b9b3bd285558f5fb6d6b21598a50d548 /sc | |
| parent | 213a11b94caf28ffae927169ebd372a866f8f9b2 (diff) | |
convert SV_ITEM_ID_LBOX defines to scoped enum
and remove unused SV_ITEM_ID_EXTENDRLBOXSTRING
Change-Id: Ic84d9341d0225b01b9ef46814483c66b1af307b5
Reviewed-on: https://gerrit.libreoffice.org/28397
Tested-by: Jenkins <ci@libreoffice.org>
Reviewed-by: Noel Grandin <noelgrandin@gmail.com>
Diffstat (limited to 'sc')
| -rw-r--r-- | sc/source/ui/miscdlgs/acredlin.cxx | 8 | ||||
| -rw-r--r-- | sc/source/ui/miscdlgs/solveroptions.cxx | 4 | ||||
| -rw-r--r-- | sc/source/ui/xmlsource/xmlsourcedlg.cxx | 2 |
3 files changed, 7 insertions, 7 deletions
diff --git a/sc/source/ui/miscdlgs/acredlin.cxx b/sc/source/ui/miscdlgs/acredlin.cxx index b5f5b797d5ca..203314a06ba2 100644 --- a/sc/source/ui/miscdlgs/acredlin.cxx +++ b/sc/source/ui/miscdlgs/acredlin.cxx @@ -1879,11 +1879,11 @@ IMPL_LINK_TYPED( ScAcceptChgDlg, ColCompareHdl, const SvSortData*, pSortData, sa if(pLeftItem != nullptr && pRightItem != nullptr) { - sal_uInt16 nLeftKind = pLeftItem->GetType(); - sal_uInt16 nRightKind = pRightItem->GetType(); + SvLBoxItemType nLeftKind = pLeftItem->GetType(); + SvLBoxItemType nRightKind = pRightItem->GetType(); - if(nRightKind == SV_ITEM_ID_LBOXSTRING && - nLeftKind == SV_ITEM_ID_LBOXSTRING ) + if (nRightKind == SvLBoxItemType::String && + nLeftKind == SvLBoxItemType::String) { nCompare = ScGlobal::GetCaseCollator()->compareString( static_cast<SvLBoxString*>(pLeftItem)->GetText(), diff --git a/sc/source/ui/miscdlgs/solveroptions.cxx b/sc/source/ui/miscdlgs/solveroptions.cxx index bbe675ba623e..95c8239b4a32 100644 --- a/sc/source/ui/miscdlgs/solveroptions.cxx +++ b/sc/source/ui/miscdlgs/solveroptions.cxx @@ -381,8 +381,8 @@ IMPL_LINK_NOARG_TYPED(ScSolverOptionsDialog, SettingsSelHdl, SvTreeListBox*, voi SvTreeListEntry* pEntry = m_pLbSettings->GetCurEntry(); if (pEntry) { - SvLBoxItem* pItem = pEntry->GetFirstItem(SV_ITEM_ID_LBOXBUTTON); - if (pItem && pItem->GetType() == SV_ITEM_ID_LBOXBUTTON) + SvLBoxItem* pItem = pEntry->GetFirstItem(SvLBoxItemType::Button); + if (pItem && pItem->GetType() == SvLBoxItemType::Button) bCheckbox = true; } diff --git a/sc/source/ui/xmlsource/xmlsourcedlg.cxx b/sc/source/ui/xmlsource/xmlsourcedlg.cxx index 433e31a4831f..58b69b6141e9 100644 --- a/sc/source/ui/xmlsource/xmlsourcedlg.cxx +++ b/sc/source/ui/xmlsource/xmlsourcedlg.cxx @@ -47,7 +47,7 @@ OUString getXPath( OUStringBuffer aBuf; for (const SvTreeListEntry* p = &rEntry; p; p = rTree.GetParent(p)) { - const SvLBoxItem* pItem = p->GetFirstItem(SV_ITEM_ID_LBOXSTRING); + const SvLBoxItem* pItem = p->GetFirstItem(SvLBoxItemType::String); if (!pItem) continue; |