From dd7778a76915685d9b334e1f0718f556f6309687 Mon Sep 17 00:00:00 2001 From: Noel Grandin Date: Tue, 21 Apr 2015 16:18:23 +0200 Subject: convert SV_ENTRYFLAG constants to scoped enum Change-Id: I457b32ed5ee5d74e6f8361e7de79cbd406122651 --- svtools/source/contnr/svimpbox.cxx | 2 +- svtools/source/contnr/svlbitm.cxx | 2 +- svtools/source/contnr/treelistbox.cxx | 28 ++++++++++++++-------------- svtools/source/contnr/treelistentry.cxx | 12 ++++++------ 4 files changed, 22 insertions(+), 22 deletions(-) (limited to 'svtools') diff --git a/svtools/source/contnr/svimpbox.cxx b/svtools/source/contnr/svimpbox.cxx index 19789560e797..f1aa6facf8a6 100644 --- a/svtools/source/contnr/svimpbox.cxx +++ b/svtools/source/contnr/svimpbox.cxx @@ -1673,7 +1673,7 @@ void SvImpLBox::RemovingEntry( SvTreeListEntry* pEntry ) if (pParent && pView->GetModel()->GetChildList(pParent).size() == 1) { DBG_ASSERT( pView->IsExpanded( pParent ), "Parent not expanded"); - pParent->SetFlags( pParent->GetFlags() | SV_ENTRYFLAG_NO_NODEBMP); + pParent->SetFlags( pParent->GetFlags() | SvTLEntryFlags::NO_NODEBMP); InvalidateEntry( pParent ); } diff --git a/svtools/source/contnr/svlbitm.cxx b/svtools/source/contnr/svlbitm.cxx index 5da446e15e1e..9aa97f00ed79 100644 --- a/svtools/source/contnr/svlbitm.cxx +++ b/svtools/source/contnr/svlbitm.cxx @@ -515,7 +515,7 @@ void SvLBoxContextBmp::Paint( // get the image. const Image& rImage = implGetImageStore(pView->IsExpanded() != m_pImpl->m_bExpanded); - bool _bSemiTransparent = pEntry && ( 0 != ( SV_ENTRYFLAG_SEMITRANSPARENT & pEntry->GetFlags( ) ) ); + bool _bSemiTransparent = pEntry && bool( SvTLEntryFlags::SEMITRANSPARENT & pEntry->GetFlags( ) ); // draw sal_uInt16 nStyle = _rDev.IsEnabled() ? 0 : IMAGE_DRAW_DISABLE; if ( _bSemiTransparent ) diff --git a/svtools/source/contnr/treelistbox.cxx b/svtools/source/contnr/treelistbox.cxx index 8a8b8799f153..3f7ab3f7fa00 100644 --- a/svtools/source/contnr/treelistbox.cxx +++ b/svtools/source/contnr/treelistbox.cxx @@ -971,28 +971,28 @@ void SvTreeListBox::EnableSelectionAsDropTarget( bool bEnable, bool bWithChildre { if ( !bEnable ) { - pSelEntry->nEntryFlags |= SV_ENTRYFLAG_DISABLE_DROP; + pSelEntry->nEntryFlags |= SvTLEntryFlags::DISABLE_DROP; if ( bWithChildren ) { nRefDepth = pModel->GetDepth( pSelEntry ); pTemp = Next( pSelEntry ); while( pTemp && pModel->GetDepth( pTemp ) > nRefDepth ) { - pTemp->nEntryFlags |= SV_ENTRYFLAG_DISABLE_DROP; + pTemp->nEntryFlags |= SvTLEntryFlags::DISABLE_DROP; pTemp = Next( pTemp ); } } } else { - pSelEntry->nEntryFlags &= (~SV_ENTRYFLAG_DISABLE_DROP); + pSelEntry->nEntryFlags &= (~SvTLEntryFlags::DISABLE_DROP); if ( bWithChildren ) { nRefDepth = pModel->GetDepth( pSelEntry ); pTemp = Next( pSelEntry ); while( pTemp && pModel->GetDepth( pTemp ) > nRefDepth ) { - pTemp->nEntryFlags &= (~SV_ENTRYFLAG_DISABLE_DROP); + pTemp->nEntryFlags &= (~SvTLEntryFlags::DISABLE_DROP); pTemp = Next( pTemp ); } } @@ -1213,7 +1213,7 @@ sal_Int8 SvTreeListBox::AcceptDrop( const AcceptDropEvent& rEvt ) DBG_ASSERT( pDDSource, "SvTreeListBox::QueryDrop(): SourceBox == 0" ); if( !( pEntry && pDDSource->GetModel() == this->GetModel() && DND_ACTION_MOVE == rEvt.mnAction - && ( pEntry->nEntryFlags & SV_ENTRYFLAG_DISABLE_DROP ) )) + && ( pEntry->nEntryFlags & SvTLEntryFlags::DISABLE_DROP ) )) { if( NotifyAcceptDrop( pEntry )) nRet = rEvt.mnAction; @@ -1918,8 +1918,8 @@ void SvTreeListBox::ImpEntryInserted( SvTreeListEntry* pEntry ) SvTreeListEntry* pParent = (SvTreeListEntry*)pModel->GetParent( pEntry ); if( pParent ) { - sal_uInt16 nFlags = pParent->GetFlags(); - nFlags &= ~SV_ENTRYFLAG_NO_NODEBMP; + SvTLEntryFlags nFlags = pParent->GetFlags(); + nFlags &= ~SvTLEntryFlags::NO_NODEBMP; pParent->SetFlags( nFlags ); } @@ -2359,7 +2359,7 @@ bool SvTreeListBox::Expand( SvTreeListEntry* pParent ) { pHdlEntry = pParent; bool bExpanded = false; - sal_uInt16 nFlags; + SvTLEntryFlags nFlags; if( pParent->HasChildrenOnDemand() ) RequestingChildren( pParent ); @@ -2375,14 +2375,14 @@ bool SvTreeListBox::Expand( SvTreeListEntry* pParent ) ExpandedHdl(); } nFlags = pParent->GetFlags(); - nFlags &= ~SV_ENTRYFLAG_NO_NODEBMP; - nFlags |= SV_ENTRYFLAG_HAD_CHILDREN; + nFlags &= ~SvTLEntryFlags::NO_NODEBMP; + nFlags |= SvTLEntryFlags::HAD_CHILDREN; pParent->SetFlags( nFlags ); } else { nFlags = pParent->GetFlags(); - nFlags |= SV_ENTRYFLAG_NO_NODEBMP; + nFlags |= SvTLEntryFlags::NO_NODEBMP; pParent->SetFlags( nFlags ); GetModel()->InvalidateEntry( pParent ); // repaint } @@ -3089,7 +3089,7 @@ long SvTreeListBox::PaintEntry1(SvTreeListEntry* pEntry, long nLine, SvLBoxTabFl nDynTabPos += 4; // 4 pixels of buffer, so the node bitmap is not too close // to the next tab - if( (!(pEntry->GetFlags() & SV_ENTRYFLAG_NO_NODEBMP)) && + if( (!(pEntry->GetFlags() & SvTLEntryFlags::NO_NODEBMP)) && (nWindowStyle & WB_HASBUTTONS) && pFirstDynamicTab && ( pEntry->HasChildren() || pEntry->HasChildrenOnDemand() ) ) { @@ -3116,7 +3116,7 @@ long SvTreeListBox::PaintEntry1(SvTreeListEntry* pEntry, long nLine, SvLBoxTabFl else { if( (!pEntry->HasChildren()) && pEntry->HasChildrenOnDemand() && - (!(pEntry->GetFlags() & SV_ENTRYFLAG_HAD_CHILDREN)) && + (!(pEntry->GetFlags() & SvTLEntryFlags::HAD_CHILDREN)) && pImp->GetDontKnowNodeBmp().GetSizePixel().Width() ) pImg = &pImp->GetDontKnowNodeBmp( ); else @@ -3144,7 +3144,7 @@ long SvTreeListBox::PaintEntry1(SvTreeListEntry* pEntry, long nLine, SvLBoxTabFl { if( (!pEntry->HasChildren() ) && pEntry->HasChildrenOnDemand() && - (!(pEntry->GetFlags() & SV_ENTRYFLAG_HAD_CHILDREN)) && + (!(pEntry->GetFlags() & SvTLEntryFlags::HAD_CHILDREN)) && pImp->GetDontKnowNodeBmp().GetSizePixel().Width() ) aControlValue.setTristateVal( BUTTONVALUE_DONTKNOW ); //dont know diff --git a/svtools/source/contnr/treelistentry.cxx b/svtools/source/contnr/treelistentry.cxx index c56d4d95d2de..3b33cf788068 100644 --- a/svtools/source/contnr/treelistentry.cxx +++ b/svtools/source/contnr/treelistentry.cxx @@ -56,7 +56,7 @@ SvTreeListEntry::SvTreeListEntry() , nListPos(0) , bIsMarked(false) , pUserData(NULL) - , nEntryFlags(0) + , nEntryFlags(SvTLEntryFlags::NONE) , maBackColor(Application::GetSettings().GetStyleSettings().GetWindowColor()) { } @@ -139,9 +139,9 @@ void SvTreeListEntry::AddItem( SvLBoxItem* pItem ) void SvTreeListEntry::EnableChildrenOnDemand( bool bEnable ) { if ( bEnable ) - nEntryFlags |= SV_ENTRYFLAG_CHILDREN_ON_DEMAND; + nEntryFlags |= SvTLEntryFlags::CHILDREN_ON_DEMAND; else - nEntryFlags &= (~SV_ENTRYFLAG_CHILDREN_ON_DEMAND); + nEntryFlags &= (~SvTLEntryFlags::CHILDREN_ON_DEMAND); } void SvTreeListEntry::ReplaceItem( SvLBoxItem* pNewItem, size_t nPos ) @@ -220,16 +220,16 @@ void SvTreeListEntry::SetUserData( void* pPtr ) bool SvTreeListEntry::HasChildrenOnDemand() const { - return (bool)((nEntryFlags & SV_ENTRYFLAG_CHILDREN_ON_DEMAND)!=0); + return (bool)(nEntryFlags & SvTLEntryFlags::CHILDREN_ON_DEMAND); } bool SvTreeListEntry::HasInUseEmphasis() const { - return (bool)((nEntryFlags & SV_ENTRYFLAG_IN_USE)!=0); + return (bool)(nEntryFlags & SvTLEntryFlags::IN_USE); } -void SvTreeListEntry::SetFlags( sal_uInt16 nFlags ) +void SvTreeListEntry::SetFlags( SvTLEntryFlags nFlags ) { nEntryFlags = nFlags; } -- cgit