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 /slideshow/source | |
| 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 'slideshow/source')
| -rw-r--r-- | slideshow/source/engine/shapes/gdimtftools.cxx | 2 | ||||
| -rw-r--r-- | slideshow/source/engine/shapes/shapeimporter.cxx | 4 |
2 files changed, 3 insertions, 3 deletions
diff --git a/slideshow/source/engine/shapes/gdimtftools.cxx b/slideshow/source/engine/shapes/gdimtftools.cxx index ae5997d2ff71..eb633515cc21 100644 --- a/slideshow/source/engine/shapes/gdimtftools.cxx +++ b/slideshow/source/engine/shapes/gdimtftools.cxx @@ -133,7 +133,7 @@ public: Graphic aGraphic( mxGraphic ); - if( aGraphic.GetType() == GRAPHIC_BITMAP || + if( aGraphic.GetType() == GraphicType::Bitmap || (bForeignSource && hasUnsupportedActions(aGraphic.GetGDIMetaFile()) ) ) { diff --git a/slideshow/source/engine/shapes/shapeimporter.cxx b/slideshow/source/engine/shapes/shapeimporter.cxx index 5546d1668672..d8c94189c557 100644 --- a/slideshow/source/engine/shapes/shapeimporter.cxx +++ b/slideshow/source/engine/shapes/shapeimporter.cxx @@ -103,8 +103,8 @@ bool importShapeGraphic( o_rGraphic = GraphicObject( aOldString ); - if( GRAPHIC_DEFAULT == o_rGraphic.GetType() - || GRAPHIC_NONE == o_rGraphic.GetType() ) + if( GraphicType::Default == o_rGraphic.GetType() + || GraphicType::NONE == o_rGraphic.GetType() ) { // even the GrfMgr does not seem to know this graphic return false; |