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>

8 files changed, 14 insertions, 14 deletions

diff --git a/dbaccess/source/ui/app/AppDetailView.cxx b/dbaccess/source/ui/app/AppDetailView.cxx
index 879dcd545e88..0b2e9b9c9b6d 100644
--- a/dbaccess/source/ui/app/AppDetailView.cxx
+++ b/dbaccess/source/ui/app/AppDetailView.cxx
@@ -155,7 +155,7 @@ Rectangle OCreationList::GetFocusRect( SvTreeListEntry* _pEntry, long _nLine )
     aRect.Left() = 0;
 
     // try to let the focus rect start before the bitmap item - this looks better
-    SvLBoxItem* pBitmapItem = _pEntry->GetFirstItem( SV_ITEM_ID_LBOXCONTEXTBMP );
+    SvLBoxItem* pBitmapItem = _pEntry->GetFirstItem(SvLBoxItemType::ContextBmp);
     SvLBoxTab* pTab = pBitmapItem ? GetTab( _pEntry, pBitmapItem ) : nullptr;
     SvViewDataItem* pItemData = pBitmapItem ? GetViewDataItem( _pEntry, pBitmapItem ) : nullptr;
     OSL_ENSURE( pTab && pItemData, "OCreationList::GetFocusRect: could not find the first bitmap item!" );
diff --git a/dbaccess/source/ui/browser/dsEntriesNoExp.cxx b/dbaccess/source/ui/browser/dsEntriesNoExp.cxx
index 17ea461e8c0e..76629da8f0ad 100644
--- a/dbaccess/source/ui/browser/dsEntriesNoExp.cxx
+++ b/dbaccess/source/ui/browser/dsEntriesNoExp.cxx
@@ -232,7 +232,7 @@ void SbaTableQueryBrowser::notifyHiContrastChanged()
             for (sal_uInt16 i=0;i<nCount;++i)
             {
                 SvLBoxItem& rItem = pEntryLoop->GetItem(i);
-                if (rItem.GetType() != SV_ITEM_ID_LBOXCONTEXTBMP)
+                if (rItem.GetType() != SvLBoxItemType::ContextBmp)
                     continue;
 
                 SvLBoxContextBmp& rContextBitmapItem = static_cast< SvLBoxContextBmp& >( rItem );
diff --git a/dbaccess/source/ui/browser/unodatbr.cxx b/dbaccess/source/ui/browser/unodatbr.cxx
index a0d9ac0f12bc..6069119ee8f8 100644
--- a/dbaccess/source/ui/browser/unodatbr.cxx
+++ b/dbaccess/source/ui/browser/unodatbr.cxx
@@ -3382,8 +3382,8 @@ IMPL_LINK_TYPED( SbaTableQueryBrowser, OnTreeEntryCompare, const SvSortData&, _r
         return 0;
     }
 
-    const SvLBoxString* pLeftTextItem = static_cast<const SvLBoxString*>(pLHS->GetFirstItem(SV_ITEM_ID_LBOXSTRING));
-    const SvLBoxString* pRightTextItem = static_cast<const SvLBoxString*>(pRHS->GetFirstItem(SV_ITEM_ID_LBOXSTRING));
+    const SvLBoxString* pLeftTextItem = static_cast<const SvLBoxString*>(pLHS->GetFirstItem(SvLBoxItemType::String));
+    const SvLBoxString* pRightTextItem = static_cast<const SvLBoxString*>(pRHS->GetFirstItem(SvLBoxItemType::String));
     OSL_ENSURE(pLeftTextItem && pRightTextItem, "SbaTableQueryBrowser::OnTreeEntryCompare: invalid text items!");
 
     OUString sLeftText = pLeftTextItem->GetText();
diff --git a/dbaccess/source/ui/control/dbtreelistbox.cxx b/dbaccess/source/ui/control/dbtreelistbox.cxx
index e75a7449f211..e196a06de816 100644
--- a/dbaccess/source/ui/control/dbtreelistbox.cxx
+++ b/dbaccess/source/ui/control/dbtreelistbox.cxx
@@ -104,7 +104,7 @@ SvTreeListEntry* DBTreeListBox::GetEntryPosByName( const OUString& aName, SvTree
     {
         pEntry = (*it).get();
         const SvLBoxString* pItem = static_cast<const SvLBoxString*>(
-            pEntry->GetFirstItem(SV_ITEM_ID_LBOXSTRING));
+            pEntry->GetFirstItem(SvLBoxItemType::String));
 
         if (pItem && pItem->GetText().equals(aName))
         {
@@ -137,7 +137,7 @@ void DBTreeListBox::RequestingChildren( SvTreeListEntry* pParent )
 void DBTreeListBox::InitEntry(SvTreeListEntry* _pEntry, const OUString& aStr, const Image& _rCollEntryBmp, const Image& _rExpEntryBmp, SvLBoxButtonKind eButtonKind)
 {
     SvTreeListBox::InitEntry( _pEntry, aStr, _rCollEntryBmp,_rExpEntryBmp, eButtonKind);
-    SvLBoxItem* pTextItem(_pEntry->GetFirstItem(SV_ITEM_ID_LBOXSTRING));
+    SvLBoxItem* pTextItem(_pEntry->GetFirstItem(SvLBoxItemType::String));
     _pEntry->ReplaceItem(o3tl::make_unique<OBoldListboxString>(aStr), _pEntry->GetPos(pTextItem));
 }
 
diff --git a/dbaccess/source/ui/control/listviewitems.cxx b/dbaccess/source/ui/control/listviewitems.cxx
index d1d6deedf4db..15c978e2e68b 100644
--- a/dbaccess/source/ui/control/listviewitems.cxx
+++ b/dbaccess/source/ui/control/listviewitems.cxx
@@ -39,9 +39,9 @@ namespace dbaui
         pView->Pop();
     }
 
-    sal_uInt16 OBoldListboxString::GetType() const
+    SvLBoxItemType OBoldListboxString::GetType() const
     {
-        return SV_ITEM_ID_BOLDLBSTRING;
+        return SvLBoxItemType::String;
     }
 
     void OBoldListboxString::Paint(const Point& rPos, SvTreeListBox& rDev, vcl::RenderContext& rRenderContext,
diff --git a/dbaccess/source/ui/control/tabletree.cxx b/dbaccess/source/ui/control/tabletree.cxx
index ac69822cac49..2dbe195c3591 100644
--- a/dbaccess/source/ui/control/tabletree.cxx
+++ b/dbaccess/source/ui/control/tabletree.cxx
@@ -113,7 +113,7 @@ void OTableTreeListBox::notifyHiContrastChanged()
         for (size_t i=0;i<nCount;++i)
         {
             SvLBoxItem& rItem = pEntryLoop->GetItem(i);
-            if (rItem.GetType() == SV_ITEM_ID_LBOXCONTEXTBMP)
+            if (rItem.GetType() == SvLBoxItemType::ContextBmp)
             {
                 SvLBoxContextBmp& rContextBitmapItem = static_cast< SvLBoxContextBmp& >( rItem );
 
@@ -404,7 +404,7 @@ void OTableTreeListBox::InitEntry(SvTreeListEntry* _pEntry, const OUString& _rSt
     OMarkableTreeListBox::InitEntry(_pEntry, _rString, _rCollapsedBitmap, _rExpandedBitmap, _eButtonKind);
 
     // replace the text item with our own one
-    SvLBoxItem* pTextItem = _pEntry->GetFirstItem(SV_ITEM_ID_LBOXSTRING);
+    SvLBoxItem* pTextItem = _pEntry->GetFirstItem(SvLBoxItemType::String);
     OSL_ENSURE(pTextItem, "OTableTreeListBox::InitEntry: no text item!?");
     size_t nTextPos = _pEntry->GetPos(pTextItem);
     OSL_ENSURE(SvTreeListEntry::ITEM_NOT_FOUND != nTextPos, "OTableTreeListBox::InitEntry: no text item pos!");
diff --git a/dbaccess/source/ui/dlg/tablespage.cxx b/dbaccess/source/ui/dlg/tablespage.cxx
index 53062db32fa9..7cacd382dc2c 100644
--- a/dbaccess/source/ui/dlg/tablespage.cxx
+++ b/dbaccess/source/ui/dlg/tablespage.cxx
@@ -411,8 +411,8 @@ namespace dbaui
         const SvTreeListEntry* pRHS = static_cast<const SvTreeListEntry*>(_rSortData.pRight);
         OSL_ENSURE(pLHS && pRHS, "SbaTableQueryBrowser::OnTreeEntryCompare: invalid tree entries!");
 
-        const SvLBoxString* pLeftTextItem = static_cast<const SvLBoxString*>(pLHS->GetFirstItem(SV_ITEM_ID_LBOXSTRING));
-        const SvLBoxString* pRightTextItem = static_cast<const SvLBoxString*>(pRHS->GetFirstItem(SV_ITEM_ID_LBOXSTRING));
+        const SvLBoxString* pLeftTextItem = static_cast<const SvLBoxString*>(pLHS->GetFirstItem(SvLBoxItemType::String));
+        const SvLBoxString* pRightTextItem = static_cast<const SvLBoxString*>(pRHS->GetFirstItem(SvLBoxItemType::String));
         OSL_ENSURE(pLeftTextItem && pRightTextItem, "SbaTableQueryBrowser::OnTreeEntryCompare: invalid text items!");
 
         OUString sLeftText = pLeftTextItem->GetText();
diff --git a/dbaccess/source/ui/inc/listviewitems.hxx b/dbaccess/source/ui/inc/listviewitems.hxx
index 134d0f641d28..15cc9c609eb2 100644
--- a/dbaccess/source/ui/inc/listviewitems.hxx
+++ b/dbaccess/source/ui/inc/listviewitems.hxx
@@ -25,7 +25,7 @@
 namespace dbaui
 {
 
-    #define SV_ITEM_ID_BOLDLBSTRING SV_ITEM_ID_LBOXSTRING
+    #define SV_ITEM_ID_BOLDLBSTRING SvLBoxItemType::String
 
     // OBoldListboxString
     class OBoldListboxString : public SvLBoxString
@@ -39,7 +39,7 @@ namespace dbaui
         {
         }
 
-        virtual sal_uInt16 GetType() const override;
+        virtual SvLBoxItemType GetType() const override;
 
         virtual void Paint(const Point& rPos, SvTreeListBox& rOutDev, vcl::RenderContext& rRenderContext,
                            const SvViewDataEntry* pView, const SvTreeListEntry& rEntry) override;