diff options
| author | Noel Grandin <noel@peralex.com> | 2015-02-27 08:45:34 +0200 |
|---|---|---|
| committer | Noel Grandin <noel@peralex.com> | 2015-03-02 08:59:17 +0200 |
| commit | 019ab2b00fb022383eaa85e6be66d97504587088 (patch) | |
| tree | bad7d8ce3da93f9a0bf283e80ebff1681c0a8c47 /filter | |
| parent | 6d729943c8c355ab6c172271004a20c633ab22e0 (diff) | |
convert GFF_ constants to enum class
Change-Id: I88469e8d6afb3fcefdaf285a56b7acd576bc8520
Diffstat (limited to 'filter')
| -rw-r--r-- | filter/source/msfilter/escherex.cxx | 18 |
1 files changed, 9 insertions, 9 deletions
diff --git a/filter/source/msfilter/escherex.cxx b/filter/source/msfilter/escherex.cxx index 4c33d210f778..700c9f753aef 100644 --- a/filter/source/msfilter/escherex.cxx +++ b/filter/source/msfilter/escherex.cxx @@ -1585,18 +1585,18 @@ bool EscherPropertyContainer::CreateGraphicProperties( INetURLObject aTmp( aGraphicUrl ); GraphicDescriptor aDescriptor(aTmp); aDescriptor.Detect(); - const sal_uInt16 nFormat = aDescriptor.GetFileFormat(); + const GraphicFileFormat nFormat = aDescriptor.GetFileFormat(); // can MSO handle it? if ( bMirrored || nAngle || nTransparency || nRed || nGreen || nBlue || (1.0 != fGamma) || - (nFormat != GFF_BMP && - nFormat != GFF_GIF && - nFormat != GFF_JPG && - nFormat != GFF_PNG && - nFormat != GFF_TIF && - nFormat != GFF_PCT && - nFormat != GFF_WMF && - nFormat != GFF_EMF) ) + (nFormat != GraphicFileFormat::BMP && + nFormat != GraphicFileFormat::GIF && + nFormat != GraphicFileFormat::JPG && + nFormat != GraphicFileFormat::PNG && + nFormat != GraphicFileFormat::TIF && + nFormat != GraphicFileFormat::PCT && + nFormat != GraphicFileFormat::WMF && + nFormat != GraphicFileFormat::EMF) ) { boost::scoped_ptr<SvStream> pIn(::utl::UcbStreamHelper::CreateStream( aTmp.GetMainURL( INetURLObject::NO_DECODE ), StreamMode::READ )); |