mir/libreoffice
2
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

libsvtlo: convert set of #define to enum class

Browse Source 
Change-Id: Iade24fc589e5325bf6fb1a2e5f2d609ddb3f5ec5
Reviewed-on: https://gerrit.libreoffice.org/23544
Tested-by: Jenkins <ci@libreoffice.org>
Reviewed-by: Julien Nabet <serval2412@yahoo.fr>
This commit is contained in:
Douglas Mencken
2016-03-26 18:21:57 -04:00
committed by Julien Nabet
parent df90b5a1c9
commit 1206e59953
1 changed files with 31 additions and 25 deletions
Download Patch File Download Diff File Expand all files Collapse all files

56
svtools/source/graphic/descriptor.cxx
View File

@@ -35,14 +35,19 @@
#include <vcl/svapp.hxx> #include <vcl/svapp.hxx>
#include <memory> #include <memory>
#define UNOGRAPHIC_GRAPHICTYPE 1
#define UNOGRAPHIC_MIMETYPE 2 enum class UnoGraphicProperty
#define UNOGRAPHIC_SIZEPIXEL 3 {
#define UNOGRAPHIC_SIZE100THMM 4 GraphicType = 1
#define UNOGRAPHIC_BITSPERPIXEL 5 , MimeType = 2
#define UNOGRAPHIC_TRANSPARENT 6 , SizePixel = 3
#define UNOGRAPHIC_ALPHA 7 , Size100thMM = 4
#define UNOGRAPHIC_ANIMATED 8 , BitsPerPixel = 5
, Transparent = 6
, Alpha = 7
, Animated = 8
};
using namespace ::com::sun::star; using namespace ::com::sun::star;
@@ -259,14 +264,14 @@ uno::Sequence< sal_Int8 > SAL_CALL GraphicDescriptor::getImplementationId()
static ::comphelper::PropertyMapEntry const aEntries[] = static ::comphelper::PropertyMapEntry const aEntries[] =
{ {
{ OUString("GraphicType"), UNOGRAPHIC_GRAPHICTYPE, cppu::UnoType<sal_Int8>::get(), beans::PropertyAttribute::READONLY, 0 }, { OUString( "GraphicType" ), static_cast< sal_Int32 >( UnoGraphicProperty::GraphicType ), cppu::UnoType< sal_Int8 >::get(), beans::PropertyAttribute::READONLY, 0 },
{ OUString("MimeType"), UNOGRAPHIC_MIMETYPE, cppu::UnoType<OUString>::get(), beans::PropertyAttribute::READONLY, 0 }, { OUString( "MimeType" ), static_cast< sal_Int32 >( UnoGraphicProperty::MimeType ), cppu::UnoType< OUString >::get(), beans::PropertyAttribute::READONLY, 0 },
{ OUString("SizePixel"), UNOGRAPHIC_SIZEPIXEL, cppu::UnoType<awt::Size>::get(), beans::PropertyAttribute::READONLY, 0 }, { OUString( "SizePixel" ), static_cast< sal_Int32 >( UnoGraphicProperty::SizePixel ), cppu::UnoType< awt::Size >::get(), beans::PropertyAttribute::READONLY, 0 },
{ OUString("Size100thMM"), UNOGRAPHIC_SIZE100THMM, cppu::UnoType<awt::Size>::get(), beans::PropertyAttribute::READONLY, 0 }, { OUString( "Size100thMM" ), static_cast< sal_Int32 >( UnoGraphicProperty::Size100thMM ), cppu::UnoType< awt::Size >::get(), beans::PropertyAttribute::READONLY, 0 },
{ OUString("BitsPerPixel"), UNOGRAPHIC_BITSPERPIXEL, cppu::UnoType<sal_uInt8>::get(), beans::PropertyAttribute::READONLY, 0 }, { OUString( "BitsPerPixel" ), static_cast< sal_Int32 >( UnoGraphicProperty::BitsPerPixel ), cppu::UnoType< sal_uInt8 >::get(), beans::PropertyAttribute::READONLY, 0 },
{ OUString("Transparent"), UNOGRAPHIC_TRANSPARENT, cppu::UnoType<sal_Bool>::get(), beans::PropertyAttribute::READONLY, 0 }, { OUString( "Transparent" ), static_cast< sal_Int32 >( UnoGraphicProperty::Transparent ), cppu::UnoType< sal_Bool >::get(), beans::PropertyAttribute::READONLY, 0 },
{ OUString("Alpha"), UNOGRAPHIC_ALPHA, cppu::UnoType<sal_Bool>::get(), beans::PropertyAttribute::READONLY, 0 }, { OUString( "Alpha" ), static_cast< sal_Int32 >( UnoGraphicProperty::Alpha ), cppu::UnoType< sal_Bool >::get(), beans::PropertyAttribute::READONLY, 0 },
{ OUString("Animated"), UNOGRAPHIC_ANIMATED, cppu::UnoType<sal_Bool>::get(), beans::PropertyAttribute::READONLY, 0 }, { OUString( "Animated" ), static_cast< sal_Int32 >( UnoGraphicProperty::Animated ), cppu::UnoType< sal_Bool >::get(), beans::PropertyAttribute::READONLY, 0 },
{ OUString(), 0, css::uno::Type(), 0, 0 } { OUString(), 0, css::uno::Type(), 0, 0 }
}; };
@@ -294,9 +299,10 @@ void GraphicDescriptor::_getPropertyValues( const comphelper::PropertyMapEntry**
while( *ppEntries ) while( *ppEntries )
{ {
switch( (*ppEntries)->mnHandle ) UnoGraphicProperty theProperty = static_cast< UnoGraphicProperty >( (*ppEntries)->mnHandle );
switch( theProperty )
{ {
case UNOGRAPHIC_GRAPHICTYPE: case UnoGraphicProperty::GraphicType:
{ {
const GraphicType eType( mpGraphic ? mpGraphic->GetType() : meType ); const GraphicType eType( mpGraphic ? mpGraphic->GetType() : meType );
@@ -306,7 +312,7 @@ void GraphicDescriptor::_getPropertyValues( const comphelper::PropertyMapEntry**
} }
break; break;
case UNOGRAPHIC_MIMETYPE: case UnoGraphicProperty::MimeType:
{ {
OUString aMimeType; OUString aMimeType;
@@ -351,7 +357,7 @@ void GraphicDescriptor::_getPropertyValues( const comphelper::PropertyMapEntry**
} }
break; break;
case UNOGRAPHIC_SIZEPIXEL: case UnoGraphicProperty::SizePixel:
{ {
awt::Size aAWTSize( 0, 0 ); awt::Size aAWTSize( 0, 0 );
@@ -370,7 +376,7 @@ void GraphicDescriptor::_getPropertyValues( const comphelper::PropertyMapEntry**
} }
break; break;
case UNOGRAPHIC_SIZE100THMM: case UnoGraphicProperty::Size100thMM:
{ {
awt::Size aAWTSize( 0, 0 ); awt::Size aAWTSize( 0, 0 );
@@ -389,7 +395,7 @@ void GraphicDescriptor::_getPropertyValues( const comphelper::PropertyMapEntry**
} }
break; break;
case UNOGRAPHIC_BITSPERPIXEL: case UnoGraphicProperty::BitsPerPixel:
{ {
sal_uInt16 nBitsPerPixel = 0; sal_uInt16 nBitsPerPixel = 0;
@@ -405,19 +411,19 @@ void GraphicDescriptor::_getPropertyValues( const comphelper::PropertyMapEntry**
} }
break; break;
case UNOGRAPHIC_TRANSPARENT: case UnoGraphicProperty::Transparent:
{ {
*pValues <<= mpGraphic ? mpGraphic->IsTransparent() : mbTransparent; *pValues <<= mpGraphic ? mpGraphic->IsTransparent() : mbTransparent;
} }
break; break;
case UNOGRAPHIC_ALPHA: case UnoGraphicProperty::Alpha:
{ {
*pValues <<= mpGraphic ? mpGraphic->IsAlpha() : mbAlpha; *pValues <<= mpGraphic ? mpGraphic->IsAlpha() : mbAlpha;
} }
break; break;
case UNOGRAPHIC_ANIMATED: case UnoGraphicProperty::Animated:
{ {
*pValues <<= mpGraphic ? mpGraphic->IsAnimated() : mbAnimated; *pValues <<= mpGraphic ? mpGraphic->IsAnimated() : mbAnimated;
} }