convert XBitmapType to scoped enum

Change-Id: I749831dfb78c10f3f7b9ebed6a5ee296ba6b2886

5 files changed, 10 insertions, 10 deletions

diff --git a/filter/source/msfilter/msdffimp.cxx b/filter/source/msfilter/msdffimp.cxx
index d613c6c25e0c..d4596a05b083 100644
--- a/filter/source/msfilter/msdffimp.cxx
+++ b/filter/source/msfilter/msdffimp.cxx
@@ -1373,7 +1373,7 @@ void DffPropertyReader::ApplyFillAttributes( SvStream& rIn, SfxItemSet& rSet, co
 
                             XOBitmap aXOBitmap( aBmp );
                             aXOBitmap.Bitmap2Array();
-                            aXOBitmap.SetBitmapType( XBITMAP_8X8 );
+                            aXOBitmap.SetBitmapType( XBitmapType::N8x8 );
                             aXOBitmap.SetPixelSize( aBmp.GetSizePixel() );
 
                             if( aXOBitmap.GetBackgroundColor() == COL_BLACK )
diff --git a/include/svx/xenum.hxx b/include/svx/xenum.hxx
index a849bc56df50..7aa59e0d8620 100644
--- a/include/svx/xenum.hxx
+++ b/include/svx/xenum.hxx
@@ -25,7 +25,7 @@ enum XFormTextStyle     { XFT_ROTATE, XFT_UPRIGHT, XFT_SLANTX, XFT_SLANTY,
                           XFT_NONE };
 enum XFormTextAdjust    { XFT_LEFT, XFT_RIGHT, XFT_AUTOSIZE, XFT_CENTER };
 enum XFormTextShadow    { XFTSHADOW_NONE, XFTSHADOW_NORMAL, XFTSHADOW_SLANT};
-enum XBitmapType        { XBITMAP_IMPORT, XBITMAP_8X8 };
+enum class XBitmapType  { Import, N8x8 };
 
 
 #endif // INCLUDED_SVX_XENUM_HXX
diff --git a/lotuswordpro/source/filter/lwpbackgroundstuff.cxx b/lotuswordpro/source/filter/lwpbackgroundstuff.cxx
index a32d5d22e70c..61931688013e 100644
--- a/lotuswordpro/source/filter/lwpbackgroundstuff.cxx
+++ b/lotuswordpro/source/filter/lwpbackgroundstuff.cxx
@@ -123,7 +123,7 @@ XFBGImage* LwpBackgroundStuff::GetFillPattern()
     // create XOBitmap object from bitmap object
     XOBitmap aXOBitmap( aBmp );
     aXOBitmap.Bitmap2Array();
-    aXOBitmap.SetBitmapType( XBITMAP_8X8 );
+    aXOBitmap.SetBitmapType( XBitmapType::N8x8 );
 
     // set back/fore-ground colors
     if (m_aFillColor.IsValidColor() && m_aPatternColor.IsValidColor())
diff --git a/sc/source/filter/excel/xiescher.cxx b/sc/source/filter/excel/xiescher.cxx
index e22d69a195e7..4df47f1a8042 100644
--- a/sc/source/filter/excel/xiescher.cxx
+++ b/sc/source/filter/excel/xiescher.cxx
@@ -715,7 +715,7 @@ void XclImpDrawObjBase::ConvertFillStyle( SdrObject& rSdrObj, const XclObjFillDa
 
             XOBitmap aXOBitmap( aBitmap );
             aXOBitmap.Bitmap2Array();
-            aXOBitmap.SetBitmapType( XBITMAP_8X8 );
+            aXOBitmap.SetBitmapType( XBitmapType::N8x8 );
             if( aXOBitmap.GetBackgroundColor().GetColor() == COL_BLACK )
                 ::std::swap( aPattColor, aBackColor );
             aXOBitmap.SetPixelColor( aPattColor );
diff --git a/svx/source/xoutdev/xattrbmp.cxx b/svx/source/xoutdev/xattrbmp.cxx
index 86bcf178d8e7..0382f829f79c 100644
--- a/svx/source/xoutdev/xattrbmp.cxx
+++ b/svx/source/xoutdev/xattrbmp.cxx
@@ -45,7 +45,7 @@
 using namespace ::com::sun::star;
 
 XOBitmap::XOBitmap( const Bitmap& rBmp ) :
-    eType           ( XBITMAP_IMPORT ),
+    eType           ( XBitmapType::Import ),
     aGraphicObject  ( rBmp ),
     pPixelArray     ( nullptr ),
     bGraphicDirty   ( false )
@@ -64,7 +64,7 @@ XOBitmap::XOBitmap( const XOBitmap& rXBmp ) :
 
     if( rXBmp.pPixelArray )
     {
-        if( eType == XBITMAP_8X8 )
+        if( eType == XBitmapType::N8x8 )
         {
             pPixelArray = new sal_uInt16[ 64 ];
 
@@ -90,7 +90,7 @@ XOBitmap& XOBitmap::operator=( const XOBitmap& rXBmp )
 
     if( rXBmp.pPixelArray )
     {
-        if( eType == XBITMAP_8X8 )
+        if( eType == XBitmapType::N8x8 )
         {
             pPixelArray = new sal_uInt16[ 64 ];
 
@@ -278,16 +278,16 @@ XFillBitmapItem::XFillBitmapItem(SvStream& rIn, sal_uInt16 nVer)
             sal_Int16 iTmp;
 
             rIn.ReadInt16( iTmp ); // former XBitmapStyle
-            rIn.ReadInt16( iTmp ); // former XBitmapType
+            rIn.ReadInt16( iTmp ); // XBitmapType
 
-            if(XBITMAP_IMPORT == iTmp)
+            if(XBitmapType::Import == (XBitmapType)iTmp)
             {
                 Bitmap aBmp;
 
                 ReadDIB(aBmp, rIn, true);
                 maGraphicObject = Graphic(aBmp);
             }
-            else if(XBITMAP_8X8 == iTmp)
+            else if(XBitmapType::N8x8 == (XBitmapType)iTmp)
             {
                 sal_uInt16 aArray[64];