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/svtabbx.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/svtabbx.cxx')
| -rw-r--r-- | svtools/source/contnr/svtabbx.cxx | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/svtools/source/contnr/svtabbx.cxx b/svtools/source/contnr/svtabbx.cxx index c334f5addfa3..9b585688a856 100644 --- a/svtools/source/contnr/svtabbx.cxx +++ b/svtools/source/contnr/svtabbx.cxx @@ -263,7 +263,7 @@ OUString SvTabListBox::GetEntryText( SvTreeListEntry* pEntry, sal_uInt16 nCol ) while( nCur < nCount ) { const SvLBoxItem& rStr = pEntry->GetItem( nCur ); - if (rStr.GetType() == SV_ITEM_ID_LBOXSTRING) + if (rStr.GetType() == SvLBoxItemType::String) { if( nCol == 0xffff ) { @@ -312,7 +312,7 @@ void SvTabListBox::SetEntryText(const OUString& rStr, SvTreeListEntry* pEntry, s for (sal_uInt16 nCur = 0; nCur < nCount; ++nCur) { SvLBoxItem& rBoxItem = pEntry->GetItem( nCur ); - if (rBoxItem.GetType() == SV_ITEM_ID_LBOXSTRING) + if (rBoxItem.GetType() == SvLBoxItemType::String) { if (!nCol || nCol==0xFFFF) { @@ -342,7 +342,7 @@ OUString SvTabListBox::GetCellText( sal_uLong nPos, sal_uInt16 nCol ) const if (pEntry && pEntry->ItemCount() > static_cast<size_t>(nCol+1)) { const SvLBoxItem& rStr = pEntry->GetItem( nCol + 1 ); - if (rStr.GetType() == SV_ITEM_ID_LBOXSTRING) + if (rStr.GetType() == SvLBoxItemType::String) aResult = static_cast<const SvLBoxString&>(rStr).GetText(); } return aResult; @@ -395,7 +395,7 @@ OUString SvTabListBox::GetTabEntryText( sal_uLong nPos, sal_uInt16 nCol ) const while( nCur < nCount ) { const SvLBoxItem& rBoxItem = pEntry->GetItem( nCur ); - if (rBoxItem.GetType() == SV_ITEM_ID_LBOXSTRING) + if (rBoxItem.GetType() == SvLBoxItemType::String) { if ( nCol == 0xffff ) { @@ -541,7 +541,7 @@ bool SvHeaderTabListBox::IsItemChecked( SvTreeListEntry* pEntry, sal_uInt16 nCol SvButtonState eState = SvButtonState::Unchecked; SvLBoxButton& rItem = static_cast<SvLBoxButton&>( pEntry->GetItem( nCol + 1 ) ); - if (rItem.GetType() == SV_ITEM_ID_LBOXBUTTON) + if (rItem.GetType() == SvLBoxItemType::Button) { SvItemStateFlags nButtonFlags = rItem.GetButtonFlags(); eState = SvLBoxButtonData::ConvertToButtonState( nButtonFlags ); @@ -648,7 +648,7 @@ bool SvHeaderTabListBox::IsCellCheckBox( long _nRow, sal_uInt16 _nColumn, TriSta if ( nItemCount > ( _nColumn + 1 ) ) { SvLBoxItem& rItem = pEntry->GetItem( _nColumn + 1 ); - if (rItem.GetType() == SV_ITEM_ID_LBOXBUTTON) + if (rItem.GetType() == SvLBoxItemType::Button) { bRet = true; _rState = ( ( static_cast<SvLBoxButton&>(rItem).GetButtonFlags() & SvItemStateFlags::UNCHECKED ) == SvItemStateFlags::NONE ) |