Author: hdu
Date: Wed May 8 19:03:07 2013
New Revision: 1480410
URL: http://svn.apache.org/r1480410
Log:
WaE: avoid assignment in if-statement
such assignments are often enough caused by typos, so the
compiler is right to warn on such constructs
Modified:
openoffice/branches/rejuvenate01/main/sw/source/core/layout/fly.cxx
Modified: openoffice/branches/rejuvenate01/main/sw/source/core/layout/fly.cxx
URL:
http://svn.apache.org/viewvc/openoffice/branches/rejuvenate01/main/sw/source/core/layout/fly.cxx?rev=1480410&r1=1480409&r2=1480410&view=diff
==============================================================================
--- openoffice/branches/rejuvenate01/main/sw/source/core/layout/fly.cxx
(original)
+++ openoffice/branches/rejuvenate01/main/sw/source/core/layout/fly.cxx Wed May
8 19:03:07 2013
@@ -2990,8 +2990,8 @@ sal_Bool SwFlyFrm::IsPageNumberingFrm()
if (pNextLink || pPrevLink)//Linked...
return false;
- SwFrmFmt* pFmt = NULL;
- if ((pFmt = GetFmt()))
+ SwFrmFmt* pFmt = GetFmt();
+ if( pFmt )
{
if (pLower && pLower->GetNext() &&
pFmt->GetCol().GetNumCols()>1)//Has more than 1 column...
return false;
