[Libreoffice-commits] core.git: Branch 'libreoffice-4-2' - sd/source

[Caolán McNamara]

 sd/source/filter/ppt/pptin.cxx |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

New commits:
commit 4138d34dedc614d98b783d4286cb0fd87c3b844d
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
    (cherry picked from commit fad62d928a4b4cd3aa96e16d7ab8f8db0331b8c0)
    Reviewed-on: https://gerrit.libreoffice.org/10954
    Reviewed-by: David Tardon <dtardon at redhat.com>
    Tested-by: David Tardon <dtardon at redhat.com>

diff --git a/sd/source/filter/ppt/pptin.cxx b/sd/source/filter/ppt/pptin.cxx
index da9428c..b8aa216 100644
--- a/sd/source/filter/ppt/pptin.cxx
+++ b/sd/source/filter/ppt/pptin.cxx
@@ -2409,7 +2409,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 );