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 /include/svx/unopage.hxx | |
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 'include/svx/unopage.hxx')
-rw-r--r-- | include/svx/unopage.hxx | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/include/svx/unopage.hxx b/include/svx/unopage.hxx index 881032726b86..7bbdc1672523 100644 --- a/include/svx/unopage.hxx +++ b/include/svx/unopage.hxx @@ -49,6 +49,7 @@ class SdrObject; class SvxShape; class SvxShapeGroup; class SvxShapeConnector; +enum class SdrInventor : sal_uInt32; /** * Macros to convert Twips<->100tel mm @@ -88,14 +89,14 @@ class SVX_DLLPUBLIC SvxDrawPage : public ::cppu::WeakAggImplHelper6< css::drawin SdrObject *CreateSdrObject( const css::uno::Reference< css::drawing::XShape >& xShape, bool bBeginning = false ) throw(); // Determine Type and Inventor - static void GetTypeAndInventor( sal_uInt16& rType, sal_uInt32& rInventor, const OUString& aName ) throw(); + static void GetTypeAndInventor( sal_uInt16& rType, SdrInventor& rInventor, const OUString& aName ) throw(); // Creating a SdrObject using it's Description. // Can be used by derived classes to support their owen Shapes (e.g. Controls). virtual SdrObject *CreateSdrObject_( const css::uno::Reference< css::drawing::XShape >& xShape ) throw (css::uno::RuntimeException, std::exception); - static SvxShape* CreateShapeByTypeAndInventor( sal_uInt16 nType, sal_uInt32 nInventor, SdrObject *pObj, SvxDrawPage *pPage = nullptr, OUString const & referer = OUString() ) throw (css::uno::RuntimeException); + static SvxShape* CreateShapeByTypeAndInventor( sal_uInt16 nType, SdrInventor nInventor, SdrObject *pObj, SvxDrawPage *pPage = nullptr, OUString const & referer = OUString() ) throw (css::uno::RuntimeException); // The following method is called if a SvxShape object is to be created. // Derived classes can create a derivation or an SvxShape aggregating object. |