View | Details | Raw Unified | Return to issue 119491
Collapse All | Expand All

(-)sd/source/filter/ppt/pptin.cxx (-2 / +6 lines)
Lines 578-583 Link Here
578
				sal_Bool bStarDrawFiller = (*GetPageList( eAktPageKind ) )[ nAktPageNum ]->bStarDrawFiller;
578
				sal_Bool bStarDrawFiller = (*GetPageList( eAktPageKind ) )[ nAktPageNum ]->bStarDrawFiller;
579
579
580
				PageKind ePgKind = ( bNotesMaster ) ? PK_NOTES : PK_STANDARD;
580
				PageKind ePgKind = ( bNotesMaster ) ? PK_NOTES : PK_STANDARD;
581
				sal_Bool bHandout = (*GetPageList( eAktPageKind ) )[ nAktPageNum ]->bHandoutMaster;
582
				if ( bHandout )
583
					ePgKind = PK_HANDOUT;
584
581
				pPage->SetPageKind( ePgKind );
585
				pPage->SetPageKind( ePgKind );
582
				pSdrModel->InsertMasterPage( (SdrPage*)pPage );
586
				pSdrModel->InsertMasterPage( (SdrPage*)pPage );
583
				if ( bNotesMaster && bStarDrawFiller )
587
				if ( bNotesMaster && bStarDrawFiller )
Lines 724-730 Link Here
724
	}
728
	}
725
	SdPage* pMPage;
729
	SdPage* pMPage;
726
	sal_uInt16 i;
730
	sal_uInt16 i;
727
	for ( i = 1; i < mpDoc->GetMasterPageCount() && ( (pMPage = (SdPage*)mpDoc->GetMasterPage( i )) != 0 ); i++ )
731
	for ( i = 0; i < mpDoc->GetMasterPageCount() && ( (pMPage = (SdPage*)mpDoc->GetMasterPage( i )) != 0 ); i++ )
728
	{
732
	{
729
		SetPageNum( i, PPT_MASTERPAGE );
733
		SetPageNum( i, PPT_MASTERPAGE );
730
		/////////////////////////////////////////////
734
		/////////////////////////////////////////////
Lines 2337-2343 Link Here
2337
				if ( aPresentationText.Len() )
2341
				if ( aPresentationText.Len() )
2338
					pPage->SetObjText( (SdrTextObj*)pText, pOutl, ePresKind, aPresentationText );
2342
					pPage->SetObjText( (SdrTextObj*)pText, pOutl, ePresKind, aPresentationText );
2339
2343
2340
				if ( pPage->GetPageKind() != PK_NOTES )
2344
				if ( pPage->GetPageKind() != PK_NOTES && pPage->GetPageKind() != PK_HANDOUT)
2341
				{
2345
				{
2342
					SfxStyleSheet* pSheet2( pPage->GetStyleSheetForPresObj( ePresKind ) );
2346
					SfxStyleSheet* pSheet2( pPage->GetStyleSheetForPresObj( ePresKind ) );
2343
					if ( pSheet2 )
2347
					if ( pSheet2 )

Return to issue 119491