diff options
| author | Noel Grandin <noel@peralex.com> | 2016-05-27 09:43:22 +0200 |
|---|---|---|
| committer | Noel Grandin <noelgrandin@gmail.com> | 2016-05-27 12:59:23 +0000 |
| commit | 850a8d27ca696f18ce0c529346f8bb8505499545 (patch) | |
| tree | 5641e81912760029683e1c544e01af25eee23523 /vcl/source/filter | |
| parent | 6c974272423ca19c94d8d5e182fec46836309d60 (diff) | |
Convert GRAPHIC to scoped enum
Change-Id: I1fd09a729cbda00f99841532e0dd3fa66bce7bea
Reviewed-on: https://gerrit.libreoffice.org/25534
Tested-by: Jenkins <ci@libreoffice.org>
Reviewed-by: Noel Grandin <noelgrandin@gmail.com>
Diffstat (limited to 'vcl/source/filter')
| -rw-r--r-- | vcl/source/filter/graphicfilter.cxx | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/vcl/source/filter/graphicfilter.cxx b/vcl/source/filter/graphicfilter.cxx index 2fc190ba9110..aff8f04c9855 100644 --- a/vcl/source/filter/graphicfilter.cxx +++ b/vcl/source/filter/graphicfilter.cxx @@ -821,7 +821,7 @@ static Graphic ImpGetScaledGraphic( const Graphic& rGraphic, FilterConfigItem& r sal_Int32 nLogicalWidth = rConfigItem.ReadInt32( "LogicalWidth", 0 ); sal_Int32 nLogicalHeight = rConfigItem.ReadInt32( "LogicalHeight", 0 ); - if ( rGraphic.GetType() != GRAPHIC_NONE ) + if ( rGraphic.GetType() != GraphicType::NONE ) { sal_Int32 nMode = rConfigItem.ReadInt32( "ExportMode", -1 ); @@ -843,7 +843,7 @@ static Graphic ImpGetScaledGraphic( const Graphic& rGraphic, FilterConfigItem& r nLogicalWidth = aOriginalSize.Width(); if ( !nLogicalHeight ) nLogicalHeight = aOriginalSize.Height(); - if( rGraphic.GetType() == GRAPHIC_BITMAP ) + if( rGraphic.GetType() == GraphicType::Bitmap ) { // Resolution is set @@ -1879,7 +1879,7 @@ sal_uInt16 GraphicFilter::ExportGraphic( const Graphic& rGraphic, const OUString if( pConfig->IsExportPixelFormat( nFormat ) ) { - if( eType != GRAPHIC_BITMAP ) + if( eType != GraphicType::Bitmap ) { Size aSizePixel; sal_uLong nColorCount,nBitsPerPixel,nNeededMem,nMaxMem; @@ -2183,7 +2183,7 @@ IMPL_LINK_TYPED( GraphicFilter, FilterCallback, ConvertData&, rData, bool ) default: break; } - if( GRAPHIC_NONE == rData.maGraphic.GetType() || rData.maGraphic.GetContext() ) // Import + if( GraphicType::NONE == rData.maGraphic.GetType() || rData.maGraphic.GetContext() ) // Import { // Import nFormat = GetImportFormatNumberForShortName( OStringToOUString( aShortName, RTL_TEXTENCODING_UTF8) ); |