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 /sd/inc | |
| 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 'sd/inc')
| -rw-r--r-- | sd/inc/glob.hxx | 6 | ||||
| -rw-r--r-- | sd/inc/imapinfo.hxx | 6 |
2 files changed, 3 insertions, 9 deletions
diff --git a/sd/inc/glob.hxx b/sd/inc/glob.hxx index 6f66420624a1..f5c5ebc59dba 100644 --- a/sd/inc/glob.hxx +++ b/sd/inc/glob.hxx @@ -43,12 +43,6 @@ #define SD_IF_SDTOOLPANELSHELL SFX_INTERFACE_SD_START + 30 -// Inventor-Id for StarDraw UserData -const sal_uInt32 SdUDInventor=sal_uInt32('S')*0x00000001+ - sal_uInt32('D')*0x00000100+ - sal_uInt32('U')*0x00010000+ - sal_uInt32('D')*0x01000000; - // Object-Ids for StarDraw UserData #define SD_ANIMATIONINFO_ID 1 #define SD_IMAPINFO_ID 2 diff --git a/sd/inc/imapinfo.hxx b/sd/inc/imapinfo.hxx index b07d99a530ef..665a68f33b06 100644 --- a/sd/inc/imapinfo.hxx +++ b/sd/inc/imapinfo.hxx @@ -32,14 +32,14 @@ class SdIMapInfo : public SdrObjUserData, public SfxListener public: SdIMapInfo() : - SdrObjUserData( SdUDInventor, SD_IMAPINFO_ID ) {}; + SdrObjUserData( SdrInventor::StarDrawUserData, SD_IMAPINFO_ID ) {}; SdIMapInfo( const ImageMap& rImageMap ) : - SdrObjUserData( SdUDInventor, SD_IMAPINFO_ID ), + SdrObjUserData( SdrInventor::StarDrawUserData, SD_IMAPINFO_ID ), aImageMap( rImageMap ) {}; SdIMapInfo( const SdIMapInfo& rIMapInfo ) : - SdrObjUserData( SdUDInventor, SD_IMAPINFO_ID ), + SdrObjUserData( SdrInventor::StarDrawUserData, SD_IMAPINFO_ID ), SfxListener(), aImageMap( rIMapInfo.aImageMap ) {}; |