diff options
| author | Jianyuan Li <lijiany@apache.org> | 2012-09-10 07:19:17 +0000 |
|---|---|---|
| committer | Jianyuan Li <lijiany@apache.org> | 2012-09-10 07:19:17 +0000 |
| commit | eb86e4a8ebcc8e105bd4950ed94c2e529320de4c (patch) | |
| tree | 83cb010585fe9ada4b180ecb381cd00ca06922b6 /sd/source | |
| parent | 43ff744cb9411b13860c3c57f7a052a6ab56001e (diff) | |
#119491# fix Handout view mode issue
Reported by: Du Jing
Patch by: Jianyuan Li
Review by: sunying
Notes
Notes:
merged as: 1b6049cde6cc7e59c3621fdcfdec368315496017
Diffstat (limited to 'sd/source')
| -rw-r--r-- | sd/source/filter/ppt/pptin.cxx | 8 |
1 files changed, 6 insertions, 2 deletions
diff --git a/sd/source/filter/ppt/pptin.cxx b/sd/source/filter/ppt/pptin.cxx index a470bcb3375f..f1c226183a0c 100644 --- a/sd/source/filter/ppt/pptin.cxx +++ b/sd/source/filter/ppt/pptin.cxx @@ -578,6 +578,10 @@ sal_Bool ImplSdPPTImport::Import() sal_Bool bStarDrawFiller = (*GetPageList( eAktPageKind ) )[ nAktPageNum ]->bStarDrawFiller; PageKind ePgKind = ( bNotesMaster ) ? PK_NOTES : PK_STANDARD; + sal_Bool bHandout = (*GetPageList( eAktPageKind ) )[ nAktPageNum ]->bHandoutMaster; + if ( bHandout ) + ePgKind = PK_HANDOUT; + pPage->SetPageKind( ePgKind ); pSdrModel->InsertMasterPage( (SdrPage*)pPage ); if ( bNotesMaster && bStarDrawFiller ) @@ -724,7 +728,7 @@ sal_Bool ImplSdPPTImport::Import() } SdPage* pMPage; sal_uInt16 i; - for ( i = 1; i < mpDoc->GetMasterPageCount() && ( (pMPage = (SdPage*)mpDoc->GetMasterPage( i )) != 0 ); i++ ) + for ( i = 0; i < mpDoc->GetMasterPageCount() && ( (pMPage = (SdPage*)mpDoc->GetMasterPage( i )) != 0 ); i++ ) { SetPageNum( i, PPT_MASTERPAGE ); ///////////////////////////////////////////// @@ -2339,7 +2343,7 @@ SdrObject* ImplSdPPTImport::ApplyTextObj( PPTTextObj* pTextObj, SdrTextObj* pObj if ( aPresentationText.Len() ) pPage->SetObjText( (SdrTextObj*)pText, pOutl, ePresKind, aPresentationText ); - if ( pPage->GetPageKind() != PK_NOTES ) + if ( pPage->GetPageKind() != PK_NOTES && pPage->GetPageKind() != PK_HANDOUT) { SfxStyleSheet* pSheet2( pPage->GetStyleSheetForPresObj( ePresKind ) ); if ( pSheet2 ) |