Avoid direct use of flag value.

Change-Id: I4279c352a990b2ffda482e9c69b63b18b3c13dc9

3 files changed, 15 insertions, 6 deletions

diff --git a/svtools/inc/svtools/viewdataentry.hxx b/svtools/inc/svtools/viewdataentry.hxx
index 7f49f639b1a9..8f1c21f91b50 100644
--- a/svtools/inc/svtools/viewdataentry.hxx
+++ b/svtools/inc/svtools/viewdataentry.hxx
@@ -65,6 +65,7 @@ public:
     void SetFocus( bool bFocus );
     void SetCursored( bool bCursored );
     void SetSelected( bool bSelected );
+    void SetExpanded( bool bExpanded );
     sal_uInt16 GetFlags() const;
     void SetSelectable( bool bSelectable );
 
diff --git a/svtools/source/contnr/treelist.cxx b/svtools/source/contnr/treelist.cxx
index 9d4b6f909d4e..70b410c093cc 100644
--- a/svtools/source/contnr/treelist.cxx
+++ b/svtools/source/contnr/treelist.cxx
@@ -940,7 +940,7 @@ void SvTreeList::Expand( SvListView* pView, SvTreeListEntry* pEntry )
     DBG_ASSERT(!pEntry->maChildren.empty(), "SvTreeList::Expand: We expected to have child entries.");
 
     SvViewDataEntry* pViewData = pView->GetViewData(pEntry);
-    pViewData->nFlags |= SVLISTENTRYFLAG_EXPANDED;
+    pViewData->SetExpanded(true);
     SvTreeListEntry* pParent = pEntry->pParent;
     // if parent is visible, invalidate status data
     if ( pView->IsExpanded( pParent ) )
@@ -959,7 +959,7 @@ void SvTreeList::Collapse( SvListView* pView, SvTreeListEntry* pEntry )
     DBG_ASSERT(!pEntry->maChildren.empty(), "SvTreeList::Collapse: We expected have child entries.");
 
     SvViewDataEntry* pViewData = pView->GetViewData( pEntry );
-    pViewData->nFlags &=(~SVLISTENTRYFLAG_EXPANDED);
+    pViewData->SetExpanded(false);
 
     SvTreeListEntry* pParent = pEntry->pParent;
     if ( pView->IsExpanded(pParent) )
@@ -1198,7 +1198,7 @@ void SvListView::InitTable()
     // insert root entry
     pEntry = pModel->pRootItem;
     pViewData = new SvViewDataEntry;
-    pViewData->nFlags = SVLISTENTRYFLAG_EXPANDED;
+    pViewData->SetExpanded(true);
     maDataTable.insert( pEntry, pViewData );
     // now all the other entries
     pEntry = pModel->First();
@@ -1229,7 +1229,7 @@ void SvListView::Clear()
         // insert root entry
         SvTreeListEntry* pEntry = pModel->pRootItem;
         SvViewDataEntry* pViewData = new SvViewDataEntry;
-        pViewData->nFlags = SVLISTENTRYFLAG_EXPANDED;
+        pViewData->SetExpanded(true);
         maDataTable.insert( pEntry, pViewData );
     }
 }
@@ -1304,7 +1304,7 @@ void SvListView::ActionMoving( SvTreeListEntry* pEntry,SvTreeListEntry*,sal_uLon
     if (pParent != pModel->pRootItem && pParent->maChildren.size() == 1)
     {
         SvViewDataEntry* pViewData = maDataTable.find( pParent )->second;
-        pViewData->nFlags &= (~SVLISTENTRYFLAG_EXPANDED);
+        pViewData->SetExpanded(false);
     }
     // vorlaeufig
     nVisibleCount = 0;
@@ -1408,7 +1408,7 @@ void SvListView::ActionRemoving( SvTreeListEntry* pEntry )
     if (pCurEntry && pCurEntry != pModel->pRootItem && pCurEntry->maChildren.size() == 1)
     {
         pViewData = maDataTable.find(pCurEntry)->second;
-        pViewData->nFlags &= (~SVLISTENTRYFLAG_EXPANDED);
+        pViewData->SetExpanded(false);
     }
 }
 
diff --git a/svtools/source/contnr/viewdataentry.cxx b/svtools/source/contnr/viewdataentry.cxx
index 9c3d2d3b7889..99aeaa40e33d 100644
--- a/svtools/source/contnr/viewdataentry.cxx
+++ b/svtools/source/contnr/viewdataentry.cxx
@@ -94,6 +94,14 @@ void SvViewDataEntry::SetSelected( bool bSelected )
         nFlags |= SVLISTENTRYFLAG_SELECTED;
 }
 
+void SvViewDataEntry::SetExpanded( bool bExpanded )
+{
+    if ( !bExpanded )
+        nFlags &= (~SVLISTENTRYFLAG_EXPANDED);
+    else
+        nFlags |= SVLISTENTRYFLAG_EXPANDED;
+}
+
 sal_uInt16 SvViewDataEntry::GetFlags() const
 {
     return nFlags;