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 /reportdesign/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 'reportdesign/inc')
| -rw-r--r-- | reportdesign/inc/RptDef.hxx | 5 | ||||
| -rw-r--r-- | reportdesign/inc/RptObject.hxx | 6 |
2 files changed, 3 insertions, 8 deletions
diff --git a/reportdesign/inc/RptDef.hxx b/reportdesign/inc/RptDef.hxx index 41c7ea6b77a6..329012368c10 100644 --- a/reportdesign/inc/RptDef.hxx +++ b/reportdesign/inc/RptDef.hxx @@ -49,11 +49,6 @@ namespace rptui #define RPT_LAYER_HIDDEN 2 -const sal_uInt32 ReportInventor = sal_uInt32('R')*0x00000001+ - sal_uInt32('P')*0x00000100+ - sal_uInt32('T')*0x00010000+ - sal_uInt32('1')*0x01000000; - #define OBJ_DLG_FIXEDTEXT ((sal_uInt16) OBJ_MAXI + 1) #define OBJ_DLG_IMAGECONTROL OBJ_FM_IMAGECONTROL diff --git a/reportdesign/inc/RptObject.hxx b/reportdesign/inc/RptObject.hxx index 105273f03827..6a41ea967602 100644 --- a/reportdesign/inc/RptObject.hxx +++ b/reportdesign/inc/RptObject.hxx @@ -151,7 +151,7 @@ public: virtual css::uno::Reference< css::uno::XInterface > getUnoShape() override; virtual sal_uInt16 GetObjIdentifier() const override; - virtual sal_uInt32 GetObjInventor() const override; + virtual SdrInventor GetObjInventor() const override; private: virtual void impl_setUnoShape( const css::uno::Reference< css::uno::XInterface >& rxUnoShape ) override; @@ -195,7 +195,7 @@ public: virtual css::uno::Reference< css::uno::XInterface > getUnoShape() override; virtual sal_uInt16 GetObjIdentifier() const override; - virtual sal_uInt32 GetObjInventor() const override; + virtual SdrInventor GetObjInventor() const override; // Clone() should make a complete copy of the object. virtual OOle2Obj* Clone() const override; virtual void initializeOle() override; @@ -247,7 +247,7 @@ public: virtual css::uno::Reference< css::uno::XInterface > getUnoShape() override; virtual sal_uInt16 GetObjIdentifier() const override; - virtual sal_uInt32 GetObjInventor() const override; + virtual SdrInventor GetObjInventor() const override; virtual OUnoObject* Clone() const override; OUnoObject& operator=(const OUnoObject& rObj); |