[RA 389459] write header/footer on each page

Signed-off-by: sguan <sguan@actuate.com>
eclipse-birt · Sep 21, 2015 · 5157144 · 5157144
1 parent 8ff7e71
commit 5157144
Show file tree

Hide file tree

Showing 2 changed files with 16 additions and 2 deletions.
diff --git a/...eport.engine.emitter.pptx/src/org/eclipse/birt/report/engine/emitter/pptx/PPTXRender.java b/...eport.engine.emitter.pptx/src/org/eclipse/birt/report/engine/emitter/pptx/PPTXRender.java
@@ -64,7 +64,7 @@ public class PPTXRender extends PageDeviceRender
 	 * 
 	 * the default value is TRUE.
 	 */
-	public static final String OPTION_EDIT_MODE = "org.eclipse.birt.report.emitter.PPTX.editMode";
+	public static final String OPTION_EDIT_MODE = "org.eclipse.birt.report.emitter.PPTX.editMode"; //$NON-NLS-1$
 
 	/** The default output PPT file name. */
 	public static final String REPORT_FILE = "Report.pptx"; //$NON-NLS-1$
@@ -202,9 +202,15 @@ public void visitContainer( IContainerArea container )
 	{
 		if ( container instanceof PageArea )
 		{
+			if( editMode )
+			{
 			newPage( container );
 			new SlideWriter( this ).writeSlide( (PageArea) container );
 			this.pageGraphic.dispose( );
+			}
+			else{
+				visitPage( (PageArea) container );
+			}
 		}
 		else if ( container instanceof TableArea )
 		{
@@ -433,4 +439,9 @@ public boolean isTextWrap()
 	{
 		return isTextWrap;
 	}
+
+	public boolean isEditMode( )
+	{
+		return editMode;
+	}
 }
diff --git a/...ine.emitter.pptx/src/org/eclipse/birt/report/engine/emitter/pptx/writer/Presentation.java b/...ine.emitter.pptx/src/org/eclipse/birt/report/engine/emitter/pptx/writer/Presentation.java
@@ -116,7 +116,10 @@ private void outputSlideMasters() throws IOException
 			writer.attribute( TAG_RELATIONSHIP_ID, slideMaster.getPart( )
 					.getRelationshipId( ) );
 			writer.closeTag( TAG_SLIDE_MASTER_ID );
-			new SlideWriter( render ).writeSlideMaster( slideMaster );
+			if ( render.isEditMode( ) )
+			{
+				new SlideWriter( render ).writeSlideMaster( slideMaster );
+			}
 			slideMaster.close( );
 		}
 		writer.closeTag( TAG_SLIDE_MASTER_ID_LIST );