From beb8cfcf32f855a0fb638caef4782d9d867e3102 Mon Sep 17 00:00:00 2001 From: Noel Grandin Date: Mon, 21 Nov 2016 11:45:50 +0200 Subject: 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 Reviewed-by: Noel Grandin --- sd/inc/glob.hxx | 6 ------ sd/inc/imapinfo.hxx | 6 +++--- 2 files changed, 3 insertions(+), 9 deletions(-) (limited to 'sd/inc') 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 ) {}; -- cgit