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 /cui | |
| 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 'cui')
| -rw-r--r-- | cui/source/tabpages/textanim.cxx | 2 | ||||
| -rw-r--r-- | cui/source/tabpages/transfrm.cxx | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/cui/source/tabpages/textanim.cxx b/cui/source/tabpages/textanim.cxx index e5239dede67e..a7ee4b3aade9 100644 --- a/cui/source/tabpages/textanim.cxx +++ b/cui/source/tabpages/textanim.cxx @@ -70,7 +70,7 @@ void SvxTextTabDialog::PageCreated(const OString& rId, SfxTabPage &rPage) if (rMarkList.GetMarkCount() == 1) { const SdrObject* pObj = rMarkList.GetMark(0)->GetMarkedSdrObj(); - eKind = static_cast<SdrObjKind>(pObj->GetObjIdentifier()); + eKind = pObj->GetObjIdentifier(); } } } diff --git a/cui/source/tabpages/transfrm.cxx b/cui/source/tabpages/transfrm.cxx index 42b17b553cc2..cec57ecbbbe7 100644 --- a/cui/source/tabpages/transfrm.cxx +++ b/cui/source/tabpages/transfrm.cxx @@ -860,7 +860,7 @@ void SvxPositionSizeTabPage::Construct() if(1 == rMarkList.GetMarkCount()) { const SdrObject* pObj = rMarkList.GetMark(0)->GetMarkedSdrObj(); - const SdrObjKind eKind(static_cast<SdrObjKind>(pObj->GetObjIdentifier())); + const SdrObjKind eKind(pObj->GetObjIdentifier()); if((pObj->GetObjInventor() == SdrInventor::Default) && (OBJ_TEXT == eKind || OBJ_TITLETEXT == eKind || OBJ_OUTLINETEXT == eKind) && |