mir/libreoffice
2
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

-Werror,-Wnull-conversion

Browse Source 
...presumably this is what was meant in 89d39bc100
"tdf#94559: 4th step to remove rtti.hxx"

Change-Id: I844939fe4cd1f452747ac3cf3410659bba748efb
This commit is contained in:
Stephan Bergmann
2015-10-06 10:20:26 +02:00
parent a7b86140d7
commit f52449e43b
1 changed files with 2 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
sw/source/core/frmedt/fefly1.cxx
View File

@@ -311,7 +311,7 @@ const SwFrameFormat* SwFEShell::IsFlyInFly()
SwFrameFormat *pFormat = FindFrameFormat( pObj ); SwFrameFormat *pFormat = FindFrameFormat( pObj );
if( pFormat && FLY_AT_FLY == pFormat->GetAnchor().GetAnchorId() ) 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<SwVirtFlyDrawObj*>(pObj)->GetFlyFrm()->GetAnchorFrm() :
static_cast<SwDrawContact*>(GetUserCall(pObj))->GetAnchorFrm( pObj ); static_cast<SwDrawContact*>(GetUserCall(pObj))->GetAnchorFrm( pObj );
OSL_ENSURE( pFly, "IsFlyInFly: Where's my anchor?" ); 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 ) if ( FLY_AS_CHAR == nAnchorId )
return aRet; return aRet;
bool bFlyFrame = nullptr; bool bFlyFrame = dynamic_cast<SwVirtFlyDrawObj *>(pObj) != nullptr;
SwFlyFrm* pFly = 0L; SwFlyFrm* pFly = 0L;
const SwFrm* pFooterOrHeader = NULL; const SwFrm* pFooterOrHeader = NULL;