diff options
| author | Noel Grandin <noel@peralex.com> | 2016-08-17 11:45:33 +0200 |
|---|---|---|
| committer | Noel Grandin <noel@peralex.com> | 2016-08-18 08:49:02 +0200 |
| commit | 6e81c5829702d49b434788be33b687bb3f282b15 (patch) | |
| tree | 14b1f804428af56b1e283ae16d4ea0330f65a0be /svx | |
| parent | 7232f03f9a74cc839710d4355470963610aff21d (diff) | |
convert XBitmapType to scoped enum
Change-Id: I749831dfb78c10f3f7b9ebed6a5ee296ba6b2886
Diffstat (limited to 'svx')
| -rw-r--r-- | svx/source/xoutdev/xattrbmp.cxx | 12 |
1 files changed, 6 insertions, 6 deletions
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]; |