Browse Source

Patch from thaichat04 from bug #56194 - HPSF thumbnail format tags are int not unit

git-svn-id: https://svn.apache.org/repos/asf/poi/trunk@1613256 13f79535-47bb-0310-9956-ffa450edef68
tags/REL_3_11_BETA1
Nick Burch 9 years ago
parent
commit
f3dba52888

+ 2
- 2
src/java/org/apache/poi/hpsf/Thumbnail.java View File

*/ */
public long getClipboardFormatTag() public long getClipboardFormatTag()
{ {
long clipboardFormatTag = LittleEndian.getUInt(getThumbnail(),
long clipboardFormatTag = LittleEndian.getInt(getThumbnail(),
OFFSET_CFTAG); OFFSET_CFTAG);
return clipboardFormatTag; return clipboardFormatTag;
} }
throw new HPSFException("Clipboard Format Tag of Thumbnail must " + throw new HPSFException("Clipboard Format Tag of Thumbnail must " +
"be CFTAG_WINDOWS."); "be CFTAG_WINDOWS.");


return LittleEndian.getUInt(getThumbnail(), OFFSET_CF);
return LittleEndian.getInt(getThumbnail(), OFFSET_CF);
} }





+ 11
- 0
src/testcases/org/apache/poi/hpsf/extractor/TestHPSFPropertiesExtractor.java View File

import junit.framework.TestCase; import junit.framework.TestCase;


import org.apache.poi.POIDataSamples; import org.apache.poi.POIDataSamples;
import org.apache.poi.hpsf.Thumbnail;
import org.apache.poi.hssf.HSSFTestDataSamples; import org.apache.poi.hssf.HSSFTestDataSamples;
import org.apache.poi.hssf.extractor.ExcelExtractor; import org.apache.poi.hssf.extractor.ExcelExtractor;
import org.apache.poi.hssf.usermodel.HSSFWorkbook; import org.apache.poi.hssf.usermodel.HSSFWorkbook;
assertTrue(txt.indexOf("PID_REVNUMBER") != -1); assertTrue(txt.indexOf("PID_REVNUMBER") != -1);
assertTrue(txt.indexOf("PID_THUMBNAIL") != -1); assertTrue(txt.indexOf("PID_THUMBNAIL") != -1);
} }
public void testThumbnail() throws Exception {
POIFSFileSystem fs = new POIFSFileSystem(_samples.openResourceAsStream("TestThumbnail.xls"));
HSSFWorkbook wb = new HSSFWorkbook(fs);
Thumbnail thumbnail = new Thumbnail(wb.getSummaryInformation().getThumbnail());
assertEquals(-1, thumbnail.getClipboardFormatTag());
assertEquals(3, thumbnail.getClipboardFormat());
assertNotNull(thumbnail.getThumbnailAsWMF());
wb.close();
}
} }

BIN
test-data/hpsf/TestThumbnail.xls View File


Loading…
Cancel
Save