Kaydet (Commit) 40543e53 authored tarafından Jian Hong Cheng's avatar Jian Hong Cheng Kaydeden (comit) Caolán McNamara

Revise un-necessary checking..

Patch by: chengjh,<chengjh@apache.org>
(cherry picked from commit 3869d016)
üst c1c49d8f
......@@ -2578,7 +2578,7 @@ SwFrmFmt* SwWW8ImplReader::Read_GrafLayer( long nGrafAnchorCp )
if(pObject)
{
sal_uInt16 nCount = pObject ? pObject->GetUserDataCount() : 0;
sal_uInt16 nCount = pObject->GetUserDataCount();
if(nCount)
{
OUString lnName, aObjName, aTarFrm;
......@@ -2589,7 +2589,7 @@ SwFrmFmt* SwWW8ImplReader::Read_GrafLayer( long nGrafAnchorCp )
&& pData->GetId() == SW_UD_IMAPDATA)
{
SwMacroInfo* macInf = dynamic_cast<SwMacroInfo*>(pData);
if( macInf->GetShapeId() == pF->nSpId)
if( macInf && macInf->GetShapeId() == pF->nSpId)
{
lnName = macInf->GetHlink();
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