strepsirrhini/office-gobmx
9
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Resolves: fdo#40345 don't crash loading temp document to get frame styles

Browse source
This commit is contained in:
Caolán McNamara 2011-08-24 14:45:41 +01:00
parent 87610049f8
commit b5040d946e
1 changed files with 3 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
sw/source/core/layout/paintfrm.cxx
View file

@ -2955,7 +2955,7 @@ SwRootFrm::Paint(SwRect const& rRect, SwPrintData const*const pPrintData) const
const SwContact* pContact = ::GetUserCall( pDrawObj );
const SwAnchoredObject* pObj = pContact->GetAnchoredObj( pDrawObj );
const SwFrm* pAnchorFrm = pObj->GetAnchorFrm();
const SwFrm* pAnchorFrm = pObj ? pObj->GetAnchorFrm() : NULL;
bool bInHeaderFooter = false;
// Handle all non anchored as character objects... others are handled elsewere
@ -3557,7 +3557,8 @@ sal_Bool SwFlyFrm::IsPaint( SdrObject *pObj, const ViewShell *pSh )
{
// OD 13.10.2003 #i19919# - consider 'virtual' drawing objects
// OD 2004-03-29 #i26791#
pAnch = ((SwDrawContact*)pUserCall)->GetAnchorFrm( pObj );
SwDrawContact* pDrawContact = dynamic_cast<SwDrawContact*>(pUserCall);
pAnch = pDrawContact ? pDrawContact->GetAnchorFrm(pObj) : NULL;
if ( pAnch )
{
if ( !pAnch->GetValidPosFlag() )