diff options
| author | Caolán McNamara <caolanm@redhat.com> | 2014-08-17 19:21:52 +0100 |
|---|---|---|
| committer | David Tardon <dtardon@redhat.com> | 2014-08-18 01:21:11 -0500 |
| commit | 54fc725712b3dbad88b6ff9916b1561ad0806bb4 (patch) | |
| tree | d3789ea94456c5bf47f785d00d760fc9d26a093d /sd | |
| parent | f45b0fb67583cfffbde43551794cbd249461a76b (diff) | |
check TRG_HasMasterPage before TRG_GetMasterPage
bff + valgrind
Change-Id: Ie08ddfe06dc0850cf44955cc9f9079b3856b19e3
(cherry picked from commit fad62d928a4b4cd3aa96e16d7ab8f8db0331b8c0)
Reviewed-on: https://gerrit.libreoffice.org/10955
Reviewed-by: David Tardon <dtardon@redhat.com>
Tested-by: David Tardon <dtardon@redhat.com>
Diffstat (limited to 'sd')
| -rw-r--r-- | sd/source/filter/ppt/pptin.cxx | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/sd/source/filter/ppt/pptin.cxx b/sd/source/filter/ppt/pptin.cxx index 80653bc23f9d..de1c9eff974f 100644 --- a/sd/source/filter/ppt/pptin.cxx +++ b/sd/source/filter/ppt/pptin.cxx @@ -2388,7 +2388,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 ); |