diff options
Diffstat (limited to 'sw/source/filter/ww8/ww8graf.cxx')
-rw-r--r-- | sw/source/filter/ww8/ww8graf.cxx | 16 |
1 files changed, 6 insertions, 10 deletions
diff --git a/sw/source/filter/ww8/ww8graf.cxx b/sw/source/filter/ww8/ww8graf.cxx index 35059e45b998..09e6dfd3f893 100644 --- a/sw/source/filter/ww8/ww8graf.cxx +++ b/sw/source/filter/ww8/ww8graf.cxx @@ -2626,20 +2626,16 @@ SwFrameFormat* SwWW8ImplReader::Read_GrafLayer( long nGrafAnchorCp ) for (sal_uInt16 i = 0; i < nCount; i++ ) { SdrObjUserData* pData = pObject->GetUserData( i ); - if( pData && pData->GetInventor() == SW_DRAWLAYER + if( pData && pData->GetInventor() == SdrInventor::ScOrSwDraw && pData->GetId() == SW_UD_IMAPDATA) { SwMacroInfo* macInf = dynamic_cast<SwMacroInfo*>(pData); - if( macInf )// && macInf->GetShapeId() == pF->nSpId) + if( macInf && macInf->GetShapeId() == pF->nSpId ) { - sal_Int32 nShapeId = macInf->GetShapeId(); - if ( nShapeId == pF->nSpId ) - { - lnName = macInf->GetHlink(); - aObjName = macInf->GetName(); - aTarFrame = macInf->GetTarFrame(); - break; - } + lnName = macInf->GetHlink(); + aObjName = macInf->GetName(); + aTarFrame = macInf->GetTarFrame(); + break; } } } |