poi-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From n...@apache.org
Subject svn commit: r682793 - in /poi/branches/ooxml: ./ src/scratchpad/src/org/apache/poi/hslf/extractor/ src/scratchpad/testcases/org/apache/poi/hslf/data/ src/scratchpad/testcases/org/apache/poi/hslf/extractor/
Date Tue, 05 Aug 2008 17:06:49 GMT
Author: nick
Date: Tue Aug  5 10:06:49 2008
New Revision: 682793

URL: http://svn.apache.org/viewvc?rev=682793&view=rev
Log:
Merged revisions 638786-638802,638805-638811,638813-638814,638816-639230,639233-639241,639243-639253,639255-639486,639488-639601,639603-639835,639837-639917,639919-640056,640058-640710,640712-641156,641158-641184,641186-641795,641797-641798,641800-641933,641935-641963,641965-641966,641968-641995,641997-642230,642232-642562,642564-642565,642568-642570,642572-642573,642576-642736,642739-642877,642879,642881-642890,642892-642903,642905-642945,642947-643624,643626-643653,643655-643669,643671,643673-643830,643832-643833,643835-644342,644344-644472,644474-644508,644510-645347,645349-645351,645353-645559,645561-645565,645568-645951,645953-646193,646195-646311,646313-646404,646406-646665,646667-646853,646855-646869,646871-647151,647153-647185,647187-647277,647279-647566,647568-647573,647575,647578-647711,647714-647737,647739-647823,647825-648155,648157-648202,648204-648273,648275,648277-648302,648304-648333,648335-648588,648590-648622,648625-648673,648675-649141,649144,649146-649556,
 649558-649795,649799,649801-649910,649912-649913,649915-650128,650131-650132,650134-650137,650140-650914,650916-651991,651993-652284,652286-652287,652289,652291,652293-652297,652299-652328,652330-652425,652427-652445,652447-652560,652562-652933,652935,652937-652993,652995-653116,653118-653124,653126-653483,653487-653519,653522-653550,653552-653607,653609-653667,653669-653674,653676-653814,653817-653830,653832-653891,653893-653944,653946-654055,654057-654355,654357-654365,654367-654648,654651-655215,655217-655277,655279-655281,655283-655911,655913-656212,656214,656216-656251,656253-656698,656700-656756,656758-656892,656894-657135,657137-657165,657168-657179,657181-657354,657356-657357,657359-657701,657703-657874,657876-658032,658034-658284,658286,658288-658301,658303-658307,658309-658321,658323-658335,658337-658348,658351,658353-658832,658834-658983,658985,658987-659066,659068-659402,659404-659428,659430-659451,659453-659454,659456-659461,659463-659477,659479-659524,659526-65
 9571,659574,659576-660255,660257-660262,660264-660279,660281-660343,660345-660473,660475-660827,660829-660833,660835-660888,660890-663321,663323-663435,663437-663764,663766-663854,663856-664219,664221-664489,664494-664514,664516-668013,668015-668142,668144-668152,668154,668156-668256,668258,668260-669139,669141-669455,669457-669657,669659-669808,669810-670189,670191-671321,671323-672229,672231-672549,672551-672552,672554-672561,672563-672566,672568,672571-673049,673051-673852,673854-673862,673864-673986,673988-673996,673998-674347,674349-674890,674892-674910,674912-674936,674938-674952,674954-675078,675080-675085,675087-675217,675219-675660,675662-675670,675672-675716,675718-675726,675728-675733,675735-675775,675777-675782,675784,675786-675791,675794-675852,675854-676200,676202,676204,676206-676220,676222-676309,676311-676456,676458-676994,676996-677027,677030-677040,677042-677056,677058-677375,677377-677968,677970-677971,677973,677975-677994,677996-678286,678288-678538,6785
 40-680393,680395-680469,680471-680529,680531-680852,680854-681529,681531-681571,681573-682224,682226,682228,682231-682281,682283-682335,682337-682507,682509,682512-682517,682519-682532,682534-682619,682622-682789
via svnmerge from 
https://svn.apache.org/repos/asf/poi/trunk

........
  r682778 | nick | 2008-08-05 17:33:07 +0100 (Tue, 05 Aug 2008) | 1 line
  
  Start on bug #45537 - headers and footers from ppt
........

Added:
    poi/branches/ooxml/src/scratchpad/testcases/org/apache/poi/hslf/data/45537_Footer.ppt
      - copied unchanged from r682778, poi/trunk/src/scratchpad/testcases/org/apache/poi/hslf/data/45537_Footer.ppt
    poi/branches/ooxml/src/scratchpad/testcases/org/apache/poi/hslf/data/45537_Header.ppt
      - copied unchanged from r682778, poi/trunk/src/scratchpad/testcases/org/apache/poi/hslf/data/45537_Header.ppt
Modified:
    poi/branches/ooxml/   (props changed)
    poi/branches/ooxml/src/scratchpad/src/org/apache/poi/hslf/extractor/PowerPointExtractor.java
    poi/branches/ooxml/src/scratchpad/testcases/org/apache/poi/hslf/extractor/TextExtractor.java

Propchange: poi/branches/ooxml/
------------------------------------------------------------------------------
--- svnmerge-integrated (original)
+++ svnmerge-integrated Tue Aug  5 10:06:49 2008
@@ -1 +1 @@
-/poi/trunk:1-638784,638786-639486,639488-639601,639603-640056,640058-642562,642564-642566,642568-642574,642576-642736,642739-650914,650916-682677
+/poi/trunk:1-638784,638786-639486,639488-639601,639603-640056,640058-642562,642564-642566,642568-642574,642576-642736,642739-650914,650916-682789

Modified: poi/branches/ooxml/src/scratchpad/src/org/apache/poi/hslf/extractor/PowerPointExtractor.java
URL: http://svn.apache.org/viewvc/poi/branches/ooxml/src/scratchpad/src/org/apache/poi/hslf/extractor/PowerPointExtractor.java?rev=682793&r1=682792&r2=682793&view=diff
==============================================================================
--- poi/branches/ooxml/src/scratchpad/src/org/apache/poi/hslf/extractor/PowerPointExtractor.java
(original)
+++ poi/branches/ooxml/src/scratchpad/src/org/apache/poi/hslf/extractor/PowerPointExtractor.java
Tue Aug  5 10:06:49 2008
@@ -175,6 +175,12 @@
 	if(getSlideText) {
 		for(int i=0; i<_slides.length; i++) {
 			Slide slide = _slides[i];
+			
+			HeadersFooters hf = slide.getHeadersFooters();
+			if(hf != null && hf.getHeaderText() != null) {
+				ret.append(hf.getHeaderText() + "\n");
+			}
+			
 			TextRun[] runs = slide.getTextRuns();
 			for(int j=0; j<runs.length; j++) {
 				TextRun run = runs[j];
@@ -187,6 +193,10 @@
 				}
 			}
 			
+			if(hf != null && hf.getFooterText() != null) {
+				ret.append(hf.getFooterText() + "\n");
+			}
+			
 			if(getCommentText) {
 				Comment[] comments = slide.getComments();
 				for(int j=0; j<comments.length; j++) {

Modified: poi/branches/ooxml/src/scratchpad/testcases/org/apache/poi/hslf/extractor/TextExtractor.java
URL: http://svn.apache.org/viewvc/poi/branches/ooxml/src/scratchpad/testcases/org/apache/poi/hslf/extractor/TextExtractor.java?rev=682793&r1=682792&r2=682793&view=diff
==============================================================================
--- poi/branches/ooxml/src/scratchpad/testcases/org/apache/poi/hslf/extractor/TextExtractor.java
(original)
+++ poi/branches/ooxml/src/scratchpad/testcases/org/apache/poi/hslf/extractor/TextExtractor.java
Tue Aug  5 10:06:49 2008
@@ -24,6 +24,7 @@
 import java.io.FileInputStream;
 
 import org.apache.poi.hslf.HSLFSlideShow;
+import org.apache.poi.hslf.usermodel.SlideShow;
 import org.apache.poi.poifs.filesystem.DirectoryNode;
 import org.apache.poi.poifs.filesystem.POIFSFileSystem;
 
@@ -248,4 +249,38 @@
 		text = ppe.getText();
 		assertTrue("Unable to find expected word in text\n" + text, text.contains("testdoc"));
     }
+    
+    /**
+     * From bug #45537
+     */
+    public void DISABLEDtestHeaderFooter() throws Exception {
+		String filename, text;
+		
+		// With a header
+		filename = dirname + "/45537_Header.ppt";
+		HSLFSlideShow hslf = new HSLFSlideShow(new FileInputStream(filename));
+		SlideShow ss = new SlideShow(hslf);
+		assertNotNull(ss.getSlides()[0].getHeadersFooters());
+		assertEquals("testdoc test phrase", ss.getSlides()[0].getHeadersFooters().getHeaderText());
+		
+		ppe = new PowerPointExtractor(hslf);
+
+		text = ppe.getText();
+		assertTrue("Unable to find expected word in text\n" + text, text.contains("testdoc"));
+        assertTrue("Unable to find expected word in text\n" + text, text.contains("test phrase"));
+
+        
+		// And with a footer
+		filename = dirname + "/45537_Footer.ppt";
+		hslf = new HSLFSlideShow(new FileInputStream(filename));
+		ss = new SlideShow(hslf);
+		assertNotNull(ss.getSlides()[0].getHeadersFooters());
+		assertEquals("testdoc test phrase", ss.getSlides()[0].getHeadersFooters().getFooterText());
+		
+		ppe = new PowerPointExtractor(filename);
+
+		text = ppe.getText();
+		assertTrue("Unable to find expected word in text\n" + text, text.contains("testdoc"));
+        assertTrue("Unable to find expected word in text\n" + text, text.contains("test phrase"));
+    }
 }



---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@poi.apache.org
For additional commands, e-mail: commits-help@poi.apache.org


Mime
View raw message