diff options
| author | Caolán McNamara <caolanm@redhat.com> | 2020-11-05 14:04:04 +0000 |
|---|---|---|
| committer | Caolán McNamara <caolanm@redhat.com> | 2020-11-06 17:16:09 +0100 |
| commit | de78304d92140901d19a6ea17bdc1d568df955c4 (patch) | |
| tree | f0494ee90a4d7493e2381bbd17f5c1f337a35f0e /svx/source/inc | |
| parent | 8c9b8c5970a08c2ef0ccddb7a691f3731d39175a (diff) | |
make SdrObject Identifiers SdrObjKind enum members
with unique values so that, e.g.
if (pObj->GetObjIdentifier() == OBJ_LINE)
is only true if pObj is a SdrPathObj and not a E3dScene
Change-Id: I30c91e57eb27141390c644dec42e2a4bee96edf0
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/105374
Tested-by: Caolán McNamara <caolanm@redhat.com>
Reviewed-by: Caolán McNamara <caolanm@redhat.com>
Diffstat (limited to 'svx/source/inc')
| -rw-r--r-- | svx/source/inc/fmobj.hxx | 2 | ||||
| -rw-r--r-- | svx/source/inc/fmvwimp.hxx | 6 |
2 files changed, 4 insertions, 4 deletions
diff --git a/svx/source/inc/fmobj.hxx b/svx/source/inc/fmobj.hxx index 4f7467f493ce..d53ec819a808 100644 --- a/svx/source/inc/fmobj.hxx +++ b/svx/source/inc/fmobj.hxx @@ -75,7 +75,7 @@ public: virtual void handlePageChange(SdrPage* pOldPage, SdrPage* pNewPage) override; SAL_DLLPRIVATE virtual SdrInventor GetObjInventor() const override; - SAL_DLLPRIVATE virtual sal_uInt16 GetObjIdentifier() const override; + SAL_DLLPRIVATE virtual SdrObjKind GetObjIdentifier() const override; SAL_DLLPRIVATE virtual void NbcReformatText() override; SAL_DLLPRIVATE virtual FmFormObj* CloneSdrObject(SdrModel& rTargetModel) const override; diff --git a/svx/source/inc/fmvwimp.hxx b/svx/source/inc/fmvwimp.hxx index 278c4eda597b..3a1f254d51e5 100644 --- a/svx/source/inc/fmvwimp.hxx +++ b/svx/source/inc/fmvwimp.hxx @@ -248,10 +248,10 @@ private: sal_Int32 _nYOffsetMM, const css::uno::Reference< css::beans::XPropertySet >& _rxField, const css::uno::Reference< css::util::XNumberFormats >& _rxNumberFormats, - sal_uInt16 _nControlObjectID, + SdrObjKind _nControlObjectID, const OUString& _rFieldPostfix, SdrInventor _nInventor, - sal_uInt16 _nLabelObjectID, + SdrObjKind _nLabelObjectID, // tdf#118963 Need a SdrModel for SdrObject creation. To make the // demand clear, hand over a SdrMldel& @@ -267,7 +267,7 @@ private: sal_Int32 _nYOffsetMM, const css::uno::Reference< css::beans::XPropertySet >& _rxField, const css::uno::Reference< css::util::XNumberFormats >& _rxNumberFormats, - sal_uInt16 _nControlObjectID, + SdrObjKind _nControlObjectID, const OUString& _rFieldPostfix, std::unique_ptr<SdrUnoObj, SdrObjectFreeOp>& _rpLabel, std::unique_ptr<SdrUnoObj, SdrObjectFreeOp>& _rpControl, |