replace enum SvxBorderStyle with css::table::BorderLineSyle

Change-Id: I1dadb53f46b23f92d34061ef78dda872bdbcda67

5 files changed, 21 insertions, 14 deletions

diff --git a/svx/inc/svx/framelink.hxx b/svx/inc/svx/framelink.hxx
index c2edbb428c14..3a9117252be3 100644
--- a/svx/inc/svx/framelink.hxx
+++ b/svx/inc/svx/framelink.hxx
@@ -116,7 +116,10 @@ class SVX_DLLPUBLIC Style
 {
 public:
     /** Constructs an invisible frame style. */
-    inline explicit     Style() : meRefMode( REFMODE_CENTERED ), mnType( editeng::SOLID ) { Clear(); }
+    inline explicit     Style()
+        : meRefMode( REFMODE_CENTERED )
+        , mnType( ::com::sun::star::table::BorderLineStyle::SOLID )
+    { Clear(); }
     /** Constructs a frame style with passed line widths. */
     inline explicit     Style( double nP, double nD, double nS, editeng::SvxBorderStyle nType ) :
                             meRefMode( REFMODE_CENTERED ), mnType( nType )
diff --git a/svx/source/dialog/framelink.cxx b/svx/source/dialog/framelink.cxx
index 63ac8826af6a..2e975d4509e8 100644
--- a/svx/source/dialog/framelink.cxx
+++ b/svx/source/dialog/framelink.cxx
@@ -39,6 +39,8 @@
 #include <drawinglayer/primitive2d/borderlineprimitive2d.hxx>
 #include <drawinglayer/primitive2d/clippedborderlineprimitive2d.hxx>
 
+
+using namespace ::com::sun::star;
 using namespace editeng;
 
 namespace svx {
@@ -1167,7 +1169,7 @@ void Style::Set( const SvxBorderLine& rBorder, double fScale, sal_uInt16 nMaxWid
     sal_uInt16 nDist = rBorder.GetDistance();
     sal_uInt16 nSecn = rBorder.GetInWidth();
 
-    mnType = rBorder.GetSvxBorderStyle();
+    mnType = rBorder.GetBorderLineStyle();
     if( !nSecn )    // no or single frame border
     {
         Set( SCALEVALUE( nPrim ), 0, 0 );
@@ -1214,7 +1216,7 @@ void Style::Set( const SvxBorderLine* pBorder, double fScale, sal_uInt16 nMaxWid
     else
     {
         Clear();
-        mnType = SOLID;
+        mnType = table::BorderLineStyle::SOLID;
     }
 }
 
diff --git a/svx/source/dialog/frmsel.cxx b/svx/source/dialog/frmsel.cxx
index 9aace5087c58..75a7d7ebe830 100644
--- a/svx/source/dialog/frmsel.cxx
+++ b/svx/source/dialog/frmsel.cxx
@@ -39,6 +39,7 @@
 
 #include <tools/rcid.h>
 
+using namespace ::com::sun::star;
 using namespace ::editeng;
 
 namespace svx {
@@ -160,7 +161,7 @@ void FrameBorder::SetState( FrameBorderState eState )
         break;
         case FRAMESTATE_DONTCARE:
             maCoreStyle = SvxBorderLine();
-            maUIStyle = frame::Style(3, 0, 0, SOLID); //OBJ_FRAMESTYLE_DONTCARE
+            maUIStyle = frame::Style(3, 0, 0, table::BorderLineStyle::SOLID); //OBJ_FRAMESTYLE_DONTCARE
         break;
     }
 }
@@ -881,14 +882,14 @@ bool FrameSelector::GetVisibleWidth( long& rnWidth, SvxBorderStyle& rnStyle ) co
     {
         bFound =
             (rStyle.GetWidth() == (*aIt)->GetCoreStyle().GetWidth()) &&
-            (rStyle.GetSvxBorderStyle() ==
-                (*aIt)->GetCoreStyle().GetSvxBorderStyle());
+            (rStyle.GetBorderLineStyle() ==
+                (*aIt)->GetCoreStyle().GetBorderLineStyle());
     }
 
     if( bFound )
     {
         rnWidth = rStyle.GetWidth();
-        rnStyle = rStyle.GetSvxBorderStyle();
+        rnStyle = rStyle.GetBorderLineStyle();
     }
     return bFound;
 }
@@ -951,7 +952,7 @@ void FrameSelector::SelectAllVisibleBorders( bool bSelect )
 
 void FrameSelector::SetStyleToSelection( long nWidth, SvxBorderStyle nStyle )
 {
-    mxImpl->maCurrStyle.SetSvxBorderStyle( nStyle );
+    mxImpl->maCurrStyle.SetBorderLineStyle( nStyle );
     mxImpl->maCurrStyle.SetWidth( nWidth );
     for( SelFrameBorderIter aIt( mxImpl->maEnabBorders ); aIt.Is(); ++aIt )
         mxImpl->SetBorderState( **aIt, FRAMESTATE_SHOW );
diff --git a/svx/source/table/viewcontactoftableobj.cxx b/svx/source/table/viewcontactoftableobj.cxx
index f1494fef8548..c4b3e7b8169b 100644
--- a/svx/source/table/viewcontactoftableobj.cxx
+++ b/svx/source/table/viewcontactoftableobj.cxx
@@ -331,7 +331,7 @@ namespace drawinglayer
                         getLeftLine().GetColorIn(true).getBColor(),
                         getLeftLine().GetColorGap().getBColor(),
                         getLeftLine().HasGapColor(),
-                        getLeftLine().GetSvxBorderStyle()));
+                        getLeftLine().GetBorderLineStyle()));
                 }
             }
 
@@ -362,7 +362,7 @@ namespace drawinglayer
                         getBottomLine().GetColorIn(false).getBColor(),
                         getBottomLine().GetColorGap().getBColor(),
                         getBottomLine().HasGapColor(),
-                        getBottomLine().GetSvxBorderStyle()));
+                        getBottomLine().GetBorderLineStyle()));
                 }
             }
 
@@ -393,7 +393,7 @@ namespace drawinglayer
                         getRightLine().GetColorIn(true).getBColor(),
                         getRightLine().GetColorGap().getBColor(),
                         getRightLine().HasGapColor(),
-                        getRightLine().GetSvxBorderStyle()));
+                        getRightLine().GetBorderLineStyle()));
                 }
             }
 
@@ -424,7 +424,7 @@ namespace drawinglayer
                         getTopLine().GetColorIn(false).getBColor(),
                         getTopLine().GetColorGap().getBColor(),
                         getTopLine().HasGapColor(),
-                        getTopLine().GetSvxBorderStyle()));
+                        getTopLine().GetBorderLineStyle()));
                 }
             }
 
diff --git a/svx/source/tbxctrls/tbcontrl.cxx b/svx/source/tbxctrls/tbcontrl.cxx
index 64dd7646ad0a..90b12dae6ec5 100644
--- a/svx/source/tbxctrls/tbcontrl.cxx
+++ b/svx/source/tbxctrls/tbcontrl.cxx
@@ -1144,7 +1144,7 @@ IMPL_LINK_NOARG(SvxFrameWindow_Impl, SelectHdl)
     sal_uInt16              nModifier = aFrameSet.GetModifier();
     sal_uInt8               nValidFlags = 0;
 
-    theDefLine.GuessLinesWidths(theDefLine.GetSvxBorderStyle(),
+    theDefLine.GuessLinesWidths(theDefLine.GetBorderLineStyle(),
             DEF_LINE_WIDTH_0);
     switch ( nSel )
     {
@@ -1335,6 +1335,7 @@ SvxLineWindow_Impl::SvxLineWindow_Impl( sal_uInt16 nId, const Reference< XFrame
     m_aLineStyleLb.SetSourceUnit( FUNIT_TWIP );
     m_aLineStyleLb.SetNone( SVX_RESSTR(STR_NONE) );
 
+    using namespace table::BorderLineStyle;
     m_aLineStyleLb.InsertEntry( SvxBorderLine::getWidthImpl( SOLID ), SOLID );
     m_aLineStyleLb.InsertEntry( SvxBorderLine::getWidthImpl( DOTTED ), DOTTED );
     m_aLineStyleLb.InsertEntry( SvxBorderLine::getWidthImpl( DASHED ), DASHED );
@@ -1385,7 +1386,7 @@ IMPL_LINK_NOARG(SvxLineWindow_Impl, SelectHdl)
     if ( m_aLineStyleLb.GetSelectEntryPos( ) > 0 )
     {
         SvxBorderLine aTmp;
-        aTmp.SetSvxBorderStyle( nStyle );
+        aTmp.SetBorderLineStyle( nStyle );
         aTmp.SetWidth( 20 ); // TODO Make it depend on a width field
         aLineItem.SetLine( &aTmp );
     }