diff options
| author | Noel Grandin <noel@peralex.com> | 2015-04-24 14:53:18 +0200 |
|---|---|---|
| committer | Noel Grandin <noel@peralex.com> | 2015-04-29 10:41:40 +0200 |
| commit | 62f9bc737c928ceed89af09ff927c92bea4896ca (patch) | |
| tree | 0aa7fa567232ff2040c7011bdce1d9ea3bbb87e9 /svx | |
| parent | 336ace7cf0a1b5abf7a56983ed1a7510f9b0d231 (diff) | |
convert SDRGRAPHOBJ constants to scoped enum
Change-Id: Ie1fba429e809ae235b9c2390071b61d8b6d115c9
Diffstat (limited to 'svx')
| -rw-r--r-- | svx/source/svdraw/svdedtv2.cxx | 2 | ||||
| -rw-r--r-- | svx/source/svdraw/svdograf.cxx | 10 |
2 files changed, 6 insertions, 6 deletions
diff --git a/svx/source/svdraw/svdedtv2.cxx b/svx/source/svdraw/svdedtv2.cxx index e2fd8d2df57b..0a60082c2422 100644 --- a/svx/source/svdraw/svdedtv2.cxx +++ b/svx/source/svdraw/svdedtv2.cxx @@ -2006,7 +2006,7 @@ void SdrEditView::DoImportMarkedMtf(SvdProgressInfo *pProgrInfo) if(pGraf->HasGDIMetaFile()) { - aMetaFile = pGraf->GetTransformedGraphic(SDRGRAFOBJ_TRANSFORMATTR_COLOR|SDRGRAFOBJ_TRANSFORMATTR_MIRROR).GetGDIMetaFile(); + aMetaFile = pGraf->GetTransformedGraphic(SdrGrafObjTransformsAttrs::COLOR|SdrGrafObjTransformsAttrs::MIRROR).GetGDIMetaFile(); } else if(pGraf->isEmbeddedSvg()) { diff --git a/svx/source/svdraw/svdograf.cxx b/svx/source/svdraw/svdograf.cxx index b4cf3899dd2e..15df383d7e29 100644 --- a/svx/source/svdraw/svdograf.cxx +++ b/svx/source/svdraw/svdograf.cxx @@ -472,7 +472,7 @@ const Graphic& SdrGrafObj::GetGraphic() const return pGraphic->GetGraphic(); } -Graphic SdrGrafObj::GetTransformedGraphic( sal_uIntPtr nTransformFlags ) const +Graphic SdrGrafObj::GetTransformedGraphic( SdrGrafObjTransformsAttrs nTransformFlags ) const { // Refactored most of the code to GraphicObject, where // everybody can use e.g. the cropping functionality @@ -480,15 +480,15 @@ Graphic SdrGrafObj::GetTransformedGraphic( sal_uIntPtr nTransformFlags ) const GraphicType eType = GetGraphicType(); MapMode aDestMap( pModel->GetScaleUnit(), Point(), pModel->GetScaleFraction(), pModel->GetScaleFraction() ); const Size aDestSize( GetLogicRect().GetSize() ); - const bool bMirror = ( nTransformFlags & SDRGRAFOBJ_TRANSFORMATTR_MIRROR ) != 0; - const bool bRotate = ( ( nTransformFlags & SDRGRAFOBJ_TRANSFORMATTR_ROTATE ) != 0 ) && + const bool bMirror = bool( nTransformFlags & SdrGrafObjTransformsAttrs::MIRROR ); + const bool bRotate = bool( nTransformFlags & SdrGrafObjTransformsAttrs::ROTATE ) && ( aGeo.nRotationAngle && aGeo.nRotationAngle != 18000 ) && ( GRAPHIC_NONE != eType ); // Need cropping info earlier const_cast<SdrGrafObj*>(this)->ImpSetAttrToGrafInfo(); GraphicAttr aActAttr; - if( SDRGRAFOBJ_TRANSFORMATTR_NONE != nTransformFlags && + if( SdrGrafObjTransformsAttrs::NONE != nTransformFlags && GRAPHIC_NONE != eType ) { // Actually transform the graphic only in this case. @@ -1062,7 +1062,7 @@ SdrObject* SdrGrafObj::DoConvertToPolyObj(bool bBezier, bool bAddText ) const } else if(GRAPHIC_GDIMETAFILE == aGraphicType) { - aMtf = GetTransformedGraphic(SDRGRAFOBJ_TRANSFORMATTR_COLOR|SDRGRAFOBJ_TRANSFORMATTR_MIRROR).GetGDIMetaFile(); + aMtf = GetTransformedGraphic(SdrGrafObjTransformsAttrs::COLOR|SdrGrafObjTransformsAttrs::MIRROR).GetGDIMetaFile(); } switch(aGraphicType) |