fdo#85486 - Clean up unnecessary enumerations from xenum.hxx

Removed XLineStyle

Reviewed on:
https://gerrit.libreoffice.org/13029

Change-Id: I583575a04988ccf932374e411672ba14a3f3cb2f

3 files changed, 24 insertions, 20 deletions

diff --git a/cui/source/tabpages/tpline.cxx b/cui/source/tabpages/tpline.cxx
index ae9395d33810..5bf102892349 100644
--- a/cui/source/tabpages/tpline.cxx
+++ b/cui/source/tabpages/tpline.cxx
@@ -62,6 +62,7 @@
 #define MN_SYMBOLS_AUTO    2
 #define MN_GALLERY_ENTRY 100
 
+using namespace com::sun::star;
 
 // static ----------------------------------------------------------------
 
@@ -99,7 +100,7 @@ SvxLineTabPage::SvxLineTabPage
     bObjSelected( false ),
 
     pXPool              ( static_cast<XOutdevItemPool*>(rInAttrs.GetPool()) ),
-    aXLStyle            ( XLINE_DASH ),
+    aXLStyle            ( drawing::LineStyle_DASH ),
     aXWidth             ( 1 ),
     aXDash              ( OUString(), XDash( XDASH_RECT, 3, 7, 2, 40, 15 ) ),
     aXColor             ( OUString(), COL_LIGHTRED ),
@@ -689,12 +690,12 @@ bool SvxLineTabPage::FillItemSet( SfxItemSet* rAttrs )
             boost::scoped_ptr<XLineStyleItem> pStyleItem;
 
             if( nPos == 0 )
-                pStyleItem.reset(new XLineStyleItem( XLINE_NONE ));
+                pStyleItem.reset(new XLineStyleItem( drawing::LineStyle_NONE ));
             else if( nPos == 1 )
-                pStyleItem.reset(new XLineStyleItem( XLINE_SOLID ));
+                pStyleItem.reset(new XLineStyleItem( drawing::LineStyle_SOLID ));
             else
             {
-                pStyleItem.reset(new XLineStyleItem( XLINE_DASH ));
+                pStyleItem.reset(new XLineStyleItem( drawing::LineStyle_DASH ));
 
                 // For added security
                 if( pDashList->Count() > (long) ( nPos - 2 ) )
@@ -965,15 +966,15 @@ bool SvxLineTabPage::FillXLSet_Impl()
 
     if( m_pLbLineStyle->GetSelectEntryPos() == LISTBOX_ENTRY_NOTFOUND )
     {
-        rXLSet.Put( XLineStyleItem( XLINE_NONE ) );
+        rXLSet.Put( XLineStyleItem( drawing::LineStyle_NONE ) );
     }
     else if( m_pLbLineStyle->IsEntryPosSelected( 0 ) )
-        rXLSet.Put( XLineStyleItem( XLINE_NONE ) );
+        rXLSet.Put( XLineStyleItem( drawing::LineStyle_NONE ) );
     else if( m_pLbLineStyle->IsEntryPosSelected( 1 ) )
-        rXLSet.Put( XLineStyleItem( XLINE_SOLID ) );
+        rXLSet.Put( XLineStyleItem( drawing::LineStyle_SOLID ) );
     else
     {
-        rXLSet.Put( XLineStyleItem( XLINE_DASH ) );
+        rXLSet.Put( XLineStyleItem( drawing::LineStyle_DASH ) );
 
         nPos = m_pLbLineStyle->GetSelectEntryPos();
         if( nPos != LISTBOX_ENTRY_NOTFOUND )
@@ -1086,7 +1087,7 @@ bool SvxLineTabPage::FillXLSet_Impl()
 
 void SvxLineTabPage::Reset( const SfxItemSet* rAttrs )
 {
-    XLineStyle  eXLS; // XLINE_NONE, XLINE_SOLID, XLINE_DASH
+    drawing::LineStyle  eXLS; // drawing::LineStyle_NONE, drawing::LineStyle_SOLID, drawing::LineStyle_DASH
 
     // Line style
     const SfxPoolItem *pPoolItem;
@@ -1213,18 +1214,18 @@ void SvxLineTabPage::Reset( const SfxItemSet* rAttrs )
 
     if( rAttrs->GetItemState( XATTR_LINESTYLE ) != SfxItemState::DONTCARE )
     {
-        eXLS = (XLineStyle) static_cast<const XLineStyleItem&>( rAttrs->Get( XATTR_LINESTYLE ) ).GetValue();
+        eXLS = (drawing::LineStyle) static_cast<const XLineStyleItem&>( rAttrs->Get( XATTR_LINESTYLE ) ).GetValue();
 
         switch( eXLS )
         {
-            case XLINE_NONE:
+            case drawing::LineStyle_NONE:
                 m_pLbLineStyle->SelectEntryPos( 0 );
                 break;
-            case XLINE_SOLID:
+            case drawing::LineStyle_SOLID:
                 m_pLbLineStyle->SelectEntryPos( 1 );
                 break;
 
-            case XLINE_DASH:
+            case drawing::LineStyle_DASH:
                 m_pLbLineStyle->SetNoSelection();
                 m_pLbLineStyle->SelectEntry( static_cast<const XLineDashItem&>( rAttrs->Get( XATTR_LINEDASH ) ).GetName() );
                 break;
diff --git a/cui/source/tabpages/tplnedef.cxx b/cui/source/tabpages/tplnedef.cxx
index 2c446c149cc0..c31c8116b55e 100644
--- a/cui/source/tabpages/tplnedef.cxx
+++ b/cui/source/tabpages/tplnedef.cxx
@@ -46,6 +46,9 @@
 
 #define XOUT_WIDTH    150
 
+using namespace com::sun::star;
+
+
 SvxLineDefTabPage::SvxLineDefTabPage
 (
     vcl::Window* pParent,
@@ -60,7 +63,7 @@ SvxLineDefTabPage::SvxLineDefTabPage
     bObjSelected    ( false ),
 
     pXPool              ( static_cast<XOutdevItemPool*>(rInAttrs.GetPool()) ),
-    aXLStyle            ( XLINE_DASH ),
+    aXLStyle            ( drawing::LineStyle_DASH ),
     aXWidth             ( XOUT_WIDTH ),
     aXDash              ( OUString(), XDash( XDASH_RECT, 3, 7, 2, 40, 15 ) ),
     aXColor             ( OUString(), COL_BLACK ),
@@ -267,7 +270,7 @@ bool SvxLineDefTabPage::FillItemSet( SfxItemSet* rAttrs )
             FillDash_Impl();
 
             OUString aString( m_pLbLineStyles->GetSelectEntry() );
-            rAttrs->Put( XLineStyleItem( XLINE_DASH ) );
+            rAttrs->Put( XLineStyleItem( drawing::LineStyle_DASH ) );
             rAttrs->Put( XLineDashItem( aString, aDash ) );
         }
     }
@@ -280,16 +283,16 @@ void SvxLineDefTabPage::Reset( const SfxItemSet* rAttrs )
 {
     if( rAttrs->GetItemState( GetWhich( XATTR_LINESTYLE ) ) != SfxItemState::DONTCARE )
     {
-        XLineStyle eXLS = (XLineStyle) static_cast<const XLineStyleItem&>( rAttrs->Get( GetWhich( XATTR_LINESTYLE ) ) ).GetValue();
+        drawing::LineStyle eXLS = (drawing::LineStyle) static_cast<const XLineStyleItem&>( rAttrs->Get( GetWhich( XATTR_LINESTYLE ) ) ).GetValue();
 
         switch( eXLS )
         {
-            case XLINE_NONE:
-            case XLINE_SOLID:
+            case drawing::LineStyle_NONE:
+            case drawing::LineStyle_SOLID:
                 m_pLbLineStyles->SelectEntryPos( 0 );
                 break;
 
-            case XLINE_DASH:
+            case drawing::LineStyle_DASH:
             {
                 const XLineDashItem& rDashItem = static_cast<const XLineDashItem&>( rAttrs->Get( XATTR_LINEDASH ) );
                 aDash = rDashItem.GetDashValue();
diff --git a/cui/source/tabpages/tplneend.cxx b/cui/source/tabpages/tplneend.cxx
index ddff8770d2a2..54d1e714c237 100644
--- a/cui/source/tabpages/tplneend.cxx
+++ b/cui/source/tabpages/tplneend.cxx
@@ -63,7 +63,7 @@ SvxLineEndDefTabPage::SvxLineEndDefTabPage
     bObjSelected        ( false ),
 
     pXPool              ( static_cast<XOutdevItemPool*>(rInAttrs.GetPool()) ),
-    aXLStyle            ( XLINE_SOLID ),
+    aXLStyle            ( com::sun::star::drawing::LineStyle_SOLID ),
     aXWidth             ( XOUT_WIDTH ),
     aXColor             ( OUString(), COL_BLACK ),
     aXLineAttr          ( pXPool ),