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 /svtools/source/contnr/svimpbox.cxx | |
| 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 'svtools/source/contnr/svimpbox.cxx')
| -rw-r--r-- | svtools/source/contnr/svimpbox.cxx | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/svtools/source/contnr/svimpbox.cxx b/svtools/source/contnr/svimpbox.cxx index ccf9e6609e3e..fcaf870d0fc8 100644 --- a/svtools/source/contnr/svimpbox.cxx +++ b/svtools/source/contnr/svimpbox.cxx @@ -186,7 +186,7 @@ void SvImpLBox::UpdateContextBmpWidthVectorFromMovedEntry( SvTreeListEntry* pEnt { DBG_ASSERT( pEntry, "Moved Entry is invalid!" ); - SvLBoxContextBmp* pBmpItem = static_cast< SvLBoxContextBmp* >( pEntry->GetFirstItem( SV_ITEM_ID_LBOXCONTEXTBMP ) ); + SvLBoxContextBmp* pBmpItem = static_cast< SvLBoxContextBmp* >( pEntry->GetFirstItem(SvLBoxItemType::ContextBmp) ); short nExpWidth = (short)pBmpItem->GetBitmap1().GetSizePixel().Width(); short nColWidth = (short)pBmpItem->GetBitmap2().GetSizePixel().Width(); short nMax = std::max(nExpWidth, nColWidth); @@ -788,7 +788,7 @@ bool SvImpLBox::EntryReallyHit(SvTreeListEntry* pEntry, const Point& rPosPixel, Rectangle aRect( pView->GetFocusRect( pEntry, nLine )); aRect.Right() = GetOutputSize().Width() - pView->GetMapMode().GetOrigin().X(); - SvLBoxContextBmp* pBmp = static_cast<SvLBoxContextBmp*>(pEntry->GetFirstItem(SV_ITEM_ID_LBOXCONTEXTBMP)); + SvLBoxContextBmp* pBmp = static_cast<SvLBoxContextBmp*>(pEntry->GetFirstItem(SvLBoxItemType::ContextBmp)); aRect.Left() -= pBmp->GetSize(pView,pEntry).Width(); aRect.Left() -= 4; // a little tolerance @@ -1869,7 +1869,7 @@ void SvImpLBox::EntryInserted( SvTreeListEntry* pEntry ) bool SvImpLBox::ButtonDownCheckCtrl(const MouseEvent& rMEvt, SvTreeListEntry* pEntry, long /*nY*/) { SvLBoxItem* pItem = pView->GetItem(pEntry,rMEvt.GetPosPixel().X(),&pActiveTab); - if (pItem && pItem->GetType() == SV_ITEM_ID_LBOXBUTTON) + if (pItem && pItem->GetType() == SvLBoxItemType::Button) { pActiveButton = static_cast<SvLBoxButton*>(pItem); pActiveEntry = pEntry; @@ -3140,7 +3140,7 @@ bool SvImpLBox::RequestHelp( const HelpEvent& rHEvt ) // recalculate text rectangle SvLBoxTab* pTab; SvLBoxItem* pItem = pView->GetItem( pEntry, aPos.X(), &pTab ); - if (!pItem || pItem->GetType() != SV_ITEM_ID_LBOXSTRING) + if (!pItem || pItem->GetType() != SvLBoxItemType::String) return false; aPos = GetEntryPosition( pEntry ); |