From 019ab2b00fb022383eaa85e6be66d97504587088 Mon Sep 17 00:00:00 2001
From: Noel Grandin <noel@peralex.com>
Date: Fri, 27 Feb 2015 08:45:34 +0200
Subject: convert GFF_ constants to enum class

Change-Id: I88469e8d6afb3fcefdaf285a56b7acd576bc8520
---
 filter/source/msfilter/escherex.cxx | 18 +++++++++---------
 1 file changed, 9 insertions(+), 9 deletions(-)

(limited to 'filter')

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 ));
-- 
cgit