Skip to content

C
core
Kaydet (Commit) 40543e53 authored tarafından Jian Hong Cheng's avatar Jian Hong Cheng Kaydeden (comit) Caolán McNamara
Dosyalara gözat
Seçenekler

Revise un-necessary checking.. 

Patch by: chengjh,<chengjh@apache.org>
(cherry picked from commit 3869d016)
üst c1c49d8f
Hide whitespace changes
Inline Side-by-side
Showing with 2 additions and 2 deletions
sw/source/filter/ww8/ww8graf.cxx
Dosyayı görüntüle @ 40543e53
...@@ -2578,7 +2578,7 @@ SwFrmFmt* SwWW8ImplReader::Read_GrafLayer( long nGrafAnchorCp ) ...@@ -2578,7 +2578,7 @@ SwFrmFmt* SwWW8ImplReader::Read_GrafLayer( long nGrafAnchorCp )
if(pObject) if(pObject)
{ {
sal_uInt16 nCount = pObject ? pObject->GetUserDataCount() : 0; sal_uInt16 nCount = pObject->GetUserDataCount();
if(nCount) if(nCount)
{ {
OUString lnName, aObjName, aTarFrm; OUString lnName, aObjName, aTarFrm;
...@@ -2589,7 +2589,7 @@ SwFrmFmt* SwWW8ImplReader::Read_GrafLayer( long nGrafAnchorCp ) ...@@ -2589,7 +2589,7 @@ SwFrmFmt* SwWW8ImplReader::Read_GrafLayer( long nGrafAnchorCp )
&& pData->GetId() == SW_UD_IMAPDATA) && pData->GetId() == SW_UD_IMAPDATA)
{ {
SwMacroInfo* macInf = dynamic_cast<SwMacroInfo*>(pData); SwMacroInfo* macInf = dynamic_cast<SwMacroInfo*>(pData);
if( macInf->GetShapeId() == pF->nSpId) if( macInf && macInf->GetShapeId() == pF->nSpId)
{ {
lnName = macInf->GetHlink(); lnName = macInf->GetHlink();
aObjName = macInf->GetName(); aObjName = macInf->GetName();
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment