incubator-ooo-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From liji...@apache.org
Subject svn commit: r1382687 - /incubator/ooo/trunk/main/sd/source/filter/ppt/pptin.cxx
Date Mon, 10 Sep 2012 08:19:18 GMT
Author: lijiany
Date: Mon Sep 10 08:19:17 2012
New Revision: 1382687

URL: http://svn.apache.org/viewvc?rev=1382687&view=rev
Log:
#119491# fix Handout view mode issue
Reported by: Du Jing
Patch by: Jianyuan Li
Review by: sunying

Modified:
    incubator/ooo/trunk/main/sd/source/filter/ppt/pptin.cxx

Modified: incubator/ooo/trunk/main/sd/source/filter/ppt/pptin.cxx
URL: http://svn.apache.org/viewvc/incubator/ooo/trunk/main/sd/source/filter/ppt/pptin.cxx?rev=1382687&r1=1382686&r2=1382687&view=diff
==============================================================================
--- incubator/ooo/trunk/main/sd/source/filter/ppt/pptin.cxx (original)
+++ incubator/ooo/trunk/main/sd/source/filter/ppt/pptin.cxx Mon Sep 10 08:19:17 2012
@@ -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
 				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 )



Mime
View raw message