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

Removed XHatchStyle

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

5 files changed, 20 insertions, 20 deletions

diff --git a/svx/source/sdr/primitive2d/sdrattributecreator.cxx b/svx/source/sdr/primitive2d/sdrattributecreator.cxx
index 94db008d6b49..5b657c359368 100644
--- a/svx/source/sdr/primitive2d/sdrattributecreator.cxx
+++ b/svx/source/sdr/primitive2d/sdrattributecreator.cxx
@@ -113,21 +113,21 @@ namespace drawinglayer
             }
         }
 
-        attribute::HatchStyle XHatchStyleToHatchStyle(XHatchStyle eStyle)
+        attribute::HatchStyle XHatchStyleToHatchStyle(css::drawing::HatchStyle eStyle)
         {
             switch(eStyle)
             {
-                case XHATCH_SINGLE :
+                case css::drawing::HatchStyle_SINGLE :
                 {
                     return attribute::HATCHSTYLE_SINGLE;
                 }
-                case XHATCH_DOUBLE :
+                case css::drawing::HatchStyle_DOUBLE :
                 {
                     return attribute::HATCHSTYLE_DOUBLE;
                 }
                 default :
                 {
-                    return attribute::HATCHSTYLE_TRIPLE; // XHATCH_TRIPLE
+                    return attribute::HATCHSTYLE_TRIPLE; // css::drawing::HatchStyle_TRIPLE
                 }
             }
         }
diff --git a/svx/source/svdraw/svdfmtf.cxx b/svx/source/svdraw/svdfmtf.cxx
index 391364bdb045..b0991ab9a9ff 100644
--- a/svx/source/svdraw/svdfmtf.cxx
+++ b/svx/source/svdraw/svdfmtf.cxx
@@ -1139,25 +1139,25 @@ void ImpSdrGDIMetaFileImport::DoAction( MetaHatchAction& rAct )
             SdrPathObj* pPath = new SdrPathObj(OBJ_POLY, aSource);
             // #i125211# Use the ranges from the SdrObject to create a new empty SfxItemSet
             SfxItemSet aHatchAttr(mpModel->GetItemPool(), pPath->GetMergedItemSet().GetRanges());
-            XHatchStyle eStyle;
+            css::drawing::HatchStyle eStyle;
 
             switch(rHatch.GetStyle())
             {
                 case(HATCH_TRIPLE) :
                 {
-                    eStyle = XHATCH_TRIPLE;
+                    eStyle = css::drawing::HatchStyle_TRIPLE;
                     break;
                 }
 
                 case(HATCH_DOUBLE) :
                 {
-                    eStyle = XHATCH_DOUBLE;
+                    eStyle = css::drawing::HatchStyle_DOUBLE;
                     break;
                 }
 
                 default:
                 {
-                    eStyle = XHATCH_SINGLE;
+                    eStyle = css::drawing::HatchStyle_SINGLE;
                     break;
                 }
             }
diff --git a/svx/source/unodraw/XPropertyTable.cxx b/svx/source/unodraw/XPropertyTable.cxx
index 60df2af3014c..6697f7bbd24e 100644
--- a/svx/source/unodraw/XPropertyTable.cxx
+++ b/svx/source/unodraw/XPropertyTable.cxx
@@ -510,7 +510,7 @@ XPropertyEntry* SvxUnoXHatchTable::getEntry( const OUString& rName, const uno::A
         return NULL;
 
     XHatch aXHatch;
-    aXHatch.SetHatchStyle( (XHatchStyle)aUnoHatch.Style );
+    aXHatch.SetHatchStyle( (css::drawing::HatchStyle)aUnoHatch.Style );
     aXHatch.SetColor( aUnoHatch.Color );
     aXHatch.SetDistance( aUnoHatch.Distance );
     aXHatch.SetAngle( aUnoHatch.Angle );
diff --git a/svx/source/xoutdev/xattr.cxx b/svx/source/xoutdev/xattr.cxx
index 87356be82617..06e44c472bc6 100644
--- a/svx/source/xoutdev/xattr.cxx
+++ b/svx/source/xoutdev/xattr.cxx
@@ -2824,7 +2824,7 @@ XFillFloatTransparenceItem* XFillFloatTransparenceItem::checkForUniqueItem( SdrM
     return NULL;
 }
 
-XHatch::XHatch(const Color& rCol, XHatchStyle eTheStyle, long nTheDistance,
+XHatch::XHatch(const Color& rCol, css::drawing::HatchStyle eTheStyle, long nTheDistance,
                long nTheAngle) :
     eStyle(eTheStyle),
     aColor(rCol),
@@ -2868,7 +2868,7 @@ XFillHatchItem::XFillHatchItem(SvStream& rIn) :
         sal_Int16  nITemp;
         sal_Int32  nLTemp;
 
-        rIn.ReadInt16( nITemp ); aHatch.SetHatchStyle((XHatchStyle)nITemp);
+        rIn.ReadInt16( nITemp ); aHatch.SetHatchStyle((css::drawing::HatchStyle)nITemp);
         rIn.ReadUInt16( nRed );
         rIn.ReadUInt16( nGreen );
         rIn.ReadUInt16( nBlue );
@@ -3036,7 +3036,7 @@ bool XFillHatchItem::PutValue( const ::com::sun::star::uno::Any& rVal, sal_uInt8
                 SetName( aName );
                 if ( bHatch )
                 {
-                    aHatch.SetHatchStyle( (XHatchStyle)aUnoHatch.Style );
+                    aHatch.SetHatchStyle( (css::drawing::HatchStyle)aUnoHatch.Style );
                     aHatch.SetColor( aUnoHatch.Color );
                     aHatch.SetDistance( aUnoHatch.Distance );
                     aHatch.SetAngle( aUnoHatch.Angle );
@@ -3054,7 +3054,7 @@ bool XFillHatchItem::PutValue( const ::com::sun::star::uno::Any& rVal, sal_uInt8
             if(!(rVal >>= aUnoHatch))
                 return false;
 
-            aHatch.SetHatchStyle( (XHatchStyle)aUnoHatch.Style );
+            aHatch.SetHatchStyle( (css::drawing::HatchStyle)aUnoHatch.Style );
             aHatch.SetColor( aUnoHatch.Color );
             aHatch.SetDistance( aUnoHatch.Distance );
             aHatch.SetAngle( aUnoHatch.Angle );
@@ -3075,7 +3075,7 @@ bool XFillHatchItem::PutValue( const ::com::sun::star::uno::Any& rVal, sal_uInt8
             sal_Int16 nVal = sal_Int16();
             if (!(rVal >>= nVal ))
                 return false;
-            aHatch.SetHatchStyle( (XHatchStyle)nVal );
+            aHatch.SetHatchStyle( (css::drawing::HatchStyle)nVal );
             break;
         }
 
diff --git a/svx/source/xoutdev/xtabhtch.cxx b/svx/source/xoutdev/xtabhtch.cxx
index 2f59801d37fd..ba73c5c7c8b4 100644
--- a/svx/source/xoutdev/xtabhtch.cxx
+++ b/svx/source/xoutdev/xtabhtch.cxx
@@ -71,11 +71,11 @@ bool XHatchList::Create()
     aStr.append(" 1");
 
     sal_Int32 nLen = aStr.getLength() - 1;
-    Insert(new XHatchEntry(XHatch(RGB_Color(COL_BLACK),XHATCH_SINGLE,100,  0),aStr.toString()));
+    Insert(new XHatchEntry(XHatch(RGB_Color(COL_BLACK),css::drawing::HatchStyle_SINGLE,100,  0),aStr.toString()));
     aStr[nLen] = '2';
-    Insert(new XHatchEntry(XHatch(RGB_Color(COL_RED  ),XHATCH_DOUBLE, 80,450),aStr.toString()));
+    Insert(new XHatchEntry(XHatch(RGB_Color(COL_RED  ),css::drawing::HatchStyle_DOUBLE, 80,450),aStr.toString()));
     aStr[nLen] = '3';
-    Insert(new XHatchEntry(XHatch(RGB_Color(COL_BLUE ),XHATCH_TRIPLE,120,  0),aStr.toString()));
+    Insert(new XHatchEntry(XHatch(RGB_Color(COL_BLUE ),css::drawing::HatchStyle_TRIPLE,120,  0),aStr.toString()));
 
     return true;
 }
@@ -100,19 +100,19 @@ Bitmap XHatchList::CreateBitmapForUI( long nIndex )
 
         switch(rHatch.GetHatchStyle())
         {
-            case XHATCH_SINGLE :
+            case css::drawing::HatchStyle_SINGLE :
             {
                 aHatchStyle = drawinglayer::attribute::HATCHSTYLE_SINGLE;
                 break;
             }
-            case XHATCH_DOUBLE :
+            case css::drawing::HatchStyle_DOUBLE :
             {
                 aHatchStyle = drawinglayer::attribute::HATCHSTYLE_DOUBLE;
                 break;
             }
             default :
             {
-                aHatchStyle = drawinglayer::attribute::HATCHSTYLE_TRIPLE; // XHATCH_TRIPLE
+                aHatchStyle = drawinglayer::attribute::HATCHSTYLE_TRIPLE; // css::drawing::HatchStyle_TRIPLE
                 break;
             }
         }