diff options
author | Noel Grandin <noel.grandin@collabora.co.uk> | 2016-11-21 11:45:50 +0200 |
---|---|---|
committer | Noel Grandin <noel.grandin@collabora.co.uk> | 2016-11-21 12:09:09 +0000 |
commit | beb8cfcf32f855a0fb638caef4782d9d867e3102 (patch) | |
tree | 23b5a2376ecacc2977c3ce5f3a2be182abb05b3b /svx/source/gallery2 | |
parent | 2b14fb3a4f92b928f0a5fc536c6a5f4a6e51a9b8 (diff) |
convert inventorId to scoped enum
SW_DRAWLAYER had the same value as SC_DRAWLAYER, so I merged it into the
ScOrSwDraw enum constant
Change-Id: I5c45d378c00364d11cc960c9e48a6e3f10928724
Reviewed-on: https://gerrit.libreoffice.org/31037
Tested-by: Jenkins <ci@libreoffice.org>
Reviewed-by: Noel Grandin <noel.grandin@collabora.co.uk>
Diffstat (limited to 'svx/source/gallery2')
-rw-r--r-- | svx/source/gallery2/galmisc.cxx | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/svx/source/gallery2/galmisc.cxx b/svx/source/gallery2/galmisc.cxx index e8976066af13..86b00d8d4bcb 100644 --- a/svx/source/gallery2/galmisc.cxx +++ b/svx/source/gallery2/galmisc.cxx @@ -79,7 +79,7 @@ BitmapEx GalleryResGetBitmapEx( sal_uInt32 nId ) IMPL_STATIC_LINK( SgaUserDataFactory, MakeUserData, SdrObjUserDataCreatorParams, aParams, SdrObjUserData* ) { - if ( aParams.nInventor == IV_IMAPINFO && aParams.nObjIdentifier == ID_IMAPINFO ) + if ( aParams.nInventor == SdrInventor::SgaImap && aParams.nObjIdentifier == ID_IMAPINFO ) return new SgaIMapInfo; return nullptr; } @@ -172,7 +172,7 @@ bool CreateIMapGraphic( const FmFormModel& rModel, Graphic& rGraphic, ImageMap& { const SdrObjUserData* pUserData = pObj->GetUserData( i ); - if ( ( pUserData->GetInventor() == IV_IMAPINFO ) && ( pUserData->GetId() == ID_IMAPINFO ) ) + if ( ( pUserData->GetInventor() == SdrInventor::SgaImap ) && ( pUserData->GetId() == ID_IMAPINFO ) ) { rGraphic = static_cast<const SdrGrafObj*>( pObj )->GetGraphic(); rImageMap = static_cast<const SgaIMapInfo*>( pUserData )->GetImageMap(); |