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

 Removed XLineStyle

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

Change-Id: I583575a04988ccf932374e411672ba14a3f3cb2f

2 files changed, 11 insertions, 10 deletions

diff --git a/filter/source/msfilter/msdffimp.cxx b/filter/source/msfilter/msdffimp.cxx
index 466faf62ae22..679c40a65d94 100644
--- a/filter/source/msfilter/msdffimp.cxx
+++ b/filter/source/msfilter/msdffimp.cxx
@@ -922,7 +922,7 @@ void DffPropertyReader::ApplyLineAttributes( SfxItemSet& rSet, const MSO_SPT eSh
 
         MSO_LineDashing eLineDashing = (MSO_LineDashing)GetPropertyValue( DFF_Prop_lineDashing, mso_lineSolid );
         if ( eLineDashing == mso_lineSolid )
-            rSet.Put(XLineStyleItem( XLINE_SOLID ) );
+            rSet.Put(XLineStyleItem( drawing::LineStyle_SOLID ) );
         else
         {
             XDashStyle  eDash = XDASH_RECT;
@@ -982,7 +982,7 @@ void DffPropertyReader::ApplyLineAttributes( SfxItemSet& rSet, const MSO_SPT eSh
             }
 
             rSet.Put( XLineDashItem( OUString(), XDash( eDash, nDots, nDotLen, nDashes, nDashLen, nDistance ) ) );
-            rSet.Put( XLineStyleItem( XLINE_DASH ) );
+            rSet.Put( XLineStyleItem( drawing::LineStyle_DASH ) );
         }
         rSet.Put( XLineColorItem( OUString(), rManager.MSO_CLR_ToColor( GetPropertyValue( DFF_Prop_lineColor ), DFF_Prop_lineColor ) ) );
         if ( IsProperty( DFF_Prop_lineOpacity ) )
@@ -1050,7 +1050,7 @@ void DffPropertyReader::ApplyLineAttributes( SfxItemSet& rSet, const MSO_SPT eSh
         }
     }
     else
-        rSet.Put( XLineStyleItem( XLINE_NONE ) );
+        rSet.Put( XLineStyleItem( drawing::LineStyle_NONE ) );
 }
 
 struct ShadeColor
diff --git a/filter/source/msfilter/svdfppt.cxx b/filter/source/msfilter/svdfppt.cxx
index d0b2103485f3..6a80926833bc 100644
--- a/filter/source/msfilter/svdfppt.cxx
+++ b/filter/source/msfilter/svdfppt.cxx
@@ -1049,7 +1049,7 @@ SdrObject* SdrEscherImport::ProcessObj( SvStream& rSt, DffObjData& rObjData, voi
                     pTObj->SetMergedItemSet( aSet );
                     if ( pRet )
                     {
-                        pTObj->SetMergedItem( XLineStyleItem( XLINE_NONE ) );
+                        pTObj->SetMergedItem( XLineStyleItem( drawing::LineStyle_NONE ) );
                         pTObj->SetMergedItem( XFillStyleItem( drawing::FillStyle_NONE ) );
                     }
                     if ( bVerticalText )
@@ -2975,7 +2975,7 @@ SdrObject* SdrPowerPointImport::ImportPageBackgroundObject( const SdrPage& rPage
             pSet.reset(new SfxItemSet( pSdrModel->GetItemPool() ));
             pSet->Put( XFillStyleItem( drawing::FillStyle_NONE ) );
         }
-        pSet->Put( XLineStyleItem( XLINE_NONE ) );
+        pSet->Put( XLineStyleItem( drawing::LineStyle_NONE ) );
         Rectangle aRect( rPage.GetLftBorder(), rPage.GetUppBorder(), rPage.GetWdt()-rPage.GetRgtBorder(), rPage.GetHgt()-rPage.GetLwrBorder() );
         pRet = new SdrRectObj( aRect );
         pRet->SetModel( pSdrModel );
@@ -7368,22 +7368,23 @@ void ApplyCellLineAttributes( const SdrObject* pLine, Reference< XTable >& xTabl
     try
     {
         SfxItemSet aSet( pLine->GetMergedItemSet() );
-        XLineStyle eLineStyle(static_cast<const XLineStyleItem&>(pLine->GetMergedItem( XATTR_LINESTYLE )).GetValue());
+        drawing::LineStyle eLineStyle(static_cast<const XLineStyleItem&>(pLine->GetMergedItem( XATTR_LINESTYLE )).GetValue());
         com::sun::star::table::BorderLine2 aBorderLine;
         switch( eLineStyle )
         {
-            case XLINE_DASH :
-            case XLINE_SOLID :
+            case drawing::LineStyle_DASH :
+            case drawing::LineStyle_SOLID :
                 {
                     Color aLineColor( static_cast<const XLineColorItem&>(pLine->GetMergedItem( XATTR_LINECOLOR )).GetColorValue() );
                     aBorderLine.Color = aLineColor.GetColor();
                     // Avoid width = 0, the min value should be 1.
                     sal_Int32 nLineWidth = std::max(sal_Int32(1), static_cast<const XLineWidthItem&>(pLine->GetMergedItem(XATTR_LINEWIDTH)) .GetValue() / 4);
                     aBorderLine.LineWidth = static_cast< sal_Int16 >( nLineWidth );
-                    aBorderLine.LineStyle = eLineStyle == XLINE_SOLID ? table::BorderLineStyle::SOLID : table::BorderLineStyle::DASHED;
+                    aBorderLine.LineStyle = eLineStyle == drawing::LineStyle_SOLID ? table::BorderLineStyle::SOLID : table::BorderLineStyle::DASHED;
                 }
                 break;
-            case XLINE_NONE :
+            default:
+            case drawing::LineStyle_NONE :
                 {
                     aBorderLine.LineWidth = 0;
                     aBorderLine.LineStyle = table::BorderLineStyle::NONE;