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 /sw/source/filter/ww8/ww8graf.cxx | |
| 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 'sw/source/filter/ww8/ww8graf.cxx')
| -rw-r--r-- | sw/source/filter/ww8/ww8graf.cxx | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/sw/source/filter/ww8/ww8graf.cxx b/sw/source/filter/ww8/ww8graf.cxx index 2a98d6ad3570..c141c857f37c 100644 --- a/sw/source/filter/ww8/ww8graf.cxx +++ b/sw/source/filter/ww8/ww8graf.cxx @@ -2592,7 +2592,7 @@ SwFrameFormat* SwWW8ImplReader::Read_GrafLayer( tools::Long nGrafAnchorCp ) SdrObject* pOurNewObject = nullptr; bool bReplaceable = false; - switch (SdrObjKind(pObject->GetObjIdentifier())) + switch (pObject->GetObjIdentifier()) { case OBJ_GRAF: bReplaceable = true; @@ -3108,7 +3108,7 @@ SwFlyFrameFormat* SwWW8ImplReader::ImportReplaceableDrawables( SdrObject* &rpObj } OUString aObjectName(rpObject->GetName()); - if (OBJ_OLE2 == SdrObjKind(rpObject->GetObjIdentifier())) + if (OBJ_OLE2 == rpObject->GetObjIdentifier()) pRetFrameFormat = InsertOle(*static_cast<SdrOle2Obj*>(rpObject), rFlySet, &aGrSet); else { @@ -3145,7 +3145,7 @@ SwFlyFrameFormat* SwWW8ImplReader::ImportReplaceableDrawables( SdrObject* &rpObj { if( pRecord ) { - if( OBJ_OLE2 != SdrObjKind(rpObject->GetObjIdentifier()) ) + if( OBJ_OLE2 != rpObject->GetObjIdentifier() ) SetAttributesAtGrfNode( pRecord, pRetFrameFormat, pF ); } // avoid multiple occurrences of the same graphic name |