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 /drawinglayer/source/processor2d/vclprocessor2d.cxx | |
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 'drawinglayer/source/processor2d/vclprocessor2d.cxx')
-rw-r--r-- | drawinglayer/source/processor2d/vclprocessor2d.cxx | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/drawinglayer/source/processor2d/vclprocessor2d.cxx b/drawinglayer/source/processor2d/vclprocessor2d.cxx index 67625c0b85a4..0d5c1186878c 100644 --- a/drawinglayer/source/processor2d/vclprocessor2d.cxx +++ b/drawinglayer/source/processor2d/vclprocessor2d.cxx @@ -442,7 +442,7 @@ namespace drawinglayer // // when graphic is animated, force decomposition to use the correct graphic, else // fill style will not be animated - if(GRAPHIC_BITMAP == rFillGraphicAttribute.getGraphic().GetType() + if(GraphicType::Bitmap == rFillGraphicAttribute.getGraphic().GetType() && !rFillGraphicAttribute.getGraphic().getSvgData().get() && !rFillGraphicAttribute.getGraphic().IsAnimated()) { @@ -666,12 +666,12 @@ namespace drawinglayer // color (e.g. shadow) switch(rFillGraphicAttribute.getGraphic().GetType()) { - case GRAPHIC_GDIMETAFILE: + case GraphicType::GdiMetafile: { // metafiles are potentially transparent, cannot optimize, not done break; } - case GRAPHIC_BITMAP: + case GraphicType::Bitmap: { if(!rFillGraphicAttribute.getGraphic().IsTransparent() && !rFillGraphicAttribute.getGraphic().IsAlpha()) { @@ -738,7 +738,7 @@ namespace drawinglayer } break; } - default: //GRAPHIC_NONE, GRAPHIC_DEFAULT + default: //GraphicType::NONE, GraphicType::Default { // empty graphic, we are done bDone = true; |