From fad62d928a4b4cd3aa96e16d7ab8f8db0331b8c0 Mon Sep 17 00:00:00 2001 From: Caolán McNamara Date: Sun, 17 Aug 2014 19:21:52 +0100 Subject: check TRG_HasMasterPage before TRG_GetMasterPage bff + valgrind Change-Id: Ie08ddfe06dc0850cf44955cc9f9079b3856b19e3 --- sd/source/filter/ppt/pptin.cxx | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'sd') diff --git a/sd/source/filter/ppt/pptin.cxx b/sd/source/filter/ppt/pptin.cxx index 01a683722781..a5beb9701bb7 100644 --- a/sd/source/filter/ppt/pptin.cxx +++ b/sd/source/filter/ppt/pptin.cxx @@ -2375,7 +2375,7 @@ SdrObject* ImplSdPPTImport::ApplyTextObj( PPTTextObj* pTextObj, SdrTextObj* pObj } pPresObj->SetMergedItemSet(aSet); - if ( ( eAktPageKind != PPT_NOTEPAGE ) && ( nPlacementId != 0xffffffff ) ) + if ((eAktPageKind != PPT_NOTEPAGE) && (nPlacementId != 0xffffffff) && pPage->TRG_HasMasterPage()) { SdrObject* pTitleObj = ((SdPage&)pPage->TRG_GetMasterPage()).GetPresObj( PRESOBJ_TITLE ); SdrObject* pOutlineObj = ((SdPage&)pPage->TRG_GetMasterPage()).GetPresObj( PRESOBJ_OUTLINE ); -- cgit