replace enum SvxBorderStyle with css::table::BorderLineSyle

Change-Id: I1dadb53f46b23f92d34061ef78dda872bdbcda67
(cherry picked from commit 8b4593948582c3b5b3d013bd751bb19ffd37a31b)

27 files changed, 243 insertions, 198 deletions

diff --git a/sw/source/core/doc/poolfmt.cxx b/sw/source/core/doc/poolfmt.cxx
index 467bb384f692..0280a4790f84 100644
--- a/sw/source/core/doc/poolfmt.cxx
+++ b/sw/source/core/doc/poolfmt.cxx
@@ -991,7 +991,7 @@ SwTxtFmtColl* SwDoc::GetTxtCollFromPool( sal_uInt16 nId, bool bRegardLanguage )
         {
             SvxBoxItem aBox( RES_BOX );
             Color aColor( COL_GRAY );
-            SvxBorderLine aNew( &aColor, 1, DOUBLE );
+            SvxBorderLine aNew(&aColor, 1, table::BorderLineStyle::DOUBLE);
             aBox.SetLine( &aNew, BOX_LINE_BOTTOM );
 
             aSet.Put( aBox );
diff --git a/sw/source/core/docnode/ndtbl.cxx b/sw/source/core/docnode/ndtbl.cxx
index 7065f941c37c..ea1f4e4c1542 100644
--- a/sw/source/core/docnode/ndtbl.cxx
+++ b/sw/source/core/docnode/ndtbl.cxx
@@ -127,7 +127,7 @@ void lcl_SetDfltBoxAttr( SwFrmFmt& rFmt, sal_uInt8 nId )
     SvxBorderLine aLine( &aCol, DEF_LINE_WIDTH_0 );
     if ( bHTML )
     {
-        aLine.SetSvxBorderStyle( editeng::DOUBLE );
+        aLine.SetBorderLineStyle(table::BorderLineStyle::DOUBLE);
         aLine.SetWidth( DEF_LINE_WIDTH_0 );
     }
     SvxBoxItem aBox(RES_BOX); aBox.SetDistance( 55 );
diff --git a/sw/source/core/edit/autofmt.cxx b/sw/source/core/edit/autofmt.cxx
index d4ab105b819a..54156cb7c6f6 100644
--- a/sw/source/core/edit/autofmt.cxx
+++ b/sw/source/core/edit/autofmt.cxx
@@ -592,28 +592,28 @@ sal_Bool SwAutoFormat::DoUnderline()
         editeng::SvxBorderLine aLine;
         switch( eState )
         {
-        case 1:         // einfach, 0,05 pt
-            aLine.SetSvxBorderStyle( editeng::SOLID );
+        case 1:         // single, 0,05 pt
+            aLine.SetBorderLineStyle(table::BorderLineStyle::SOLID);
             aLine.SetWidth( DEF_LINE_WIDTH_0 );
             break;
-        case 2:         // einfach, 1,0 pt
-            aLine.SetSvxBorderStyle( editeng::SOLID );
+        case 2:         // single, 1,0 pt
+            aLine.SetBorderLineStyle(table::BorderLineStyle::SOLID);
             aLine.SetWidth( DEF_LINE_WIDTH_1 );
             break;
-        case 3:         // doppelt, 1,1 pt
-            aLine.SetSvxBorderStyle( editeng::DOUBLE );
+        case 3:         // double, 1,1 pt
+            aLine.SetBorderLineStyle(table::BorderLineStyle::DOUBLE);
             aLine.SetWidth( DEF_LINE_WIDTH_0 );
             break;
-        case 4:         // doppelt, 4,5 pt
-            aLine.SetSvxBorderStyle( editeng::THICKTHIN_SMALLGAP );
+        case 4:         // double, 4,5 pt
+            aLine.SetBorderLineStyle(table::BorderLineStyle::THICKTHIN_SMALLGAP);
             aLine.SetWidth( DEF_LINE_WIDTH_1  );
             break;
-        case 5:         // doppelt, 6,0 pt
-            aLine.SetSvxBorderStyle( editeng::THINTHICK_SMALLGAP );
+        case 5:         // double, 6,0 pt
+            aLine.SetBorderLineStyle(table::BorderLineStyle::THINTHICK_SMALLGAP);
             aLine.SetWidth( DEF_LINE_WIDTH_2 );
             break;
-        case 6:         // doppelt, 9,0 pt
-            aLine.SetSvxBorderStyle( editeng::DOUBLE );
+        case 6:         // double, 9,0 pt
+            aLine.SetBorderLineStyle(table::BorderLineStyle::DOUBLE);
             aLine.SetWidth( DEF_LINE_WIDTH_2 );
             break;
         }
diff --git a/sw/source/core/inc/frame.hxx b/sw/source/core/inc/frame.hxx
index 544655a1a093..3812a298d2d7 100644
--- a/sw/source/core/inc/frame.hxx
+++ b/sw/source/core/inc/frame.hxx
@@ -500,7 +500,8 @@ public:
                           const sal_Bool bLowerMode = sal_False,
                           const sal_Bool bLowerBorder = sal_False ) const;
     void PaintBorderLine( const SwRect&, const SwRect&, const SwPageFrm*,
-                          const Color *pColor, const editeng::SvxBorderStyle = editeng::SOLID ) const;
+                          const Color *pColor, const editeng::SvxBorderStyle =
+                ::com::sun::star::table::BorderLineStyle::SOLID ) const;
 
     drawinglayer::processor2d::BaseProcessor2D * CreateProcessor2D( ) const;
     void ProcessPrimitives( const drawinglayer::primitive2d::Primitive2DSequence& rSequence ) const;
diff --git a/sw/source/core/layout/atrfrm.cxx b/sw/source/core/layout/atrfrm.cxx
index 51c1a822749a..bb4e44f80f07 100644
--- a/sw/source/core/layout/atrfrm.cxx
+++ b/sw/source/core/layout/atrfrm.cxx
@@ -855,8 +855,9 @@ SwFmtCol& SwFmtCol::operator=( const SwFmtCol& rCpy )
 }
 
 SwFmtCol::SwFmtCol()
-    : SfxPoolItem( RES_COL ),
-    eLineStyle( editeng::NO_STYLE ),
+    : SfxPoolItem( RES_COL )
+    , eLineStyle( table::BorderLineStyle::NONE)
+    ,
     nLineWidth(0),
     nLineHeight( 100 ),
     eAdj( COLADJ_NONE ),
@@ -1111,10 +1112,10 @@ bool SwFmtCol::PutValue( const uno::Any& rVal, sal_uInt8 nMemberId )
                 switch ( pSwColums->GetSepLineStyle() )
                 {
                     default:
-                    case 0: eLineStyle = editeng::NO_STYLE; break;
-                    case 1: eLineStyle = editeng::SOLID; break;
-                    case 2: eLineStyle = editeng::DOTTED; break;
-                    case 3: eLineStyle = editeng::DASHED; break;
+                    case 0: eLineStyle = table::BorderLineStyle::NONE; break;
+                    case 1: eLineStyle = table::BorderLineStyle::SOLID; break;
+                    case 2: eLineStyle = table::BorderLineStyle::DOTTED; break;
+                    case 3: eLineStyle = table::BorderLineStyle::DASHED; break;
                 }
                 if(!pSwColums->GetSepLineIsOn())
                     eAdj = COLADJ_NONE;
diff --git a/sw/source/core/layout/pagedesc.cxx b/sw/source/core/layout/pagedesc.cxx
index ffe37a8d6945..2c98d803977f 100644
--- a/sw/source/core/layout/pagedesc.cxx
+++ b/sw/source/core/layout/pagedesc.cxx
@@ -51,6 +51,9 @@
 #include <poolfmt.hxx>
 #include <switerator.hxx>
 
+
+using namespace ::com::sun::star;
+
 /*************************************************************************
 |*
 |*  SwPageDesc::SwPageDesc()
@@ -359,7 +362,7 @@ SwPageFtnInfo::SwPageFtnInfo() :
     nMaxHeight( 0 ),
 //  aPen( PEN_SOLID ),
     nLineWidth(10),
-    eLineStyle( editeng::SOLID ),
+    eLineStyle( table::BorderLineStyle::SOLID ),
     aWidth( 25, 100 ),
     nTopDist( 57 ),         //1mm
     nBottomDist( 57 )
diff --git a/sw/source/core/layout/paintfrm.cxx b/sw/source/core/layout/paintfrm.cxx
index cff8a264ce78..d26dca733edb 100644
--- a/sw/source/core/layout/paintfrm.cxx
+++ b/sw/source/core/layout/paintfrm.cxx
@@ -733,7 +733,8 @@ void SwLineRects::ConnectEdges( OutputDevice *pOut )
                             aIns.Bottom( pLA->Bottom() );
                             if ( !rL1.IsInside( aIns ) )
                                 continue;
-                            this->push_back( SwLineRect( aIns, rL1.GetColor(), SOLID,
+                            this->push_back( SwLineRect( aIns, rL1.GetColor(),
+                                        table::BorderLineStyle::SOLID,
                                         rL1.GetTab(), SUBCOL_TAB ) );
                             if ( isFull() )
                             {
@@ -773,7 +774,8 @@ void SwLineRects::ConnectEdges( OutputDevice *pOut )
                             aIns.Right( pLA->Right() );
                             if ( !rL1.IsInside( aIns ) )
                                 continue;
-                            this->push_back( SwLineRect( aIns, rL1.GetColor(), SOLID,
+                            this->push_back( SwLineRect( aIns, rL1.GetColor(),
+                                        table::BorderLineStyle::SOLID,
                                         rL1.GetTab(), SUBCOL_TAB ) );
                             if ( isFull() )
                             {
@@ -802,7 +804,10 @@ inline void SwSubsRects::Ins( const SwRect &rRect, const sal_uInt8 nSCol )
 {
     // Lines that are shorted than the largest line width won't be inserted
     if ( rRect.Height() > DEF_LINE_WIDTH_4 || rRect.Width() > DEF_LINE_WIDTH_4 )
-        this->push_back( SwLineRect( rRect, 0, SOLID, 0, nSCol ) );
+    {
+        this->push_back(
+            SwLineRect(rRect, 0, table::BorderLineStyle::SOLID, 0, nSCol));
+    }
 }
 
 void SwSubsRects::RemoveSuperfluousSubsidiaryLines( const SwLineRects &rRects )
@@ -4638,7 +4643,7 @@ lcl_MakeBorderLine(SwRect const& rRect,
             nExtentRightStart, nExtentRightEnd,
             aLeftColor.getBColor(), aRightColor.getBColor(),
             rBorder.GetColorGap().getBColor(), rBorder.HasGapColor(),
-            rBorder.GetSvxBorderStyle() );
+            rBorder.GetBorderLineStyle() );
     g_pBorderLines->AddBorderLine(xLine);
 }
 
@@ -6398,7 +6403,8 @@ void lcl_RefreshLine( const SwLayoutFrm *pLay,
             SwRect aRect( aP1, aP2 );
             // OD 18.11.2002 #99672# - use parameter <_pSubsLines> instead of
             // global variable <pSubsLines>.
-            _pSubsLines->AddLineRect( aRect, 0, SOLID, 0, nSubColor );
+            _pSubsLines->AddLineRect( aRect, 0, table::BorderLineStyle::SOLID,
+                    0, nSubColor );
         }
         aP1 = aP2;
         aP1.*pDirPt += 1;
@@ -6702,13 +6708,15 @@ void SwLayoutFrm::PaintSubsidiaryLines( const SwPageFrm *pPage,
             if ( aOriginal.Left() == aOut.Left() )
             {
                 const SwRect aRect( aOut.Pos(), aLB );
-                pUsedSubsLines->AddLineRect( aRect, 0, SOLID, 0, nSubColor );
+                pUsedSubsLines->AddLineRect( aRect, 0,
+                        table::BorderLineStyle::SOLID, 0, nSubColor );
             }
             // OD 14.11.2002 #104821# - in vertical layout set page/column break at right
             if ( aOriginal.Right() == nRight )
             {
                 const SwRect aRect( aRT, aRB );
-                pUsedSubsLines->AddLineRect( aRect, 0, SOLID, 0, nSubColor );
+                pUsedSubsLines->AddLineRect( aRect, 0,
+                        table::BorderLineStyle::SOLID, 0, nSubColor );
             }
         }
         // OD 14.11.2002 #104822# - adjust control for drawing top and bottom lines
@@ -6718,12 +6726,14 @@ void SwLayoutFrm::PaintSubsidiaryLines( const SwPageFrm *pPage,
             {
                 // OD 14.11.2002 #104821# - in horizontal layout set page/column break at top
                 const SwRect aRect( aOut.Pos(), aRT );
-                pUsedSubsLines->AddLineRect( aRect, 0, SOLID, 0, nSubColor );
+                pUsedSubsLines->AddLineRect( aRect, 0,
+                        table::BorderLineStyle::SOLID, 0, nSubColor );
             }
             if ( aOriginal.Bottom() == nBottom )
             {
                 const SwRect aRect( aLB, aRB );
-                pUsedSubsLines->AddLineRect( aRect, 0, SOLID, 0, nSubColor );
+                pUsedSubsLines->AddLineRect( aRect, 0,
+                        table::BorderLineStyle::SOLID, 0, nSubColor );
             }
         }
     }
diff --git a/sw/source/core/unocore/unosett.cxx b/sw/source/core/unocore/unosett.cxx
index 255121b8e68a..2b312a31b4f6 100644
--- a/sw/source/core/unocore/unosett.cxx
+++ b/sw/source/core/unocore/unosett.cxx
@@ -2438,9 +2438,9 @@ SwXTextColumns::SwXTextColumns(const SwFmtCol& rFmtCol) :
     sal_Int8 nStyle = API_COL_LINE_NONE;
     switch (rFmtCol.GetLineStyle())
     {
-        case editeng::SOLID: nStyle = API_COL_LINE_SOLID; break;
-        case editeng::DOTTED: nStyle = API_COL_LINE_DOTTED; break;
-        case editeng::DASHED: nStyle = API_COL_LINE_DASHED; break;
+        case table::BorderLineStyle::SOLID: nStyle = API_COL_LINE_SOLID; break;
+        case table::BorderLineStyle::DOTTED: nStyle= API_COL_LINE_DOTTED; break;
+        case table::BorderLineStyle::DASHED: nStyle= API_COL_LINE_DASHED; break;
         default: break;
     }
     nSepLineStyle = nStyle;
diff --git a/sw/source/core/unocore/unotbl.cxx b/sw/source/core/unocore/unotbl.cxx
index ac17fd49d83f..c18ae1506d02 100644
--- a/sw/source/core/unocore/unotbl.cxx
+++ b/sw/source/core/unocore/unotbl.cxx
@@ -136,7 +136,7 @@ sal_Bool lcl_LineToSvxLine(const table::BorderLine& rLine, SvxBorderLine& rSvxLi
 {
     rSvxLine.SetColor(Color(rLine.Color));
 
-    rSvxLine.GuessLinesWidths( editeng::NO_STYLE,
+    rSvxLine.GuessLinesWidths( table::BorderLineStyle::NONE,
                                 MM100_TO_TWIP( rLine.OuterLineWidth ),
                                 MM100_TO_TWIP( rLine.InnerLineWidth ),
                                 MM100_TO_TWIP( rLine.LineDistance ) );
diff --git a/sw/source/filter/html/css1atr.cxx b/sw/source/filter/html/css1atr.cxx
index 98727ad66a63..af2a3091cf11 100644
--- a/sw/source/filter/html/css1atr.cxx
+++ b/sw/source/filter/html/css1atr.cxx
@@ -101,6 +101,7 @@
 
 #include <rtl/strbuf.hxx>
 
+using namespace ::com::sun::star;
 using ::editeng::SvxBorderLine;
 
 /*
@@ -3583,36 +3584,36 @@ static void OutCSS1_SvxBorderLine( SwHTMLWriter& rHTMLWrt,
 
     // Linien-Stil: solid oder double
     sOut.append(' ');
-    switch (pLine->GetSvxBorderStyle())
+    switch (pLine->GetBorderLineStyle())
     {
-        case ::editeng::SOLID:
+        case table::BorderLineStyle::SOLID:
             sOut.append(sCSS1_PV_solid);
             break;
-        case ::editeng::DOTTED:
+        case table::BorderLineStyle::DOTTED:
             sOut.append(sCSS1_PV_dotted);
             break;
-        case ::editeng::DASHED:
+        case table::BorderLineStyle::DASHED:
             sOut.append(sCSS1_PV_dashed);
             break;
-        case ::editeng::DOUBLE:
-        case ::editeng::THINTHICK_SMALLGAP:
-        case ::editeng::THINTHICK_MEDIUMGAP:
-        case ::editeng::THINTHICK_LARGEGAP:
-        case ::editeng::THICKTHIN_SMALLGAP:
-        case ::editeng::THICKTHIN_MEDIUMGAP:
-        case ::editeng::THICKTHIN_LARGEGAP:
+        case table::BorderLineStyle::DOUBLE:
+        case table::BorderLineStyle::THINTHICK_SMALLGAP:
+        case table::BorderLineStyle::THINTHICK_MEDIUMGAP:
+        case table::BorderLineStyle::THINTHICK_LARGEGAP:
+        case table::BorderLineStyle::THICKTHIN_SMALLGAP:
+        case table::BorderLineStyle::THICKTHIN_MEDIUMGAP:
+        case table::BorderLineStyle::THICKTHIN_LARGEGAP:
             sOut.append(sCSS1_PV_double);
             break;
-        case ::editeng::EMBOSSED:
+        case table::BorderLineStyle::EMBOSSED:
             sOut.append(sCSS1_PV_ridge);
             break;
-        case ::editeng::ENGRAVED:
+        case table::BorderLineStyle::ENGRAVED:
             sOut.append(sCSS1_PV_groove);
             break;
-        case ::editeng::INSET:
+        case table::BorderLineStyle::INSET:
             sOut.append(sCSS1_PV_inset);
             break;
-        case ::editeng::OUTSET:
+        case table::BorderLineStyle::OUTSET:
             sOut.append(sCSS1_PV_outset);
             break;
         default:
diff --git a/sw/source/filter/html/htmltab.cxx b/sw/source/filter/html/htmltab.cxx
index 53529f67385c..bfde6230dda3 100644
--- a/sw/source/filter/html/htmltab.cxx
+++ b/sw/source/filter/html/htmltab.cxx
@@ -1025,7 +1025,9 @@ void HTMLTable::InitCtor( const HTMLTableOptions *pOptions )
     }
 
     if ( pOptions->nCellSpacing != 0 )
-        aTopBorderLine.SetSvxBorderStyle( ::editeng::DOUBLE );
+    {
+        aTopBorderLine.SetBorderLineStyle(table::BorderLineStyle::DOUBLE);
+    }
     aTopBorderLine.SetWidth( nPHeight );
     aTopBorderLine.SetColor( rBorderColor );
     aBottomBorderLine = aTopBorderLine;
@@ -1037,7 +1039,9 @@ void HTMLTable::InitCtor( const HTMLTableOptions *pOptions )
     else
     {
         if ( pOptions->nCellSpacing != 0 )
-            aLeftBorderLine.SetSvxBorderStyle( ::editeng::DOUBLE );
+        {
+            aLeftBorderLine.SetBorderLineStyle(table::BorderLineStyle::DOUBLE);
+        }
         aLeftBorderLine.SetWidth( nPWidth );
         aLeftBorderLine.SetColor( rBorderColor );
     }
@@ -1045,7 +1049,7 @@ void HTMLTable::InitCtor( const HTMLTableOptions *pOptions )
 
     if( pOptions->nCellSpacing != 0 )
     {
-        aBorderLine.SetSvxBorderStyle( ::editeng::DOUBLE );
+        aBorderLine.SetBorderLineStyle(table::BorderLineStyle::DOUBLE);
         aBorderLine.SetWidth( DEF_LINE_WIDTH_0 );
     }
     else
@@ -1487,7 +1491,8 @@ void HTMLTable::FixFrameFmt( SwTableBox *pBox,
 
                     sal_uInt16 nBorderWidth = aBorderLine.GetOutWidth();
                     nBorderWidth *= (nEmptyRows + 1);
-                    aThickBorderLine.SetSvxBorderStyle( ::editeng::SOLID );
+                    aThickBorderLine.SetBorderLineStyle(
+                            table::BorderLineStyle::SOLID);
                     aThickBorderLine.SetWidth( nBorderWidth );
                     aBoxItem.SetLine( &aThickBorderLine, BOX_LINE_BOTTOM );
                 }
diff --git a/sw/source/filter/html/svxcss1.cxx b/sw/source/filter/html/svxcss1.cxx
index 90f66e795469..40f237848657 100644
--- a/sw/source/filter/html/svxcss1.cxx
+++ b/sw/source/filter/html/svxcss1.cxx
@@ -65,6 +65,9 @@
 
 #include <memory>
 
+
+using namespace ::com::sun::star;
+
 // die Funktionen zum Parsen einer CSS1-Property sind von folgendem Typ:
 typedef void (*FnParseCSS1Prop)( const CSS1Expression *pExpr,
                                  SfxItemSet& rItemSet,
@@ -323,31 +326,31 @@ void SvxCSS1BorderInfo::SetBorderLine( sal_uInt16 nLine, SvxBoxItem &rBoxItem )
     switch ( eStyle )
     {
         case CSS1_BS_SINGLE:
-            aBorderLine.SetSvxBorderStyle( ::editeng::SOLID );
+            aBorderLine.SetBorderLineStyle(table::BorderLineStyle::SOLID);
             break;
         case CSS1_BS_DOUBLE:
-            aBorderLine.SetSvxBorderStyle( ::editeng::DOUBLE );
+            aBorderLine.SetBorderLineStyle(table::BorderLineStyle::DOUBLE);
             break;
         case CSS1_BS_DOTTED:
-            aBorderLine.SetSvxBorderStyle( ::editeng::DOTTED );
+            aBorderLine.SetBorderLineStyle(table::BorderLineStyle::DOTTED);
             break;
         case CSS1_BS_DASHED:
-            aBorderLine.SetSvxBorderStyle( ::editeng::DASHED );
+            aBorderLine.SetBorderLineStyle(table::BorderLineStyle::DASHED);
             break;
         case CSS1_BS_GROOVE:
-            aBorderLine.SetSvxBorderStyle( ::editeng::ENGRAVED );
+            aBorderLine.SetBorderLineStyle(table::BorderLineStyle::ENGRAVED);
             break;
         case CSS1_BS_RIDGE:
-            aBorderLine.SetSvxBorderStyle( ::editeng::EMBOSSED );
+            aBorderLine.SetBorderLineStyle(table::BorderLineStyle::EMBOSSED);
             break;
         case CSS1_BS_INSET:
-            aBorderLine.SetSvxBorderStyle( ::editeng::INSET );
+            aBorderLine.SetBorderLineStyle(table::BorderLineStyle::INSET);
             break;
         case CSS1_BS_OUTSET:
-            aBorderLine.SetSvxBorderStyle( ::editeng::OUTSET );
+            aBorderLine.SetBorderLineStyle(table::BorderLineStyle::OUTSET);
             break;
         default:
-            aBorderLine.SetSvxBorderStyle( ::editeng::NO_STYLE );
+            aBorderLine.SetBorderLineStyle(table::BorderLineStyle::NONE);
             break;
     }
 
diff --git a/sw/source/filter/html/swhtml.cxx b/sw/source/filter/html/swhtml.cxx
index a3d4ae502266..d64d14e3ae16 100644
--- a/sw/source/filter/html/swhtml.cxx
+++ b/sw/source/filter/html/swhtml.cxx
@@ -5246,7 +5246,7 @@ void SwHTMLParser::InsertHorzRule()
             SvxCSS1Parser::PixelToTwip( nPWidth, nPHeight );
             if ( !bNoShade )
             {
-                aBorderLine.SetSvxBorderStyle( ::editeng::DOUBLE );
+                aBorderLine.SetBorderLineStyle(table::BorderLineStyle::DOUBLE);
             }
             aBorderLine.SetWidth( nPHeight );
         }
@@ -5256,7 +5256,7 @@ void SwHTMLParser::InsertHorzRule()
         }
         else
         {
-            aBorderLine.SetSvxBorderStyle( ::editeng::DOUBLE );
+            aBorderLine.SetBorderLineStyle(table::BorderLineStyle::DOUBLE);
             aBorderLine.SetWidth( DEF_LINE_WIDTH_0 );
         }
 
diff --git a/sw/source/filter/ww1/w1sprm.cxx b/sw/source/filter/ww1/w1sprm.cxx
index 6c7bd759ac0d..7cd9bb9426ba 100644
--- a/sw/source/filter/ww1/w1sprm.cxx
+++ b/sw/source/filter/ww1/w1sprm.cxx
@@ -206,7 +206,7 @@ STOP1(Ww1SingleSprmPPageBreakBefore, RES_BREAK)
 SvxBorderLine* Ww1SingleSprmPBrc::SetBorder(SvxBorderLine* pLine, W1_BRC10* pBrc)
 {
     sal_uInt16 nCode;
-    ::editeng::SvxBorderStyle eStyle = ::editeng::SOLID;
+    ::editeng::SvxBorderStyle eStyle = table::BorderLineStyle::SOLID;
     if(pBrc->dxpLine2WidthGet() == 0)
     {
         switch(pBrc->dxpLine1WidthGet())
@@ -220,21 +220,21 @@ SvxBorderLine* Ww1SingleSprmPBrc::SetBorder(SvxBorderLine* pLine, W1_BRC10* pBrc
         case 5: nCode = DEF_LINE_WIDTH_4; break;
         case 6:
                 nCode = DEF_LINE_WIDTH_5;
-                eStyle = ::editeng::DOTTED;
+                eStyle = table::BorderLineStyle::DOTTED;
                 break;
         case 7:
                 nCode = DEF_LINE_WIDTH_5;
-                eStyle = ::editeng::DASHED;
+                eStyle = table::BorderLineStyle::DASHED;
                 break;
         }
         pLine->SetWidth( nCode );
-        pLine->SetSvxBorderStyle( eStyle );
+        pLine->SetBorderLineStyle( eStyle );
     }
     else
     {
         if ( pBrc->dxpLine1WidthGet() == 1 && pBrc->dxpLine2WidthGet() == 1 )
         {
-            pLine->SetSvxBorderStyle( ::editeng::DOUBLE );
+            pLine->SetBorderLineStyle( table::BorderLineStyle::DOUBLE );
             pLine->SetWidth( DEF_LINE_WIDTH_0 );
         }
         else
diff --git a/sw/source/filter/ww8/docxattributeoutput.cxx b/sw/source/filter/ww8/docxattributeoutput.cxx
index fb347bb76be9..26c0bea2a5e1 100644
--- a/sw/source/filter/ww8/docxattributeoutput.cxx
+++ b/sw/source/filter/ww8/docxattributeoutput.cxx
@@ -1412,51 +1412,51 @@ static void impl_borderLine( FSHelperPtr pSerializer, sal_Int32 elementToken, co
     const char* pVal = "none";
     if ( !pBorderLine->isEmpty( ) )
     {
-        switch (pBorderLine->GetSvxBorderStyle())
+        switch (pBorderLine->GetBorderLineStyle())
         {
-            case ::editeng::SOLID:
+            case table::BorderLineStyle::SOLID:
                 pVal = ( sal_Char* )"single";
                 break;
-            case ::editeng::DOTTED:
+            case table::BorderLineStyle::DOTTED:
                 pVal = ( sal_Char* )"dotted";
                 break;
-            case ::editeng::DASHED:
+            case table::BorderLineStyle::DASHED:
                 pVal = ( sal_Char* )"dashed";
                 break;
-            case ::editeng::DOUBLE:
+            case table::BorderLineStyle::DOUBLE:
                 pVal = ( sal_Char* )"double";
                 break;
-            case ::editeng::THINTHICK_SMALLGAP:
+            case table::BorderLineStyle::THINTHICK_SMALLGAP:
                 pVal = ( sal_Char* )"thinThickSmallGap";
                 break;
-            case ::editeng::THINTHICK_MEDIUMGAP:
+            case table::BorderLineStyle::THINTHICK_MEDIUMGAP:
                 pVal = ( sal_Char* )"thinThickMediumGap";
                 break;
-            case ::editeng::THINTHICK_LARGEGAP:
+            case table::BorderLineStyle::THINTHICK_LARGEGAP:
                 pVal = ( sal_Char* )"thinThickLargeGap";
                 break;
-            case ::editeng::THICKTHIN_SMALLGAP:
+            case table::BorderLineStyle::THICKTHIN_SMALLGAP:
                 pVal = ( sal_Char* )"thickThinSmallGap";
                 break;
-            case ::editeng::THICKTHIN_MEDIUMGAP:
+            case table::BorderLineStyle::THICKTHIN_MEDIUMGAP:
                 pVal = ( sal_Char* )"thickThinMediumGap";
                 break;
-            case ::editeng::THICKTHIN_LARGEGAP:
+            case table::BorderLineStyle::THICKTHIN_LARGEGAP:
                 pVal = ( sal_Char* )"thickThinLargeGap";
                 break;
-            case ::editeng::EMBOSSED:
+            case table::BorderLineStyle::EMBOSSED:
                 pVal = ( sal_Char* )"threeDEmboss";
                 break;
-            case ::editeng::ENGRAVED:
+            case table::BorderLineStyle::ENGRAVED:
                 pVal = ( sal_Char* )"threeDEngrave";
                 break;
-            case ::editeng::OUTSET:
+            case table::BorderLineStyle::OUTSET:
                 pVal = ( sal_Char* )"outset";
                 break;
-            case ::editeng::INSET:
+            case table::BorderLineStyle::INSET:
                 pVal = ( sal_Char* )"inset";
                 break;
-            case ::editeng::NO_STYLE:
+            case table::BorderLineStyle::NONE:
             default:
                 break;
         }
diff --git a/sw/source/filter/ww8/rtfattributeoutput.cxx b/sw/source/filter/ww8/rtfattributeoutput.cxx
index 94bfccb238d6..3ef3aff38a9c 100644
--- a/sw/source/filter/ww8/rtfattributeoutput.cxx
+++ b/sw/source/filter/ww8/rtfattributeoutput.cxx
@@ -124,9 +124,9 @@ static OString OutTBLBorderLine(RtfExport &rExport, const SvxBorderLine* pLine,
     {
         aRet.append(pStr);
         // single line
-        switch (pLine->GetSvxBorderStyle())
+        switch (pLine->GetBorderLineStyle())
         {
-            case ::editeng::SOLID:
+            case table::BorderLineStyle::SOLID:
                 {
                     if( DEF_LINE_WIDTH_0 == pLine->GetWidth() )
                         aRet.append(OOO_STRING_SVTOOLS_RTF_BRDRHAIR);
@@ -134,46 +134,46 @@ static OString OutTBLBorderLine(RtfExport &rExport, const SvxBorderLine* pLine,
                         aRet.append(OOO_STRING_SVTOOLS_RTF_BRDRS);
                 }
                 break;
-            case ::editeng::DOTTED:
+            case table::BorderLineStyle::DOTTED:
                 aRet.append(OOO_STRING_SVTOOLS_RTF_BRDRDOT);
                 break;
-            case ::editeng::DASHED:
+            case table::BorderLineStyle::DASHED:
                 aRet.append(OOO_STRING_SVTOOLS_RTF_BRDRDASH);
                 break;
-            case ::editeng::DOUBLE:
+            case table::BorderLineStyle::DOUBLE:
                 aRet.append(OOO_STRING_SVTOOLS_RTF_BRDRDB);
                 break;
-            case ::editeng::THINTHICK_SMALLGAP:
+            case table::BorderLineStyle::THINTHICK_SMALLGAP:
                 aRet.append(OOO_STRING_SVTOOLS_RTF_BRDRTNTHSG);
                 break;
-            case ::editeng::THINTHICK_MEDIUMGAP:
+            case table::BorderLineStyle::THINTHICK_MEDIUMGAP:
                 aRet.append(OOO_STRING_SVTOOLS_RTF_BRDRTNTHMG);
                 break;
-            case ::editeng::THINTHICK_LARGEGAP:
+            case table::BorderLineStyle::THINTHICK_LARGEGAP:
                 aRet.append(OOO_STRING_SVTOOLS_RTF_BRDRTNTHLG);
                 break;
-            case ::editeng::THICKTHIN_SMALLGAP:
+            case table::BorderLineStyle::THICKTHIN_SMALLGAP:
                 aRet.append(OOO_STRING_SVTOOLS_RTF_BRDRTHTNSG);
                 break;
-            case ::editeng::THICKTHIN_MEDIUMGAP:
+            case table::BorderLineStyle::THICKTHIN_MEDIUMGAP:
                 aRet.append(OOO_STRING_SVTOOLS_RTF_BRDRTHTNMG);
                 break;
-            case ::editeng::THICKTHIN_LARGEGAP:
+            case table::BorderLineStyle::THICKTHIN_LARGEGAP:
                 aRet.append(OOO_STRING_SVTOOLS_RTF_BRDRTHTNLG);
                 break;
-            case ::editeng::EMBOSSED:
+            case table::BorderLineStyle::EMBOSSED:
                 aRet.append(OOO_STRING_SVTOOLS_RTF_BRDREMBOSS);
                 break;
-            case ::editeng::ENGRAVED:
+            case table::BorderLineStyle::ENGRAVED:
                 aRet.append(OOO_STRING_SVTOOLS_RTF_BRDRENGRAVE);
                 break;
-            case ::editeng::OUTSET:
+            case table::BorderLineStyle::OUTSET:
                 aRet.append(OOO_STRING_SVTOOLS_RTF_BRDROUTSET);
                 break;
-            case ::editeng::INSET:
+            case table::BorderLineStyle::INSET:
                 aRet.append(OOO_STRING_SVTOOLS_RTF_BRDRINSET);
                 break;
-            case ::editeng::NO_STYLE:
+            case table::BorderLineStyle::NONE:
             default:
                 aRet.append(OOO_STRING_SVTOOLS_RTF_BRDRNONE);
                 break;
diff --git a/sw/source/filter/ww8/wrtw8esh.cxx b/sw/source/filter/ww8/wrtw8esh.cxx
index f74a3ea2539f..b951b32ddbd4 100644
--- a/sw/source/filter/ww8/wrtw8esh.cxx
+++ b/sw/source/filter/ww8/wrtw8esh.cxx
@@ -1727,15 +1727,15 @@ sal_Int32 SwBasicEscherEx::WriteFlyFrameAttr(const SwFrmFmt& rFmt,
                         DrawModelToEmu( nLineWidth ));
 
                     MSO_LineDashing eDashing = mso_lineSolid;
-                    switch (pLine->GetSvxBorderStyle())
+                    switch (pLine->GetBorderLineStyle())
                     {
-                        case  ::editeng::DASHED:
+                        case  table::BorderLineStyle::DASHED:
                             eDashing = mso_lineDashGEL;
                             break;
-                        case ::editeng::DOTTED:
+                        case table::BorderLineStyle::DOTTED:
                             eDashing = mso_lineDotGEL;
                             break;
-                        case ::editeng::SOLID:
+                        case table::BorderLineStyle::SOLID:
                         default:
                             break;
                     }
diff --git a/sw/source/filter/ww8/ww8atr.cxx b/sw/source/filter/ww8/ww8atr.cxx
index 52f761969ad1..3f2c0c02a641 100644
--- a/sw/source/filter/ww8/ww8atr.cxx
+++ b/sw/source/filter/ww8/ww8atr.cxx
@@ -4073,9 +4073,9 @@ WW8_BRC WW8Export::TranslateBorderLine(const SvxBorderLine& rLine,
             {
                 // All the border types values are available on
                 // http://msdn.microsoft.com/en-us/library/dd908142%28v=office.12%29.aspx
-                switch (rLine.GetSvxBorderStyle())
+                switch (rLine.GetBorderLineStyle())
                 {
-                    case ::editeng::SOLID:
+                    case table::BorderLineStyle::SOLID:
                         {
                             if ( rLine.GetWidth( ) == DEF_LINE_WIDTH_0 )
                                 brcType = 5;
@@ -4083,43 +4083,43 @@ WW8_BRC WW8Export::TranslateBorderLine(const SvxBorderLine& rLine,
                                 brcType = 1;
                         }
                         break;
-                    case ::editeng::DOTTED:
+                    case table::BorderLineStyle::DOTTED:
                         brcType = 6;
                         break;
-                    case ::editeng::DASHED:
+                    case table::BorderLineStyle::DASHED:
                         brcType = 7;
                         break;
-                    case ::editeng::DOUBLE:
+                    case table::BorderLineStyle::DOUBLE:
                         brcType = 3;
                         break;
-                    case ::editeng::THINTHICK_SMALLGAP:
+                    case table::BorderLineStyle::THINTHICK_SMALLGAP:
                         brcType = 11;
                         break;
-                    case ::editeng::THINTHICK_MEDIUMGAP:
+                    case table::BorderLineStyle::THINTHICK_MEDIUMGAP:
                         brcType = 14;
                         break;
-                    case ::editeng::THINTHICK_LARGEGAP:
+                    case table::BorderLineStyle::THINTHICK_LARGEGAP:
                         brcType = 17;
                         break;
-                    case ::editeng::THICKTHIN_SMALLGAP:
+                    case table::BorderLineStyle::THICKTHIN_SMALLGAP:
                         brcType = 12;
                         break;
-                    case ::editeng::THICKTHIN_MEDIUMGAP:
+                    case table::BorderLineStyle::THICKTHIN_MEDIUMGAP:
                         brcType = 15;
                         break;
-                    case ::editeng::THICKTHIN_LARGEGAP:
+                    case table::BorderLineStyle::THICKTHIN_LARGEGAP:
                         brcType = 18;
                         break;
-                    case ::editeng::EMBOSSED:
+                    case table::BorderLineStyle::EMBOSSED:
                         brcType = 24;
                         break;
-                    case ::editeng::ENGRAVED:
+                    case table::BorderLineStyle::ENGRAVED:
                         brcType = 25;
                         break;
-                    case ::editeng::OUTSET:
+                    case table::BorderLineStyle::OUTSET:
                         brcType = 26;
                         break;
-                    case ::editeng::INSET:
+                    case table::BorderLineStyle::INSET:
                         brcType = 27;
                         break;
                     default:
@@ -4145,9 +4145,10 @@ WW8_BRC WW8Export::TranslateBorderLine(const SvxBorderLine& rLine,
             nWidth = ( nWidth + 7 ) / 15;
             if( nWidth > 5 )
                 nWidth = 5;
-            if ( ::editeng::DOTTED == rLine.GetSvxBorderStyle() )
+            ::editeng::SvxBorderStyle const eStyle(rLine.GetBorderLineStyle());
+            if (table::BorderLineStyle::DOTTED == eStyle)
                 nWidth = 6;
-            else if ( ::editeng::DASHED == rLine.GetSvxBorderStyle() )
+            else if (table::BorderLineStyle::DASHED == eStyle)
                 nWidth = 7;
         }
 
diff --git a/sw/source/filter/ww8/ww8graf.cxx b/sw/source/filter/ww8/ww8graf.cxx
index 2f3c47fcf8b5..49fb0b216817 100644
--- a/sw/source/filter/ww8/ww8graf.cxx
+++ b/sw/source/filter/ww8/ww8graf.cxx
@@ -1505,7 +1505,7 @@ sal_Int32 SwWW8ImplReader::MatchSdrBoxIntoFlyBoxItem(const Color& rLineColor,
     if( !rLineThick )
         return nOutsideThick;
 
-    ::editeng::SvxBorderStyle nIdx = ::editeng::NO_STYLE;
+    ::editeng::SvxBorderStyle nIdx = table::BorderLineStyle::NONE;
 
     sal_Int32 nLineThick=rLineThick;
     nOutsideThick = SwMSDffManager::GetEscherLineMatch(eLineStyle,
@@ -1526,21 +1526,21 @@ sal_Int32 SwWW8ImplReader::MatchSdrBoxIntoFlyBoxItem(const Color& rLineColor,
     {
     // zuerst die Einzel-Linien
     case mso_lineSimple:
-        nIdx = ::editeng::SOLID;
+        nIdx = table::BorderLineStyle::SOLID;
     break;
     // dann die Doppel-Linien, fuer die wir feine Entsprechungen haben :-)))
     case mso_lineDouble:
-        nIdx = ::editeng::DOUBLE;
+        nIdx = table::BorderLineStyle::DOUBLE;
     break;
     case mso_lineThickThin:
-        nIdx = ::editeng::THICKTHIN_SMALLGAP;
+        nIdx = table::BorderLineStyle::THICKTHIN_SMALLGAP;
     break;
     case mso_lineThinThick:
-        nIdx = ::editeng::THINTHICK_SMALLGAP;
+        nIdx = table::BorderLineStyle::THINTHICK_SMALLGAP;
     break;
     // We have no triple border, use double instead.
     case mso_lineTriple:
-        nIdx = ::editeng::DOUBLE;
+        nIdx = table::BorderLineStyle::DOUBLE;
     break;
     // no line style is set
     case (MSO_LineStyle)USHRT_MAX:
@@ -1554,23 +1554,23 @@ sal_Int32 SwWW8ImplReader::MatchSdrBoxIntoFlyBoxItem(const Color& rLineColor,
     switch( eDashing )
     {
         case mso_lineDashGEL:
-            nIdx = ::editeng::DASHED;
+            nIdx = table::BorderLineStyle::DASHED;
             break;
         case mso_lineDotGEL:
-            nIdx = ::editeng::DOTTED;
+            nIdx = table::BorderLineStyle::DOTTED;
             break;
         default:
             break;
     }
 
-    if (::editeng::NO_STYLE != nIdx)
+    if (table::BorderLineStyle::NONE != nIdx)
     {
         SvxBorderLine aLine;
         aLine.SetColor( rLineColor );
 
         aLine.SetWidth( nLineThick ); // No conversion here, nLineThick is already in twips
-        aLine.SetSvxBorderStyle(nIdx);
-        if (editeng::DOUBLE == nIdx)
+        aLine.SetBorderLineStyle(nIdx);
+        if (table::BorderLineStyle::DOUBLE == nIdx)
         {  // fdo#43249: divide width by 3 for outer line, gap, inner line
            aLine.ScaleMetrics(1, 3);
         }
diff --git a/sw/source/filter/ww8/ww8par6.cxx b/sw/source/filter/ww8/ww8par6.cxx
index 95138871f06c..1ed025035f0f 100644
--- a/sw/source/filter/ww8/ww8par6.cxx
+++ b/sw/source/filter/ww8/ww8par6.cxx
@@ -1279,7 +1279,7 @@ sal_uInt8 lcl_ReadBorders(bool bVer67, WW8_BRC* brc, WW8PLCFx_Cp_FKP* pPap,
 void GetLineIndex(SvxBoxItem &rBox, short nLineThickness, short nSpace, sal_uInt8 nCol, short nIdx,
     sal_uInt16 nOOIndex, sal_uInt16 nWWIndex, short *pSize=0)
 {
-    ::editeng::SvxBorderStyle eStyle = ::editeng::SOLID;
+    ::editeng::SvxBorderStyle eStyle = table::BorderLineStyle::SOLID;
     switch (nIdx)
     {
         // First the single lines
@@ -1290,70 +1290,70 @@ void GetLineIndex(SvxBoxItem &rBox, short nLineThickness, short nSpace, sal_uInt
         case  9:
         case 20:
         case 22:
-            eStyle = ::editeng::SOLID;
+            eStyle = table::BorderLineStyle::SOLID;
             break;
         case  2:
             {
-                eStyle = ::editeng::SOLID;
+                eStyle = table::BorderLineStyle::SOLID;
                 nLineThickness *= 2;
             }
             break;
         case  6:
-            eStyle = ::editeng::DOTTED;
+            eStyle = table::BorderLineStyle::DOTTED;
             break;
         case  7:
-            eStyle = ::editeng::DASHED;
+            eStyle = table::BorderLineStyle::DASHED;
             break;
         // then the shading beams which we represent by a double line
         case 23:
-            eStyle = ::editeng::DOUBLE;
+            eStyle = table::BorderLineStyle::DOUBLE;
             break;
         // then the double lines, for which we have good matches
         case  3:
         case 10: //Don't have tripple so use double
         case 21: //Don't have double wave: use double instead
-            eStyle = ::editeng::DOUBLE;
+            eStyle = table::BorderLineStyle::DOUBLE;
             break;
         case 11:
-            eStyle = ::editeng::THINTHICK_SMALLGAP;
+            eStyle = table::BorderLineStyle::THINTHICK_SMALLGAP;
             break;
         case 12:
         case 13: //Don't have thin thick thin, so use thick thin
-            eStyle = ::editeng::THICKTHIN_SMALLGAP;
+            eStyle = table::BorderLineStyle::THICKTHIN_SMALLGAP;
             break;
         case 14:
-            eStyle = ::editeng::THINTHICK_MEDIUMGAP;
+            eStyle = table::BorderLineStyle::THINTHICK_MEDIUMGAP;
             break;
         case 15:
         case 16: //Don't have thin thick thin, so use thick thin
-            eStyle = ::editeng::THICKTHIN_MEDIUMGAP;
+            eStyle = table::BorderLineStyle::THICKTHIN_MEDIUMGAP;
             break;
         case 17:
-            eStyle = ::editeng::THINTHICK_LARGEGAP;
+            eStyle = table::BorderLineStyle::THINTHICK_LARGEGAP;
             break;
         case 18:
         case 19: //Don't have thin thick thin, so use thick thin
-            eStyle = ::editeng::THICKTHIN_LARGEGAP;
+            eStyle = table::BorderLineStyle::THICKTHIN_LARGEGAP;
             break;
         case 24:
-            eStyle = ::editeng::EMBOSSED;
+            eStyle = table::BorderLineStyle::EMBOSSED;
             break;
         case 25:
-            eStyle = ::editeng::ENGRAVED;
+            eStyle = table::BorderLineStyle::ENGRAVED;
             break;
         case 26:
-            eStyle = ::editeng::OUTSET;
+            eStyle = table::BorderLineStyle::OUTSET;
             break;
         case 27:
-            eStyle = ::editeng::INSET;
+            eStyle = table::BorderLineStyle::INSET;
             break;
         default:
-            eStyle = ::editeng::NO_STYLE;
+            eStyle = table::BorderLineStyle::NONE;
             break;
     }
 
     ::editeng::SvxBorderLine aLine;
-    aLine.SetSvxBorderStyle( eStyle );
+    aLine.SetBorderLineStyle( eStyle );
     aLine.SetWidth( nLineThickness );
 
     //No AUTO for borders as yet, so if AUTO, use BLACK
diff --git a/sw/source/filter/xml/xmlexpit.cxx b/sw/source/filter/xml/xmlexpit.cxx
index 3114bd48f8bf..e4d04769e69f 100644
--- a/sw/source/filter/xml/xmlexpit.cxx
+++ b/sw/source/filter/xml/xmlexpit.cxx
@@ -365,15 +365,15 @@ void SvXMLExportItemMapper::handleElementItem(
 bool lcl_isOdfDoubleLine( const SvxBorderLine* pLine )
 {
     bool bIsOdfDouble = false;
-    switch (pLine->GetSvxBorderStyle())
+    switch (pLine->GetBorderLineStyle())
     {
-        case ::editeng::DOUBLE:
-        case ::editeng::THINTHICK_SMALLGAP:
-        case ::editeng::THINTHICK_MEDIUMGAP:
-        case ::editeng::THINTHICK_LARGEGAP:
-        case ::editeng::THICKTHIN_SMALLGAP:
-        case ::editeng::THICKTHIN_MEDIUMGAP:
-        case ::editeng::THICKTHIN_LARGEGAP:
+        case table::BorderLineStyle::DOUBLE:
+        case table::BorderLineStyle::THINTHICK_SMALLGAP:
+        case table::BorderLineStyle::THINTHICK_MEDIUMGAP:
+        case table::BorderLineStyle::THINTHICK_LARGEGAP:
+        case table::BorderLineStyle::THICKTHIN_SMALLGAP:
+        case table::BorderLineStyle::THICKTHIN_MEDIUMGAP:
+        case table::BorderLineStyle::THICKTHIN_LARGEGAP:
             bIsOdfDouble = true;
             break;
         default:
@@ -743,36 +743,36 @@ sal_Bool SvXMLExportItemMapper::QueryXMLValue(
 
                         enum XMLTokenEnum eStyle = XML_SOLID;
                         bool bNoBorder = false;
-                        switch (pLine->GetSvxBorderStyle())
+                        switch (pLine->GetBorderLineStyle())
                         {
-                            case ::editeng::SOLID:
+                            case table::BorderLineStyle::SOLID:
                                 eStyle = XML_SOLID;
                                 break;
-                            case ::editeng::DOTTED:
+                            case table::BorderLineStyle::DOTTED:
                                 eStyle = XML_DOTTED;
                                 break;
-                            case ::editeng::DASHED:
+                            case table::BorderLineStyle::DASHED:
                                 eStyle = XML_DASHED;
                                 break;
-                            case ::editeng::DOUBLE:
-                            case ::editeng::THINTHICK_SMALLGAP:
-                            case ::editeng::THINTHICK_MEDIUMGAP:
-                            case ::editeng::THINTHICK_LARGEGAP:
-                            case ::editeng::THICKTHIN_SMALLGAP:
-                            case ::editeng::THICKTHIN_MEDIUMGAP:
-                            case ::editeng::THICKTHIN_LARGEGAP:
+                            case table::BorderLineStyle::DOUBLE:
+                            case table::BorderLineStyle::THINTHICK_SMALLGAP:
+                            case table::BorderLineStyle::THINTHICK_MEDIUMGAP:
+                            case table::BorderLineStyle::THINTHICK_LARGEGAP:
+                            case table::BorderLineStyle::THICKTHIN_SMALLGAP:
+                            case table::BorderLineStyle::THICKTHIN_MEDIUMGAP:
+                            case table::BorderLineStyle::THICKTHIN_LARGEGAP:
                                 eStyle = XML_DOUBLE;
                                 break;
-                            case ::editeng::EMBOSSED:
+                            case table::BorderLineStyle::EMBOSSED:
                                 eStyle = XML_RIDGE;
                                 break;
-                            case ::editeng::ENGRAVED:
+                            case table::BorderLineStyle::ENGRAVED:
                                 eStyle = XML_GROOVE;
                                 break;
-                            case ::editeng::INSET:
+                            case table::BorderLineStyle::INSET:
                                 eStyle = XML_INSET;
                                 break;
-                            case ::editeng::OUTSET:
+                            case table::BorderLineStyle::OUTSET:
                                 eStyle = XML_OUTSET;
                                 break;
                             default:
diff --git a/sw/source/filter/xml/xmlithlp.cxx b/sw/source/filter/xml/xmlithlp.cxx
index 4531995dd8ee..0902899899e6 100644
--- a/sw/source/filter/xml/xmlithlp.cxx
+++ b/sw/source/filter/xml/xmlithlp.cxx
@@ -154,10 +154,10 @@ sal_Bool lcl_frmitems_parseXMLBorder( const OUString& rValue,
 
 void lcl_frmitems_setXMLBorderStyle( SvxBorderLine& rLine, sal_uInt16 nStyle )
 {
-    ::editeng::SvxBorderStyle eStyle = ::editeng::NO_STYLE;
+    ::editeng::SvxBorderStyle eStyle = table::BorderLineStyle::NONE;
     if ( nStyle != API_LINE_NONE )
         eStyle = ::editeng::SvxBorderStyle( nStyle );
-    rLine.SetSvxBorderStyle(eStyle);
+    rLine.SetBorderLineStyle(eStyle);
 }
 
 sal_Bool lcl_frmitems_setXMLBorder( SvxBorderLine*& rpLine,
@@ -207,7 +207,7 @@ sal_Bool lcl_frmitems_setXMLBorder( SvxBorderLine*& rpLine,
            {
                if (bDouble)
                {
-                   rpLine->SetSvxBorderStyle( ::editeng::DOUBLE );
+                   rpLine->SetBorderLineStyle( table::BorderLineStyle::DOUBLE );
                }
                rpLine->SetWidth( aBorderWidths[nNamedWidth] );
            }
@@ -244,7 +244,8 @@ void lcl_frmitems_setXMLBorder( SvxBorderLine*& rpLine,
     if( nWidth > 0 )
         rpLine->SetWidth( nWidth );
     else
-        rpLine->GuessLinesWidths( ::editeng::DOUBLE, nOutWidth, nInWidth, nDistance );
+        rpLine->GuessLinesWidths(table::BorderLineStyle::DOUBLE,
+                nOutWidth, nInWidth, nDistance);
 }
 
 const struct SvXMLEnumMapEntry psXML_BrushRepeat[] =
diff --git a/sw/source/ui/frmdlg/column.cxx b/sw/source/ui/frmdlg/column.cxx
index 3d3431f2e599..039d2be03280 100644
--- a/sw/source/ui/frmdlg/column.cxx
+++ b/sw/source/ui/frmdlg/column.cxx
@@ -74,6 +74,9 @@
 
 #include "access.hrc"
 
+
+using namespace ::com::sun::star;
+
 #define FRAME_FORMAT_WIDTH 1000
 
 /*--------------------------------------------------------------------
@@ -529,9 +532,15 @@ SwColumnPage::SwColumnPage(Window *pParent, const SfxItemSet &rSet)
 
     // Fill the line styles listbox
     aLineTypeDLB.SetNone( SVX_RESSTR( RID_SVXSTR_NONE ) );
-    aLineTypeDLB.InsertEntry( ::editeng::SvxBorderLine::getWidthImpl( ::editeng::SOLID ), ::editeng::SOLID );
-    aLineTypeDLB.InsertEntry( ::editeng::SvxBorderLine::getWidthImpl( ::editeng::DOTTED ), ::editeng::DOTTED );
-    aLineTypeDLB.InsertEntry( ::editeng::SvxBorderLine::getWidthImpl( ::editeng::DASHED ), ::editeng::DASHED );
+    aLineTypeDLB.InsertEntry(
+        ::editeng::SvxBorderLine::getWidthImpl(table::BorderLineStyle::SOLID),
+        table::BorderLineStyle::SOLID );
+    aLineTypeDLB.InsertEntry(
+        ::editeng::SvxBorderLine::getWidthImpl(table::BorderLineStyle::DOTTED),
+        table::BorderLineStyle::DOTTED );
+    aLineTypeDLB.InsertEntry(
+        ::editeng::SvxBorderLine::getWidthImpl(table::BorderLineStyle::DASHED),
+        table::BorderLineStyle::DASHED );
 
     long nLineWidth = static_cast<long>(MetricField::ConvertDoubleValue(
             aLineWidthEdit.GetValue( ),
diff --git a/sw/source/ui/misc/pgfnote.cxx b/sw/source/ui/misc/pgfnote.cxx
index df6c470efbfd..f8d63a225471 100644
--- a/sw/source/ui/misc/pgfnote.cxx
+++ b/sw/source/ui/misc/pgfnote.cxx
@@ -58,6 +58,9 @@
 #include <misc.hrc>
 #include <pgfnote.hrc>
 
+
+using namespace ::com::sun::star;
+
 static sal_uInt16 aPageRg[] = {
     FN_PARAM_FTN_INFO, FN_PARAM_FTN_INFO,
     0
@@ -220,9 +223,15 @@ void SwFootNotePage::Reset(const SfxItemSet &rSet)
     aLineTypeBox.SetSourceUnit( FUNIT_TWIP );
 
     aLineTypeBox.SetNone( String( SW_RES( STR_NONE ) ) );
-    aLineTypeBox.InsertEntry( ::editeng::SvxBorderLine::getWidthImpl( ::editeng::SOLID ), ::editeng::SOLID );
-    aLineTypeBox.InsertEntry( ::editeng::SvxBorderLine::getWidthImpl( ::editeng::DOTTED ), ::editeng::DOTTED );
-    aLineTypeBox.InsertEntry( ::editeng::SvxBorderLine::getWidthImpl( ::editeng::DASHED ), ::editeng::DASHED );
+    aLineTypeBox.InsertEntry(
+        ::editeng::SvxBorderLine::getWidthImpl(table::BorderLineStyle::SOLID),
+        table::BorderLineStyle::SOLID );
+    aLineTypeBox.InsertEntry(
+        ::editeng::SvxBorderLine::getWidthImpl(table::BorderLineStyle::DOTTED),
+        table::BorderLineStyle::DOTTED );
+    aLineTypeBox.InsertEntry(
+        ::editeng::SvxBorderLine::getWidthImpl(table::BorderLineStyle::DASHED),
+        table::BorderLineStyle::DASHED );
     aLineTypeBox.SetWidth( pFtnInfo->GetLineWidth( ) );
     aLineTypeBox.SelectEntry( pFtnInfo->GetLineStyle() );
 
diff --git a/sw/source/ui/shells/frmsh.cxx b/sw/source/ui/shells/frmsh.cxx
index 46b9738ff1e2..f2834b695c63 100644
--- a/sw/source/ui/shells/frmsh.cxx
+++ b/sw/source/ui/shells/frmsh.cxx
@@ -1095,7 +1095,8 @@ void SwFrameShell::ExecFrameStyle(SfxRequest& rReq)
 
                     if(aBorderLine.GetOutWidth() == 0)
                     {
-                        aBorderLine.SetSvxBorderStyle( ::editeng::SOLID );
+                        aBorderLine.SetBorderLineStyle(
+                                table::BorderLineStyle::SOLID);
                         aBorderLine.SetWidth( DEF_LINE_WIDTH_0 );
                     }
                     //Distance nur setzen, wenn der Request vom Controller kommt
@@ -1229,7 +1230,7 @@ void lcl_FrmGetMaxLineWidth(const SvxBorderLine* pBorderLine, SvxBorderLine& rBo
     if(pBorderLine->GetWidth() > rBorderLine.GetWidth())
         rBorderLine.SetWidth(pBorderLine->GetWidth());
 
-    rBorderLine.SetSvxBorderStyle(pBorderLine->GetSvxBorderStyle());
+    rBorderLine.SetBorderLineStyle(pBorderLine->GetBorderLineStyle());
     rBorderLine.SetColor(pBorderLine->GetColor());
 }
 
diff --git a/sw/source/ui/shells/tabsh.cxx b/sw/source/ui/shells/tabsh.cxx
index ccbe696dc5a0..ee388923e84a 100644
--- a/sw/source/ui/shells/tabsh.cxx
+++ b/sw/source/ui/shells/tabsh.cxx
@@ -463,7 +463,7 @@ static void lcl_TabGetMaxLineWidth(const SvxBorderLine* pBorderLine, SvxBorderLi
     if(pBorderLine->GetWidth() > rBorderLine.GetWidth())
         rBorderLine.SetWidth(pBorderLine->GetWidth());
 
-    rBorderLine.SetSvxBorderStyle(pBorderLine->GetSvxBorderStyle());
+    rBorderLine.SetBorderLineStyle(pBorderLine->GetBorderLineStyle());
     rBorderLine.SetColor(pBorderLine->GetColor());
 }
 
@@ -541,7 +541,7 @@ void SwTableShell::Execute(SfxRequest &rReq)
 
             if(aBorderLine.GetOutWidth() == 0)
             {
-                aBorderLine.SetSvxBorderStyle( ::editeng::SOLID );
+                aBorderLine.SetBorderLineStyle(table::BorderLineStyle::SOLID);
                 aBorderLine.SetWidth( DEF_LINE_WIDTH_0 );
             }
 
diff --git a/sw/source/ui/utlui/uiitems.cxx b/sw/source/ui/utlui/uiitems.cxx
index 2503ca4850ea..3507b8b6ee2c 100644
--- a/sw/source/ui/utlui/uiitems.cxx
+++ b/sw/source/ui/utlui/uiitems.cxx
@@ -143,10 +143,10 @@ bool SwPageFtnInfoItem::QueryValue( Any& rVal, sal_uInt8 nMemberId ) const
             switch ( aFtnInfo.GetLineStyle( ) )
             {
                 default:
-                case ::editeng::NO_STYLE: rVal <<= sal_Int8( 0 ); break;
-                case ::editeng::SOLID: rVal <<= sal_Int8( 1 ); break;
-                case ::editeng::DOTTED: rVal <<= sal_Int8( 2 ); break;
-                case ::editeng::DASHED: rVal <<= sal_Int8( 3 ); break;
+                case table::BorderLineStyle::NONE : rVal <<= sal_Int8(0); break;
+                case table::BorderLineStyle::SOLID: rVal <<= sal_Int8(1); break;
+                case table::BorderLineStyle::DOTTED: rVal <<= sal_Int8(2); break;
+                case table::BorderLineStyle::DASHED: rVal <<= sal_Int8(3); break;
             }
             break;
         }
@@ -214,14 +214,14 @@ bool SwPageFtnInfoItem::PutValue(const Any& rVal, sal_uInt8 nMemberId)
         }
         case MID_FTN_LINE_STYLE:
         {
-            ::editeng::SvxBorderStyle eStyle = ::editeng::NO_STYLE;
+            ::editeng::SvxBorderStyle eStyle = table::BorderLineStyle::NONE;
             sal_Int8 nSet = 0;
             rVal >>= nSet;
             switch ( nSet )
             {
-                case 1: eStyle = ::editeng::SOLID; break;
-                case 2: eStyle = ::editeng::DOTTED; break;
-                case 3: eStyle = ::editeng::DASHED; break;
+                case 1: eStyle = table::BorderLineStyle::SOLID; break;
+                case 2: eStyle = table::BorderLineStyle::DOTTED; break;
+                case 3: eStyle = table::BorderLineStyle::DASHED; break;
                 default: break;
             }
             aFtnInfo.SetLineStyle( eStyle );