openoffice-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From chen...@apache.org
Subject svn commit: r1416368 - /openoffice/trunk/main/sw/source/filter/ww8/ww8graf.cxx
Date Mon, 03 Dec 2012 07:47:17 GMT
Author: chengjh
Date: Mon Dec  3 07:47:16 2012
New Revision: 1416368

URL: http://svn.apache.org/viewvc?rev=1416368&view=rev
Log:
Revise un-necessary checking..
Patch by: chengjh,<chengjh@apache.org>

Modified:
    openoffice/trunk/main/sw/source/filter/ww8/ww8graf.cxx

Modified: openoffice/trunk/main/sw/source/filter/ww8/ww8graf.cxx
URL: http://svn.apache.org/viewvc/openoffice/trunk/main/sw/source/filter/ww8/ww8graf.cxx?rev=1416368&r1=1416367&r2=1416368&view=diff
==============================================================================
--- openoffice/trunk/main/sw/source/filter/ww8/ww8graf.cxx (original)
+++ openoffice/trunk/main/sw/source/filter/ww8/ww8graf.cxx Mon Dec  3 07:47:16 2012
@@ -2735,7 +2735,7 @@ SwFrmFmt* SwWW8ImplReader::Read_GrafLaye
 
 	if(pObject)
 	{
-		sal_uInt16 nCount = pObject ? pObject->GetUserDataCount() : 0;
+		sal_uInt16 nCount = pObject->GetUserDataCount();
 		if(nCount)
 		{
 			String lnName, aObjName, aTarFrm;
@@ -2746,7 +2746,7 @@ SwFrmFmt* SwWW8ImplReader::Read_GrafLaye
 						&& 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();



Mime
View raw message