convert VALID_ constants to enum class

Change-Id: Id63d0e0dcf550b4d4f9cf3a2800aeb40f9f9bbce

12 files changed, 88 insertions, 88 deletions

diff --git a/sc/source/core/data/attarray.cxx b/sc/source/core/data/attarray.cxx
index 1e360ab49fcd..57468d81b3a3 100644
--- a/sc/source/core/data/attarray.cxx
+++ b/sc/source/core/data/attarray.cxx
@@ -1111,34 +1111,34 @@ bool ScAttrArray::ApplyFrame( const SvxBoxItem*     pBoxItem,
     {
         if( bLeft && nDistRight==0)
         {
-            if ( pBoxInfoItem->IsValid(VALID_LEFT) )
+            if ( pBoxInfoItem->IsValid(SvxBoxInfoItemValidFlags::LEFT) )
                 aNewFrame.SetLine( pBoxItem->GetLeft(), BOX_LINE_RIGHT );
-            if ( pBoxInfoItem->IsValid(VALID_RIGHT) )
+            if ( pBoxInfoItem->IsValid(SvxBoxInfoItemValidFlags::RIGHT) )
                 aNewFrame.SetLine( pBoxItem->GetRight(), BOX_LINE_LEFT );
         }
         else
         {
-            if ( (nDistRight==0) ? pBoxInfoItem->IsValid(VALID_LEFT) : pBoxInfoItem->IsValid(VALID_VERT) )
+            if ( (nDistRight==0) ? pBoxInfoItem->IsValid(SvxBoxInfoItemValidFlags::LEFT) : pBoxInfoItem->IsValid(SvxBoxInfoItemValidFlags::VERT) )
                 aNewFrame.SetLine( (nDistRight==0) ? pBoxItem->GetLeft() : pBoxInfoItem->GetVert(),
                     BOX_LINE_RIGHT );
-            if ( bLeft ? pBoxInfoItem->IsValid(VALID_RIGHT) : pBoxInfoItem->IsValid(VALID_VERT) )
+            if ( bLeft ? pBoxInfoItem->IsValid(SvxBoxInfoItemValidFlags::RIGHT) : pBoxInfoItem->IsValid(SvxBoxInfoItemValidFlags::VERT) )
                 aNewFrame.SetLine( bLeft ? pBoxItem->GetRight() : pBoxInfoItem->GetVert(),
                     BOX_LINE_LEFT );
         }
     }
     else
     {
-        if ( bLeft ? pBoxInfoItem->IsValid(VALID_LEFT) : pBoxInfoItem->IsValid(VALID_VERT) )
+        if ( bLeft ? pBoxInfoItem->IsValid(SvxBoxInfoItemValidFlags::LEFT) : pBoxInfoItem->IsValid(SvxBoxInfoItemValidFlags::VERT) )
             aNewFrame.SetLine( bLeft ? pBoxItem->GetLeft() : pBoxInfoItem->GetVert(),
                 BOX_LINE_LEFT );
-        if ( (nDistRight==0) ? pBoxInfoItem->IsValid(VALID_RIGHT) : pBoxInfoItem->IsValid(VALID_VERT) )
+        if ( (nDistRight==0) ? pBoxInfoItem->IsValid(SvxBoxInfoItemValidFlags::RIGHT) : pBoxInfoItem->IsValid(SvxBoxInfoItemValidFlags::VERT) )
             aNewFrame.SetLine( (nDistRight==0) ? pBoxItem->GetRight() : pBoxInfoItem->GetVert(),
                 BOX_LINE_RIGHT );
     }
-    if ( bTop ? pBoxInfoItem->IsValid(VALID_TOP) : pBoxInfoItem->IsValid(VALID_HORI) )
+    if ( bTop ? pBoxInfoItem->IsValid(SvxBoxInfoItemValidFlags::TOP) : pBoxInfoItem->IsValid(SvxBoxInfoItemValidFlags::HORI) )
         aNewFrame.SetLine( bTop ? pBoxItem->GetTop() : pBoxInfoItem->GetHori(),
             BOX_LINE_TOP );
-    if ( (nDistBottom==0) ? pBoxInfoItem->IsValid(VALID_BOTTOM) : pBoxInfoItem->IsValid(VALID_HORI) )
+    if ( (nDistBottom==0) ? pBoxInfoItem->IsValid(SvxBoxInfoItemValidFlags::BOTTOM) : pBoxInfoItem->IsValid(SvxBoxInfoItemValidFlags::HORI) )
         aNewFrame.SetLine( (nDistBottom==0) ? pBoxItem->GetBottom() : pBoxInfoItem->GetHori(),
             BOX_LINE_BOTTOM );
 
diff --git a/sc/source/core/data/document.cxx b/sc/source/core/data/document.cxx
index e964f2a625af..506cb2dd7d9e 100644
--- a/sc/source/core/data/document.cxx
+++ b/sc/source/core/data/document.cxx
@@ -4913,12 +4913,12 @@ void ScDocument::GetSelectionFrame( const ScMarkData& rMark,
 
         // Evaluate don't care Status
 
-    rLineInner.SetValid( VALID_LEFT,   ( aFlags.nLeft != SC_LINE_DONTCARE ) );
-    rLineInner.SetValid( VALID_RIGHT,  ( aFlags.nRight != SC_LINE_DONTCARE ) );
-    rLineInner.SetValid( VALID_TOP,    ( aFlags.nTop != SC_LINE_DONTCARE ) );
-    rLineInner.SetValid( VALID_BOTTOM, ( aFlags.nBottom != SC_LINE_DONTCARE ) );
-    rLineInner.SetValid( VALID_HORI,   ( aFlags.nHori != SC_LINE_DONTCARE ) );
-    rLineInner.SetValid( VALID_VERT,   ( aFlags.nVert != SC_LINE_DONTCARE ) );
+    rLineInner.SetValid( SvxBoxInfoItemValidFlags::LEFT,   ( aFlags.nLeft != SC_LINE_DONTCARE ) );
+    rLineInner.SetValid( SvxBoxInfoItemValidFlags::RIGHT,  ( aFlags.nRight != SC_LINE_DONTCARE ) );
+    rLineInner.SetValid( SvxBoxInfoItemValidFlags::TOP,    ( aFlags.nTop != SC_LINE_DONTCARE ) );
+    rLineInner.SetValid( SvxBoxInfoItemValidFlags::BOTTOM, ( aFlags.nBottom != SC_LINE_DONTCARE ) );
+    rLineInner.SetValid( SvxBoxInfoItemValidFlags::HORI,   ( aFlags.nHori != SC_LINE_DONTCARE ) );
+    rLineInner.SetValid( SvxBoxInfoItemValidFlags::VERT,   ( aFlags.nVert != SC_LINE_DONTCARE ) );
 }
 
 bool ScDocument::HasAttrib( SCCOL nCol1, SCROW nRow1, SCTAB nTab1,
diff --git a/sc/source/core/data/dpoutput.cxx b/sc/source/core/data/dpoutput.cxx
index 0231b68edc6c..d0340cbe1aba 100644
--- a/sc/source/core/data/dpoutput.cxx
+++ b/sc/source/core/data/dpoutput.cxx
@@ -260,16 +260,16 @@ void ScDPOutputImpl::OutputBlockFrame ( SCCOL nStartCol, SCROW nStartRow, SCCOL
         aBox.SetLine(&aLine,  BOX_LINE_BOTTOM);
 
     SvxBoxInfoItem aBoxInfo( ATTR_BORDER_INNER );
-    aBoxInfo.SetValid(VALID_VERT,false );
+    aBoxInfo.SetValid(SvxBoxInfoItemValidFlags::VERT,false );
     if ( bHori )
     {
-        aBoxInfo.SetValid(VALID_HORI,true);
+        aBoxInfo.SetValid(SvxBoxInfoItemValidFlags::HORI,true);
         aBoxInfo.SetLine( &aLine, BOXINFO_LINE_HORI );
     }
     else
-        aBoxInfo.SetValid(VALID_HORI,false );
+        aBoxInfo.SetValid(SvxBoxInfoItemValidFlags::HORI,false );
 
-    aBoxInfo.SetValid(VALID_DISTANCE,false);
+    aBoxInfo.SetValid(SvxBoxInfoItemValidFlags::DISTANCE,false);
 
     mpDoc->ApplyFrameAreaTab( ScRange(  nStartCol, nStartRow, mnTab, nEndCol, nEndRow , mnTab ), &aBox, &aBoxInfo );
 
@@ -316,9 +316,9 @@ void lcl_SetFrame( ScDocument* pDoc, SCTAB nTab,
     aBox.SetLine(&aLine, BOX_LINE_RIGHT);
     aBox.SetLine(&aLine, BOX_LINE_BOTTOM);
     SvxBoxInfoItem aBoxInfo( ATTR_BORDER_INNER );
-    aBoxInfo.SetValid(VALID_HORI,false);
-    aBoxInfo.SetValid(VALID_VERT,false);
-    aBoxInfo.SetValid(VALID_DISTANCE,false);
+    aBoxInfo.SetValid(SvxBoxInfoItemValidFlags::HORI,false);
+    aBoxInfo.SetValid(SvxBoxInfoItemValidFlags::VERT,false);
+    aBoxInfo.SetValid(SvxBoxInfoItemValidFlags::DISTANCE,false);
 
     pDoc->ApplyFrameAreaTab( ScRange( nCol1, nRow1, nTab, nCol2, nRow2, nTab ), &aBox, &aBoxInfo );
 }
diff --git a/sc/source/core/data/stlpool.cxx b/sc/source/core/data/stlpool.cxx
index fce5fa115e86..3a02702cb52b 100644
--- a/sc/source/core/data/stlpool.cxx
+++ b/sc/source/core/data/stlpool.cxx
@@ -373,11 +373,11 @@ void ScStyleSheetPool::CreateStandardStyles()
     aBoxItem.SetLine( &aBorderLine, BOX_LINE_LEFT );
     aBoxItem.SetLine( &aBorderLine, BOX_LINE_RIGHT );
     aBoxItem.SetDistance( 10 ); // 0.2mm
-    aBoxInfoItem.SetValid( VALID_TOP, true );
-    aBoxInfoItem.SetValid( VALID_BOTTOM, true );
-    aBoxInfoItem.SetValid( VALID_LEFT, true );
-    aBoxInfoItem.SetValid( VALID_RIGHT, true );
-    aBoxInfoItem.SetValid( VALID_DISTANCE, true );
+    aBoxInfoItem.SetValid( SvxBoxInfoItemValidFlags::TOP, true );
+    aBoxInfoItem.SetValid( SvxBoxInfoItemValidFlags::BOTTOM, true );
+    aBoxInfoItem.SetValid( SvxBoxInfoItemValidFlags::LEFT, true );
+    aBoxInfoItem.SetValid( SvxBoxInfoItemValidFlags::RIGHT, true );
+    aBoxInfoItem.SetValid( SvxBoxInfoItemValidFlags::DISTANCE, true );
     aBoxInfoItem.SetTable( false );
     aBoxInfoItem.SetDist ( true );
 
diff --git a/sc/source/core/data/stlsheet.cxx b/sc/source/core/data/stlsheet.cxx
index 4ca80708d9ff..5d278ff1b8f4 100644
--- a/sc/source/core/data/stlsheet.cxx
+++ b/sc/source/core/data/stlsheet.cxx
@@ -179,7 +179,7 @@ SfxItemSet& ScStyleSheet::GetItemSet()
 
                         aBoxInfoItem.SetTable( false );
                         aBoxInfoItem.SetDist( true );
-                        aBoxInfoItem.SetValid( VALID_DISTANCE, true );
+                        aBoxInfoItem.SetValid( SvxBoxInfoItemValidFlags::DISTANCE, true );
 
                         aPageItem.SetLandscape( false );
 
diff --git a/sc/source/ui/sidebar/CellAppearancePropertyPanel.cxx b/sc/source/ui/sidebar/CellAppearancePropertyPanel.cxx
index 322ceb53a83f..dcb9b89927c9 100644
--- a/sc/source/ui/sidebar/CellAppearancePropertyPanel.cxx
+++ b/sc/source/ui/sidebar/CellAppearancePropertyPanel.cxx
@@ -351,22 +351,22 @@ void CellAppearancePropertyPanel::NotifyItemUpdate(
 
                 mbVer = false, mbHor = false;
 
-                if(!pBoxInfoItem->IsValid( VALID_VERT )  || pBoxInfoItem->GetVert())
+                if(!pBoxInfoItem->IsValid( SvxBoxInfoItemValidFlags::VERT )  || pBoxInfoItem->GetVert())
                     mbVer = true;
 
-                if(!pBoxInfoItem->IsValid( VALID_HORI )  || pBoxInfoItem->GetHori())
+                if(!pBoxInfoItem->IsValid( SvxBoxInfoItemValidFlags::HORI )  || pBoxInfoItem->GetHori())
                     mbHor = true;
 
-                if(!pBoxInfoItem->IsValid( VALID_LEFT ) || mbLeft)
+                if(!pBoxInfoItem->IsValid( SvxBoxInfoItemValidFlags::LEFT ) || mbLeft)
                     bLeft = true;
 
-                if(!pBoxInfoItem->IsValid( VALID_RIGHT ) || mbRight)
+                if(!pBoxInfoItem->IsValid( SvxBoxInfoItemValidFlags::RIGHT ) || mbRight)
                     bRight = true;
 
-                if(!pBoxInfoItem->IsValid( VALID_TOP ) || mbTop)
+                if(!pBoxInfoItem->IsValid( SvxBoxInfoItemValidFlags::TOP ) || mbTop)
                     bTop = true;
 
-                if(!pBoxInfoItem->IsValid( VALID_BOTTOM ) || mbBottom)
+                if(!pBoxInfoItem->IsValid( SvxBoxInfoItemValidFlags::BOTTOM ) || mbBottom)
                     bBottom = true;
 
                 if(!Application::GetSettings().GetLayoutRTL())
diff --git a/sc/source/ui/sidebar/CellBorderStyleControl.cxx b/sc/source/ui/sidebar/CellBorderStyleControl.cxx
index bd528f73e22b..17a28ae56570 100644
--- a/sc/source/ui/sidebar/CellBorderStyleControl.cxx
+++ b/sc/source/ui/sidebar/CellBorderStyleControl.cxx
@@ -180,14 +180,14 @@ IMPL_LINK(CellBorderStyleControl, TB1SelectHdl, ToolBox*, pToolBox)
     aBorderOuter.SetLine( pTop, BOX_LINE_TOP );
     aBorderOuter.SetLine( pBottom, BOX_LINE_BOTTOM );
 
-    aBorderInner.SetValid( VALID_TOP,       0 != (nValidFlags&FRM_VALID_TOP ));
-    aBorderInner.SetValid( VALID_BOTTOM,    0 != (nValidFlags&FRM_VALID_BOTTOM ));
-    aBorderInner.SetValid( VALID_LEFT,      0 != (nValidFlags&FRM_VALID_LEFT));
-    aBorderInner.SetValid( VALID_RIGHT,     0 != (nValidFlags&FRM_VALID_RIGHT ));
-    aBorderInner.SetValid( VALID_HORI,      0 != (nValidFlags&FRM_VALID_HINNER ));
-    aBorderInner.SetValid( VALID_VERT,      0 != (nValidFlags&FRM_VALID_VINNER));
-    aBorderInner.SetValid( VALID_DISTANCE, true );
-    aBorderInner.SetValid( VALID_DISABLE, false );
+    aBorderInner.SetValid( SvxBoxInfoItemValidFlags::TOP,       0 != (nValidFlags&FRM_VALID_TOP ));
+    aBorderInner.SetValid( SvxBoxInfoItemValidFlags::BOTTOM,    0 != (nValidFlags&FRM_VALID_BOTTOM ));
+    aBorderInner.SetValid( SvxBoxInfoItemValidFlags::LEFT,      0 != (nValidFlags&FRM_VALID_LEFT));
+    aBorderInner.SetValid( SvxBoxInfoItemValidFlags::RIGHT,     0 != (nValidFlags&FRM_VALID_RIGHT ));
+    aBorderInner.SetValid( SvxBoxInfoItemValidFlags::HORI,      0 != (nValidFlags&FRM_VALID_HINNER ));
+    aBorderInner.SetValid( SvxBoxInfoItemValidFlags::VERT,      0 != (nValidFlags&FRM_VALID_VINNER));
+    aBorderInner.SetValid( SvxBoxInfoItemValidFlags::DISTANCE, true );
+    aBorderInner.SetValid( SvxBoxInfoItemValidFlags::DISABLE, false );
 
     mrCellAppearancePropertyPanel.GetBindings()->GetDispatcher()->Execute(SID_ATTR_BORDER, SfxCallMode::RECORD, &aBorderOuter, &aBorderInner, 0L);
     mrCellAppearancePropertyPanel.EndCellBorderStylePopupMode();
@@ -249,14 +249,14 @@ IMPL_LINK(CellBorderStyleControl, TB2SelectHdl, ToolBox *, pToolBox)
         aBorderOuter.SetLine( pTop, BOX_LINE_TOP );
         aBorderOuter.SetLine( pBottom, BOX_LINE_BOTTOM );
 
-        aBorderInner.SetValid( VALID_TOP,       0 != (nValidFlags&FRM_VALID_TOP ));
-        aBorderInner.SetValid( VALID_BOTTOM,    0 != (nValidFlags&FRM_VALID_BOTTOM ));
-        aBorderInner.SetValid( VALID_LEFT,      0 != (nValidFlags&FRM_VALID_LEFT));
-        aBorderInner.SetValid( VALID_RIGHT,     0 != (nValidFlags&FRM_VALID_RIGHT ));
-        aBorderInner.SetValid( VALID_HORI,      0 != (nValidFlags&FRM_VALID_HINNER ));
-        aBorderInner.SetValid( VALID_VERT,      0 != (nValidFlags&FRM_VALID_VINNER));
-        aBorderInner.SetValid( VALID_DISTANCE, true );
-        aBorderInner.SetValid( VALID_DISABLE, false );
+        aBorderInner.SetValid( SvxBoxInfoItemValidFlags::TOP,       0 != (nValidFlags&FRM_VALID_TOP ));
+        aBorderInner.SetValid( SvxBoxInfoItemValidFlags::BOTTOM,    0 != (nValidFlags&FRM_VALID_BOTTOM ));
+        aBorderInner.SetValid( SvxBoxInfoItemValidFlags::LEFT,      0 != (nValidFlags&FRM_VALID_LEFT));
+        aBorderInner.SetValid( SvxBoxInfoItemValidFlags::RIGHT,     0 != (nValidFlags&FRM_VALID_RIGHT ));
+        aBorderInner.SetValid( SvxBoxInfoItemValidFlags::HORI,      0 != (nValidFlags&FRM_VALID_HINNER ));
+        aBorderInner.SetValid( SvxBoxInfoItemValidFlags::VERT,      0 != (nValidFlags&FRM_VALID_VINNER));
+        aBorderInner.SetValid( SvxBoxInfoItemValidFlags::DISTANCE, true );
+        aBorderInner.SetValid( SvxBoxInfoItemValidFlags::DISABLE, false );
 
         mrCellAppearancePropertyPanel.GetBindings()->GetDispatcher()->Execute(SID_ATTR_BORDER, SfxCallMode::RECORD, &aBorderOuter, &aBorderInner, 0L);
     }
@@ -321,14 +321,14 @@ IMPL_LINK(CellBorderStyleControl, TB3SelectHdl, ToolBox *, pToolBox)
     aBorderOuter.SetLine( NULL, BOX_LINE_LEFT );
     aBorderOuter.SetLine( NULL, BOX_LINE_RIGHT );
 
-    aBorderInner.SetValid( VALID_TOP,       0 != (nValidFlags&FRM_VALID_TOP ));
-    aBorderInner.SetValid( VALID_BOTTOM,    0 != (nValidFlags&FRM_VALID_BOTTOM ));
-    aBorderInner.SetValid( VALID_LEFT,      0 != (nValidFlags&FRM_VALID_LEFT ));
-    aBorderInner.SetValid( VALID_RIGHT,     0 != (nValidFlags&FRM_VALID_RIGHT ));
-    aBorderInner.SetValid( VALID_HORI,      0 != (nValidFlags&FRM_VALID_HINNER ));
-    aBorderInner.SetValid( VALID_VERT,      0 != (nValidFlags&FRM_VALID_VINNER));
-    aBorderInner.SetValid( VALID_DISTANCE, true );
-    aBorderInner.SetValid( VALID_DISABLE, false );
+    aBorderInner.SetValid( SvxBoxInfoItemValidFlags::TOP,       0 != (nValidFlags&FRM_VALID_TOP ));
+    aBorderInner.SetValid( SvxBoxInfoItemValidFlags::BOTTOM,    0 != (nValidFlags&FRM_VALID_BOTTOM ));
+    aBorderInner.SetValid( SvxBoxInfoItemValidFlags::LEFT,      0 != (nValidFlags&FRM_VALID_LEFT ));
+    aBorderInner.SetValid( SvxBoxInfoItemValidFlags::RIGHT,     0 != (nValidFlags&FRM_VALID_RIGHT ));
+    aBorderInner.SetValid( SvxBoxInfoItemValidFlags::HORI,      0 != (nValidFlags&FRM_VALID_HINNER ));
+    aBorderInner.SetValid( SvxBoxInfoItemValidFlags::VERT,      0 != (nValidFlags&FRM_VALID_VINNER));
+    aBorderInner.SetValid( SvxBoxInfoItemValidFlags::DISTANCE, true );
+    aBorderInner.SetValid( SvxBoxInfoItemValidFlags::DISABLE, false );
 
     mrCellAppearancePropertyPanel.GetBindings()->GetDispatcher()->Execute(SID_ATTR_BORDER, SfxCallMode::RECORD, &aBorderOuter, &aBorderInner, 0L);
 
diff --git a/sc/source/ui/unoobj/cellsuno.cxx b/sc/source/ui/unoobj/cellsuno.cxx
index 4dcb1f74275b..362fda3a00be 100644
--- a/sc/source/ui/unoobj/cellsuno.cxx
+++ b/sc/source/ui/unoobj/cellsuno.cxx
@@ -966,13 +966,13 @@ void lcl_fillBoxItems( SvxBoxItem& rOuter, SvxBoxInfoItem& rInner, const TableBo
     rOuter.SetLine( ScHelperFunctions::GetBorderLine( aLine, rBorder.RightLine ),       BOX_LINE_RIGHT );
     rInner.SetLine( ScHelperFunctions::GetBorderLine( aLine, rBorder.HorizontalLine ),  BOXINFO_LINE_HORI );
     rInner.SetLine( ScHelperFunctions::GetBorderLine( aLine, rBorder.VerticalLine ),    BOXINFO_LINE_VERT );
-    rInner.SetValid( VALID_TOP,      rBorder.IsTopLineValid );
-    rInner.SetValid( VALID_BOTTOM,   rBorder.IsBottomLineValid );
-    rInner.SetValid( VALID_LEFT,     rBorder.IsLeftLineValid );
-    rInner.SetValid( VALID_RIGHT,    rBorder.IsRightLineValid );
-    rInner.SetValid( VALID_HORI,     rBorder.IsHorizontalLineValid );
-    rInner.SetValid( VALID_VERT,     rBorder.IsVerticalLineValid );
-    rInner.SetValid( VALID_DISTANCE, rBorder.IsDistanceValid );
+    rInner.SetValid( SvxBoxInfoItemValidFlags::TOP,      rBorder.IsTopLineValid );
+    rInner.SetValid( SvxBoxInfoItemValidFlags::BOTTOM,   rBorder.IsBottomLineValid );
+    rInner.SetValid( SvxBoxInfoItemValidFlags::LEFT,     rBorder.IsLeftLineValid );
+    rInner.SetValid( SvxBoxInfoItemValidFlags::RIGHT,    rBorder.IsRightLineValid );
+    rInner.SetValid( SvxBoxInfoItemValidFlags::HORI,     rBorder.IsHorizontalLineValid );
+    rInner.SetValid( SvxBoxInfoItemValidFlags::VERT,     rBorder.IsVerticalLineValid );
+    rInner.SetValid( SvxBoxInfoItemValidFlags::DISTANCE, rBorder.IsDistanceValid );
     rInner.SetTable( true );
 }
 }
@@ -1012,13 +1012,13 @@ void lcl_fillTableBorder( TableBorderItem& rBorder, const SvxBoxItem& rOuter, co
     ScHelperFunctions::FillBorderLine( rBorder.VerticalLine,    rInner.GetVert() );
 
     rBorder.Distance                = rOuter.GetDistance();
-    rBorder.IsTopLineValid          = rInner.IsValid(VALID_TOP);
-    rBorder.IsBottomLineValid       = rInner.IsValid(VALID_BOTTOM);
-    rBorder.IsLeftLineValid         = rInner.IsValid(VALID_LEFT);
-    rBorder.IsRightLineValid        = rInner.IsValid(VALID_RIGHT);
-    rBorder.IsHorizontalLineValid   = !bInvalidateHorVerDist && rInner.IsValid(VALID_HORI);
-    rBorder.IsVerticalLineValid     = !bInvalidateHorVerDist && rInner.IsValid(VALID_VERT);
-    rBorder.IsDistanceValid         = !bInvalidateHorVerDist && rInner.IsValid(VALID_DISTANCE);
+    rBorder.IsTopLineValid          = rInner.IsValid(SvxBoxInfoItemValidFlags::TOP);
+    rBorder.IsBottomLineValid       = rInner.IsValid(SvxBoxInfoItemValidFlags::BOTTOM);
+    rBorder.IsLeftLineValid         = rInner.IsValid(SvxBoxInfoItemValidFlags::LEFT);
+    rBorder.IsRightLineValid        = rInner.IsValid(SvxBoxInfoItemValidFlags::RIGHT);
+    rBorder.IsHorizontalLineValid   = !bInvalidateHorVerDist && rInner.IsValid(SvxBoxInfoItemValidFlags::HORI);
+    rBorder.IsVerticalLineValid     = !bInvalidateHorVerDist && rInner.IsValid(SvxBoxInfoItemValidFlags::VERT);
+    rBorder.IsDistanceValid         = !bInvalidateHorVerDist && rInner.IsValid(SvxBoxInfoItemValidFlags::DISTANCE);
 }
 }
 
diff --git a/sc/source/ui/unoobj/styleuno.cxx b/sc/source/ui/unoobj/styleuno.cxx
index c9c79636d63a..eeec6c1c513e 100644
--- a/sc/source/ui/unoobj/styleuno.cxx
+++ b/sc/source/ui/unoobj/styleuno.cxx
@@ -1483,7 +1483,7 @@ void SAL_CALL ScStyleObj::setAllPropertiesToDefault()
             SvxBoxInfoItem aBoxInfoItem( ATTR_BORDER_INNER );
             aBoxInfoItem.SetTable( false );
             aBoxInfoItem.SetDist( true );
-            aBoxInfoItem.SetValid( VALID_DISTANCE, true );
+            aBoxInfoItem.SetValid( SvxBoxInfoItemValidFlags::DISTANCE, true );
             rSet.Put( aBoxInfoItem );
 
             pDocShell->PageStyleModified( aStyleName, true );
diff --git a/sc/source/ui/view/formatsh.cxx b/sc/source/ui/view/formatsh.cxx
index 842fdcea5f43..c0ed883be928 100644
--- a/sc/source/ui/view/formatsh.cxx
+++ b/sc/source/ui/view/formatsh.cxx
@@ -2072,12 +2072,12 @@ void ScFormatShell::GetAttrState( SfxItemSet& rSet )
                     }
                 }
 
-                if( !aInfoItem.IsValid( VALID_VERT )
-                    || !aInfoItem.IsValid( VALID_HORI )
-                    || !aInfoItem.IsValid( VALID_LEFT )
-                    || !aInfoItem.IsValid( VALID_RIGHT )
-                    || !aInfoItem.IsValid( VALID_TOP )
-                    || !aInfoItem.IsValid( VALID_BOTTOM ) )
+                if( !aInfoItem.IsValid( SvxBoxInfoItemValidFlags::VERT )
+                    || !aInfoItem.IsValid( SvxBoxInfoItemValidFlags::HORI )
+                    || !aInfoItem.IsValid( SvxBoxInfoItemValidFlags::LEFT )
+                    || !aInfoItem.IsValid( SvxBoxInfoItemValidFlags::RIGHT )
+                    || !aInfoItem.IsValid( SvxBoxInfoItemValidFlags::TOP )
+                    || !aInfoItem.IsValid( SvxBoxInfoItemValidFlags::BOTTOM ) )
                 {
                     bColDisable = true;
                     bStyleDisable = true;
diff --git a/sc/source/ui/view/tabvwsha.cxx b/sc/source/ui/view/tabvwsha.cxx
index ada241426a08..4864c84ed354 100644
--- a/sc/source/ui/view/tabvwsha.cxx
+++ b/sc/source/ui/view/tabvwsha.cxx
@@ -489,13 +489,13 @@ void ScTabViewShell::ExecuteCellFormatDlg(SfxRequest& rReq, const OString &rName
         SvxBoxItem     aNewFrame( aLineOuter );
         SvxBoxInfoItem aTempInfo( aLineInner );
 
-        if ( aLineInner.IsValid(VALID_LEFT) )
+        if ( aLineInner.IsValid(SvxBoxInfoItemValidFlags::LEFT) )
             aNewFrame.SetLine( aLineOuter.GetLeft(), BOX_LINE_RIGHT );
-        if ( aLineInner.IsValid(VALID_RIGHT) )
+        if ( aLineInner.IsValid(SvxBoxInfoItemValidFlags::RIGHT) )
             aNewFrame.SetLine( aLineOuter.GetRight(), BOX_LINE_LEFT );
 
-        aLineInner.SetValid( VALID_LEFT, aTempInfo.IsValid(VALID_RIGHT));
-        aLineInner.SetValid( VALID_RIGHT, aTempInfo.IsValid(VALID_LEFT));
+        aLineInner.SetValid( SvxBoxInfoItemValidFlags::LEFT, aTempInfo.IsValid(SvxBoxInfoItemValidFlags::RIGHT));
+        aLineInner.SetValid( SvxBoxInfoItemValidFlags::RIGHT, aTempInfo.IsValid(SvxBoxInfoItemValidFlags::LEFT));
 
         pOldSet->Put( aNewFrame );
     }
diff --git a/sc/source/ui/view/viewfunc.cxx b/sc/source/ui/view/viewfunc.cxx
index 9e0e1f9ee2e1..fd7942473650 100644
--- a/sc/source/ui/view/viewfunc.cxx
+++ b/sc/source/ui/view/viewfunc.cxx
@@ -950,12 +950,12 @@ void ScViewFunc::ApplyAttributes( const SfxItemSet* pDialogSet,
     if ( pNewInner )
     {
         bFrame =   bFrame
-                && (   pNewInner->IsValid(VALID_LEFT)
-                    || pNewInner->IsValid(VALID_RIGHT)
-                    || pNewInner->IsValid(VALID_TOP)
-                    || pNewInner->IsValid(VALID_BOTTOM)
-                    || pNewInner->IsValid(VALID_HORI)
-                    || pNewInner->IsValid(VALID_VERT) );
+                && (   pNewInner->IsValid(SvxBoxInfoItemValidFlags::LEFT)
+                    || pNewInner->IsValid(SvxBoxInfoItemValidFlags::RIGHT)
+                    || pNewInner->IsValid(SvxBoxInfoItemValidFlags::TOP)
+                    || pNewInner->IsValid(SvxBoxInfoItemValidFlags::BOTTOM)
+                    || pNewInner->IsValid(SvxBoxInfoItemValidFlags::HORI)
+                    || pNewInner->IsValid(SvxBoxInfoItemValidFlags::VERT) );
     }
     else
         bFrame = false;