sw/source/core/frmedt/fefly1.cxx | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
New commits:
commit f52449e43b14f6118e324e92986c61eddf7ada38
Author: Stephan Bergmann <sberg...@redhat.com>
Date: Tue Oct 6 10:20:26 2015 +0200
-Werror,-Wnull-conversion
...presumably this is what was meant in
89d39bc100aabf5dccbe77c0b5c0c85736e85b39
"tdf#94559: 4th step to remove rtti.hxx"
Change-Id: I844939fe4cd1f452747ac3cf3410659bba748efb
diff --git a/sw/source/core/frmedt/fefly1.cxx b/sw/source/core/frmedt/fefly1.cxx
index b36d65f..903e4ec 100644
--- a/sw/source/core/frmedt/fefly1.cxx
+++ b/sw/source/core/frmedt/fefly1.cxx
@@ -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;
_______________________________________________
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
