sw/source/core/access/accfrmobj.cxx | 5 ++---
1 file changed, 2 insertions(+), 3 deletions(-)
New commits:
commit 71bf7daf530cd633b0308db7cf0bc16d49bab0b9
Author: Caolán McNamara <caol...@redhat.com>
Date: Wed Jun 29 21:25:42 2016 +0100
dynamic_cast followed by static_cast
Change-Id: I9ebdc33ceabc8aaa34dc897cc47e692fedde9199
diff --git a/sw/source/core/access/accfrmobj.cxx
b/sw/source/core/access/accfrmobj.cxx
index c6986d9..cf3e295 100644
--- a/sw/source/core/access/accfrmobj.cxx
+++ b/sw/source/core/access/accfrmobj.cxx
@@ -98,9 +98,8 @@ SwAccessibleChild::SwAccessibleChild( const SwFrame* pFrame,
void SwAccessibleChild::Init( const SdrObject* pDrawObj )
{
mpDrawObj = pDrawObj;
- mpFrame = mpDrawObj && dynamic_cast<const SwVirtFlyDrawObj*>( mpDrawObj)
!= nullptr
- ? static_cast < const SwVirtFlyDrawObj * >( mpDrawObj
)->GetFlyFrame()
- : nullptr;
+ const SwVirtFlyDrawObj* pFlyDrawObj = dynamic_cast<const
SwVirtFlyDrawObj*>(mpDrawObj);
+ mpFrame = pFlyDrawObj ? pFlyDrawObj->GetFlyFrame() : nullptr;
mpWindow = nullptr;
}
_______________________________________________
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
