convert BOX_LINE and BOXINFO_LINE to enum class

since their usage is intertwined.

Also introduce new o3tl utilities enumrange and enumarray to make
working with scoped enums a little simpler.

Change-Id: I2e1cc65dd7c638e59f17d96dfae504747cad6533

2 files changed, 24 insertions, 25 deletions

diff --git a/cui/source/tabpages/border.cxx b/cui/source/tabpages/border.cxx
index c2a14328a42c..8a3a29a6180c 100644
--- a/cui/source/tabpages/border.cxx
+++ b/cui/source/tabpages/border.cxx
@@ -434,13 +434,13 @@ void SvxBorderTabPage::Reset( const SfxItemSet* rSet )
                             m_pBottomMF->SetMin( 0 );
                             m_pBottomMF->SetFirst( 0 );
                         }
-                        long nLeftDist = pBoxItem->GetDistance( BOX_LINE_LEFT);
+                        long nLeftDist = pBoxItem->GetDistance( SvxBoxItemLine::LEFT);
                         SetMetricValue(*m_pLeftMF, nLeftDist, eCoreUnit);
-                        long nRightDist = pBoxItem->GetDistance( BOX_LINE_RIGHT);
+                        long nRightDist = pBoxItem->GetDistance( SvxBoxItemLine::RIGHT);
                         SetMetricValue(*m_pRightMF, nRightDist, eCoreUnit);
-                        long nTopDist = pBoxItem->GetDistance( BOX_LINE_TOP);
+                        long nTopDist = pBoxItem->GetDistance( SvxBoxItemLine::TOP);
                         SetMetricValue( *m_pTopMF, nTopDist, eCoreUnit );
-                        long nBottomDist = pBoxItem->GetDistance( BOX_LINE_BOTTOM);
+                        long nBottomDist = pBoxItem->GetDistance( SvxBoxItemLine::BOTTOM);
                         SetMetricValue( *m_pBottomMF, nBottomDist, eCoreUnit );
 
                         // if the distance is set with no active border line
@@ -603,12 +603,11 @@ bool SvxBorderTabPage::FillItemSet( SfxItemSet* rCoreAttrs )
 
     // outer border:
 
-    typedef ::std::pair<svx::FrameBorderType,sal_uInt16> TBorderPair;
-    TBorderPair eTypes1[] = {
-                                TBorderPair(svx::FRAMEBORDER_TOP,BOX_LINE_TOP),
-                                TBorderPair(svx::FRAMEBORDER_BOTTOM,BOX_LINE_BOTTOM),
-                                TBorderPair(svx::FRAMEBORDER_LEFT,BOX_LINE_LEFT),
-                                TBorderPair(svx::FRAMEBORDER_RIGHT,BOX_LINE_RIGHT),
+    ::std::pair<svx::FrameBorderType,SvxBoxItemLine> eTypes1[] = {
+                                { svx::FRAMEBORDER_TOP,SvxBoxItemLine::TOP },
+                                { svx::FRAMEBORDER_BOTTOM,SvxBoxItemLine::BOTTOM },
+                                { svx::FRAMEBORDER_LEFT,SvxBoxItemLine::LEFT },
+                                { svx::FRAMEBORDER_RIGHT,SvxBoxItemLine::RIGHT },
                             };
 
     for (sal_uInt32 i=0; i < SAL_N_ELEMENTS(eTypes1); ++i)
@@ -617,9 +616,9 @@ bool SvxBorderTabPage::FillItemSet( SfxItemSet* rCoreAttrs )
 
     // border hor/ver and TableFlag
 
-    TBorderPair eTypes2[] = {
-                                TBorderPair(svx::FRAMEBORDER_HOR,BOXINFO_LINE_HORI),
-                                TBorderPair(svx::FRAMEBORDER_VER,BOXINFO_LINE_VERT)
+    ::std::pair<svx::FrameBorderType,SvxBoxInfoItemLine> eTypes2[] = {
+                                { svx::FRAMEBORDER_HOR,SvxBoxInfoItemLine::HORI },
+                                { svx::FRAMEBORDER_VER,SvxBoxInfoItemLine::VERT }
                             };
     for (sal_uInt32 j=0; j < SAL_N_ELEMENTS(eTypes2); ++j)
         aBoxInfoItem.SetLine( m_pFrameSel->GetFrameBorderStyle( eTypes2[j].first ), eTypes2[j].second );
@@ -664,17 +663,17 @@ bool SvxBorderTabPage::FillItemSet( SfxItemSet* rCoreAttrs )
                         (pOldBoxInfoItem && !pOldBoxInfoItem->IsValid(SvxBoxInfoItemValidFlags::DISTANCE))
                        )
                     {
-                        aBoxItem.SetDistance( (sal_uInt16)GetCoreValue(*m_pLeftMF, eCoreUnit ), BOX_LINE_LEFT  );
-                        aBoxItem.SetDistance( (sal_uInt16)GetCoreValue(*m_pRightMF, eCoreUnit ), BOX_LINE_RIGHT );
-                        aBoxItem.SetDistance( (sal_uInt16)GetCoreValue(*m_pTopMF, eCoreUnit ), BOX_LINE_TOP   );
-                        aBoxItem.SetDistance( (sal_uInt16)GetCoreValue(*m_pBottomMF, eCoreUnit ), BOX_LINE_BOTTOM);
+                        aBoxItem.SetDistance( (sal_uInt16)GetCoreValue(*m_pLeftMF, eCoreUnit ), SvxBoxItemLine::LEFT  );
+                        aBoxItem.SetDistance( (sal_uInt16)GetCoreValue(*m_pRightMF, eCoreUnit ), SvxBoxItemLine::RIGHT );
+                        aBoxItem.SetDistance( (sal_uInt16)GetCoreValue(*m_pTopMF, eCoreUnit ), SvxBoxItemLine::TOP   );
+                        aBoxItem.SetDistance( (sal_uInt16)GetCoreValue(*m_pBottomMF, eCoreUnit ), SvxBoxItemLine::BOTTOM);
                     }
                     else
                     {
-                        aBoxItem.SetDistance(pOldBoxItem->GetDistance(BOX_LINE_LEFT ), BOX_LINE_LEFT);
-                        aBoxItem.SetDistance(pOldBoxItem->GetDistance(BOX_LINE_RIGHT),  BOX_LINE_RIGHT);
-                        aBoxItem.SetDistance(pOldBoxItem->GetDistance(BOX_LINE_TOP  ), BOX_LINE_TOP);
-                        aBoxItem.SetDistance(pOldBoxItem->GetDistance(BOX_LINE_BOTTOM), BOX_LINE_BOTTOM);
+                        aBoxItem.SetDistance(pOldBoxItem->GetDistance(SvxBoxItemLine::LEFT ), SvxBoxItemLine::LEFT);
+                        aBoxItem.SetDistance(pOldBoxItem->GetDistance(SvxBoxItemLine::RIGHT),  SvxBoxItemLine::RIGHT);
+                        aBoxItem.SetDistance(pOldBoxItem->GetDistance(SvxBoxItemLine::TOP  ), SvxBoxItemLine::TOP);
+                        aBoxItem.SetDistance(pOldBoxItem->GetDistance(SvxBoxItemLine::BOTTOM), SvxBoxItemLine::BOTTOM);
                     }
                     aBoxInfoItem.SetValid( SvxBoxInfoItemValidFlags::DISTANCE, true );
                 }
diff --git a/cui/source/tabpages/page.cxx b/cui/source/tabpages/page.cxx
index 5d6c92c7236a..25ab8752b22b 100644
--- a/cui/source/tabpages/page.cxx
+++ b/cui/source/tabpages/page.cxx
@@ -113,10 +113,10 @@ sal_uInt16 PosToPageUsage_Impl( sal_uInt16 nPos )
 Size GetMinBorderSpace_Impl( const SvxShadowItem& rShadow, const SvxBoxItem& rBox )
 {
     Size aSz;
-    aSz.Height() = rShadow.CalcShadowSpace( SHADOW_BOTTOM ) + rBox.CalcLineSpace( BOX_LINE_BOTTOM );
-    aSz.Height() += rShadow.CalcShadowSpace( SHADOW_TOP ) + rBox.CalcLineSpace( BOX_LINE_TOP );
-    aSz.Width() = rShadow.CalcShadowSpace( SHADOW_LEFT ) + rBox.CalcLineSpace( BOX_LINE_LEFT );
-    aSz.Width() += rShadow.CalcShadowSpace( SHADOW_RIGHT ) + rBox.CalcLineSpace( BOX_LINE_RIGHT );
+    aSz.Height() = rShadow.CalcShadowSpace( SHADOW_BOTTOM ) + rBox.CalcLineSpace( SvxBoxItemLine::BOTTOM );
+    aSz.Height() += rShadow.CalcShadowSpace( SHADOW_TOP ) + rBox.CalcLineSpace( SvxBoxItemLine::TOP );
+    aSz.Width() = rShadow.CalcShadowSpace( SHADOW_LEFT ) + rBox.CalcLineSpace( SvxBoxItemLine::LEFT );
+    aSz.Width() += rShadow.CalcShadowSpace( SHADOW_RIGHT ) + rBox.CalcLineSpace( SvxBoxItemLine::RIGHT );
     return aSz;
 }