-Werror,-Wnull-conversion
...presumably this is what was meant in 89d39bc100
"tdf#94559: 4th step to remove rtti.hxx"
Change-Id: I844939fe4cd1f452747ac3cf3410659bba748efb
This commit is contained in:
@@ -311,7 +311,7 @@ const SwFrameFormat* SwFEShell::IsFlyInFly()
|
||||
SwFrameFormat *pFormat = FindFrameFormat( pObj );
|
||||
if( pFormat && FLY_AT_FLY == pFormat->GetAnchor().GetAnchorId() )
|
||||
{
|
||||
const SwFrm* pFly = nullptr ?
|
||||
const SwFrm* pFly = dynamic_cast<SwVirtFlyDrawObj *>(pObj) != nullptr ?
|
||||
static_cast<SwVirtFlyDrawObj*>(pObj)->GetFlyFrm()->GetAnchorFrm() :
|
||||
static_cast<SwDrawContact*>(GetUserCall(pObj))->GetAnchorFrm( pObj );
|
||||
OSL_ENSURE( pFly, "IsFlyInFly: Where's my anchor?" );
|
||||
@@ -394,7 +394,7 @@ Point SwFEShell::FindAnchorPos( const Point& rAbsPos, bool bMoveIt )
|
||||
if ( FLY_AS_CHAR == nAnchorId )
|
||||
return aRet;
|
||||
|
||||
bool bFlyFrame = nullptr;
|
||||
bool bFlyFrame = dynamic_cast<SwVirtFlyDrawObj *>(pObj) != nullptr;
|
||||
|
||||
SwFlyFrm* pFly = 0L;
|
||||
const SwFrm* pFooterOrHeader = NULL;
|
||||
|
Reference in New Issue
Block a user