From 850a8d27ca696f18ce0c529346f8bb8505499545 Mon Sep 17 00:00:00 2001 From: Noel Grandin Date: Fri, 27 May 2016 09:43:22 +0200 Subject: Convert GRAPHIC to scoped enum Change-Id: I1fd09a729cbda00f99841532e0dd3fa66bce7bea Reviewed-on: https://gerrit.libreoffice.org/25534 Tested-by: Jenkins Reviewed-by: Noel Grandin --- editeng/source/items/bulitem.cxx | 4 ++-- editeng/source/items/frmitems.cxx | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) (limited to 'editeng') diff --git a/editeng/source/items/bulitem.cxx b/editeng/source/items/bulitem.cxx index ab3f87d323f6..36c7b35b5669 100644 --- a/editeng/source/items/bulitem.cxx +++ b/editeng/source/items/bulitem.cxx @@ -271,7 +271,7 @@ SvStream& SvxBulletItem::Store( SvStream& rStrm, sal_uInt16 /*nItemVersion*/ ) c { // Correction for empty bitmap if( ( nStyle == SvxBulletStyle::BMP ) && - ( !pGraphicObject || ( GRAPHIC_NONE == pGraphicObject->GetType() ) || ( GRAPHIC_DEFAULT == pGraphicObject->GetType() ) ) ) + ( !pGraphicObject || ( GraphicType::NONE == pGraphicObject->GetType() ) || ( GraphicType::Default == pGraphicObject->GetType() ) ) ) { if( pGraphicObject ) { @@ -364,7 +364,7 @@ const GraphicObject& SvxBulletItem::GetGraphicObject() const void SvxBulletItem::SetGraphicObject( const GraphicObject& rGraphicObject ) { - if( ( GRAPHIC_NONE == rGraphicObject.GetType() ) || ( GRAPHIC_DEFAULT == rGraphicObject.GetType() ) ) + if( ( GraphicType::NONE == rGraphicObject.GetType() ) || ( GraphicType::Default == rGraphicObject.GetType() ) ) { if( pGraphicObject ) { diff --git a/editeng/source/items/frmitems.cxx b/editeng/source/items/frmitems.cxx index 00a41e259c68..f9766975bc11 100644 --- a/editeng/source/items/frmitems.cxx +++ b/editeng/source/items/frmitems.cxx @@ -3829,7 +3829,7 @@ const GraphicObject* SvxBrushItem::GetGraphicObject(OUString const & referer) co } // tdf#94088 when we got a graphic, set it - if(bGraphicLoaded && GRAPHIC_NONE != aGraphic.GetType()) + if(bGraphicLoaded && GraphicType::NONE != aGraphic.GetType()) { pImpl->pGraphicObject = new GraphicObject; pImpl->pGraphicObject->SetGraphic( aGraphic ); -- cgit