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

Removed XDashStyle

Change-Id: Id14802a007a90508ee033e1dc964c57d3d5ef582
Reviewed-on: https://gerrit.libreoffice.org/13213
Reviewed-by: Miklos Vajna <vmiklos@collabora.co.uk>
Tested-by: Miklos Vajna <vmiklos@collabora.co.uk>

4 files changed, 14 insertions, 14 deletions

diff --git a/svx/source/svdraw/svdfmtf.cxx b/svx/source/svdraw/svdfmtf.cxx
index a714f9d67851..f92df8c92e11 100644
--- a/svx/source/svdraw/svdfmtf.cxx
+++ b/svx/source/svdraw/svdfmtf.cxx
@@ -90,7 +90,7 @@ ImpSdrGDIMetaFileImport::ImpSdrGDIMetaFileImport(
     mnLineWidth(0),
     maLineJoin(basegfx::B2DLINEJOIN_NONE),
     maLineCap(com::sun::star::drawing::LineCap_BUTT),
-    maDash(XDASH_RECT, 0, 0, 0, 0, 0),
+    maDash(css::drawing::DashStyle_RECT, 0, 0, 0, 0, 0),
     mbMov(false),
     mbSize(false),
     maOfs(0, 0),
@@ -380,7 +380,7 @@ void ImpSdrGDIMetaFileImport::SetAttributes(SdrObject* pObj, bool bForceTextAttr
         }
         else
         {
-            mpLineAttr->Put(XLineDashItem(OUString(), XDash(XDASH_RECT)));
+            mpLineAttr->Put(XLineDashItem(OUString(), XDash(css::drawing::DashStyle_RECT)));
         }
     }
     else
@@ -708,7 +708,7 @@ void ImpSdrGDIMetaFileImport::DoAction(MetaLineAction& rAct)
             mnLineWidth = nNewLineWidth;
             maLineJoin = rLineInfo.GetLineJoin();
             maLineCap = rLineInfo.GetLineCap();
-            maDash = XDash(XDASH_RECT,
+            maDash = XDash(css::drawing::DashStyle_RECT,
                 rLineInfo.GetDotCount(), rLineInfo.GetDotLen(),
                 rLineInfo.GetDashCount(), rLineInfo.GetDashLen(),
                 rLineInfo.GetDistance());
@@ -934,7 +934,7 @@ void ImpSdrGDIMetaFileImport::DoAction( MetaPolyLineAction& rAct )
         mnLineWidth = nNewLineWidth;
         maLineJoin = rLineInfo.GetLineJoin();
         maLineCap = rLineInfo.GetLineCap();
-        maDash = XDash(XDASH_RECT,
+        maDash = XDash(css::drawing::DashStyle_RECT,
             rLineInfo.GetDotCount(), rLineInfo.GetDotLen(),
             rLineInfo.GetDashCount(), rLineInfo.GetDashLen(),
             rLineInfo.GetDistance());
diff --git a/svx/source/unodraw/XPropertyTable.cxx b/svx/source/unodraw/XPropertyTable.cxx
index 417e4737efd8..b6df02f8d21f 100644
--- a/svx/source/unodraw/XPropertyTable.cxx
+++ b/svx/source/unodraw/XPropertyTable.cxx
@@ -432,7 +432,7 @@ XPropertyEntry* SvxUnoXDashTable::getEntry( const OUString& rName, const uno::An
 
     XDash aXDash;
 
-    aXDash.SetDashStyle((XDashStyle)((sal_uInt16)(aLineDash.Style)));
+    aXDash.SetDashStyle((css::drawing::DashStyle)((sal_uInt16)(aLineDash.Style)));
     aXDash.SetDots(aLineDash.Dots);
     aXDash.SetDotLen(aLineDash.DotLen);
     aXDash.SetDashes(aLineDash.Dashes);
diff --git a/svx/source/xoutdev/xattr.cxx b/svx/source/xoutdev/xattr.cxx
index fcfc46ac0af5..803178dee42f 100644
--- a/svx/source/xoutdev/xattr.cxx
+++ b/svx/source/xoutdev/xattr.cxx
@@ -425,7 +425,7 @@ sal_uInt16 XLineStyleItem::GetValueCount() const
     return 3;
 }
 
-XDash::XDash(XDashStyle eTheDash, sal_uInt16 nTheDots, sal_uIntPtr nTheDotLen,
+XDash::XDash(css::drawing::DashStyle eTheDash, sal_uInt16 nTheDots, sal_uIntPtr nTheDotLen,
              sal_uInt16 nTheDashes, sal_uIntPtr nTheDashLen, sal_uIntPtr nTheDistance) :
     eDash(eTheDash),
     nDots(nTheDots),
@@ -462,7 +462,7 @@ double XDash::CreateDotDashArray(::std::vector< double >& rDotDashArray, double
     double fSingleDashLen = (double)GetDashLen();
     double fSingleDotLen = (double)GetDotLen();
 
-    if(GetDashStyle() == XDASH_RECTRELATIVE || GetDashStyle() == XDASH_ROUNDRELATIVE)
+    if(GetDashStyle() == css::drawing::DashStyle_RECTRELATIVE || GetDashStyle() == css::drawing::DashStyle_ROUNDRELATIVE)
     {
         if(fLineWidth != 0.0)
         {
@@ -662,7 +662,7 @@ XLineDashItem::XLineDashItem(SvStream& rIn) :
         sal_uInt32  nLTemp;
         sal_Int32   nITemp;
 
-        rIn.ReadInt32( nITemp ); aDash.SetDashStyle((XDashStyle)nITemp);
+        rIn.ReadInt32( nITemp ); aDash.SetDashStyle((css::drawing::DashStyle)nITemp);
         rIn.ReadUInt16( nSTemp ); aDash.SetDots(nSTemp);
         rIn.ReadUInt32( nLTemp ); aDash.SetDotLen(nLTemp);
         rIn.ReadUInt16( nSTemp ); aDash.SetDashes(nSTemp);
@@ -868,7 +868,7 @@ bool XLineDashItem::PutValue( const ::com::sun::star::uno::Any& rVal, sal_uInt8
                 {
                     XDash aXDash;
 
-                    aXDash.SetDashStyle((XDashStyle)((sal_uInt16)(aLineDash.Style)));
+                    aXDash.SetDashStyle((css::drawing::DashStyle)((sal_uInt16)(aLineDash.Style)));
                     aXDash.SetDots(aLineDash.Dots);
                     aXDash.SetDotLen(aLineDash.DotLen);
                     aXDash.SetDashes(aLineDash.Dashes);
@@ -904,7 +904,7 @@ bool XLineDashItem::PutValue( const ::com::sun::star::uno::Any& rVal, sal_uInt8
 
             XDash aXDash;
 
-            aXDash.SetDashStyle((XDashStyle)((sal_uInt16)(aLineDash.Style)));
+            aXDash.SetDashStyle((css::drawing::DashStyle)((sal_uInt16)(aLineDash.Style)));
             aXDash.SetDots(aLineDash.Dots);
             aXDash.SetDotLen(aLineDash.DotLen);
             aXDash.SetDashes(aLineDash.Dashes);
@@ -925,7 +925,7 @@ bool XLineDashItem::PutValue( const ::com::sun::star::uno::Any& rVal, sal_uInt8
                 return false;
 
             XDash aXDash = GetDashValue();
-            aXDash.SetDashStyle((XDashStyle)((sal_uInt16)(nVal)));
+            aXDash.SetDashStyle((css::drawing::DashStyle)((sal_uInt16)(nVal)));
 
             if((0 == aXDash.GetDots()) && (0 == aXDash.GetDashes()))
                 aXDash.SetDots(1);
diff --git a/svx/source/xoutdev/xtabdash.cxx b/svx/source/xoutdev/xtabdash.cxx
index 47dacc287fdb..129490a8b82a 100644
--- a/svx/source/xoutdev/xtabdash.cxx
+++ b/svx/source/xoutdev/xtabdash.cxx
@@ -72,9 +72,9 @@ bool XDashList::Create()
 {
     const OUString aStr(SVX_RESSTR(RID_SVXSTR_LINESTYLE));
 
-    Insert(new XDashEntry(XDash(XDASH_RECT,1, 50,1, 50, 50),aStr + " 1"));
-    Insert(new XDashEntry(XDash(XDASH_RECT,1,500,1,500,500),aStr + " 2"));
-    Insert(new XDashEntry(XDash(XDASH_RECT,2, 50,3,250,120),aStr + " 3"));
+    Insert(new XDashEntry(XDash(css::drawing::DashStyle_RECT,1, 50,1, 50, 50),aStr + " 1"));
+    Insert(new XDashEntry(XDash(css::drawing::DashStyle_RECT,1,500,1,500,500),aStr + " 2"));
+    Insert(new XDashEntry(XDash(css::drawing::DashStyle_RECT,2, 50,3,250,120),aStr + " 3"));
 
     return true;
 }