[Libreoffice-commits] core.git: sd/source
Caolán McNamara
caolanm at redhat.com
Sun Aug 17 11:31:41 PDT 2014
sd/source/filter/ppt/pptin.cxx | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
New commits:
commit fad62d928a4b4cd3aa96e16d7ab8f8db0331b8c0
Author: Caolán McNamara <caolanm at redhat.com>
Date: Sun Aug 17 19:21:52 2014 +0100
check TRG_HasMasterPage before TRG_GetMasterPage
bff + valgrind
Change-Id: Ie08ddfe06dc0850cf44955cc9f9079b3856b19e3
diff --git a/sd/source/filter/ppt/pptin.cxx b/sd/source/filter/ppt/pptin.cxx
index 01a6837..a5beb97 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 );
More information about the Libreoffice-commits
mailing list