You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@poi.apache.org by ni...@apache.org on 2014/07/24 21:34:20 UTC
svn commit: r1613256 - in /poi/trunk:
src/java/org/apache/poi/hpsf/Thumbnail.java
src/testcases/org/apache/poi/hpsf/extractor/TestHPSFPropertiesExtractor.java
test-data/hpsf/TestThumbnail.xls
Author: nick
Date: Thu Jul 24 19:34:19 2014
New Revision: 1613256
URL: http://svn.apache.org/r1613256
Log:
Patch from thaichat04 from bug #56194 - HPSF thumbnail format tags are int not unit
Added:
poi/trunk/test-data/hpsf/TestThumbnail.xls (with props)
Modified:
poi/trunk/src/java/org/apache/poi/hpsf/Thumbnail.java
poi/trunk/src/testcases/org/apache/poi/hpsf/extractor/TestHPSFPropertiesExtractor.java
Modified: poi/trunk/src/java/org/apache/poi/hpsf/Thumbnail.java
URL: http://svn.apache.org/viewvc/poi/trunk/src/java/org/apache/poi/hpsf/Thumbnail.java?rev=1613256&r1=1613255&r2=1613256&view=diff
==============================================================================
--- poi/trunk/src/java/org/apache/poi/hpsf/Thumbnail.java (original)
+++ poi/trunk/src/java/org/apache/poi/hpsf/Thumbnail.java Thu Jul 24 19:34:19 2014
@@ -202,7 +202,7 @@ public final class Thumbnail {
*/
public long getClipboardFormatTag()
{
- long clipboardFormatTag = LittleEndian.getUInt(getThumbnail(),
+ long clipboardFormatTag = LittleEndian.getInt(getThumbnail(),
OFFSET_CFTAG);
return clipboardFormatTag;
}
@@ -234,7 +234,7 @@ public final class Thumbnail {
throw new HPSFException("Clipboard Format Tag of Thumbnail must " +
"be CFTAG_WINDOWS.");
- return LittleEndian.getUInt(getThumbnail(), OFFSET_CF);
+ return LittleEndian.getInt(getThumbnail(), OFFSET_CF);
}
Modified: poi/trunk/src/testcases/org/apache/poi/hpsf/extractor/TestHPSFPropertiesExtractor.java
URL: http://svn.apache.org/viewvc/poi/trunk/src/testcases/org/apache/poi/hpsf/extractor/TestHPSFPropertiesExtractor.java?rev=1613256&r1=1613255&r2=1613256&view=diff
==============================================================================
--- poi/trunk/src/testcases/org/apache/poi/hpsf/extractor/TestHPSFPropertiesExtractor.java (original)
+++ poi/trunk/src/testcases/org/apache/poi/hpsf/extractor/TestHPSFPropertiesExtractor.java Thu Jul 24 19:34:19 2014
@@ -22,6 +22,7 @@ import java.io.IOException;
import junit.framework.TestCase;
import org.apache.poi.POIDataSamples;
+import org.apache.poi.hpsf.Thumbnail;
import org.apache.poi.hssf.HSSFTestDataSamples;
import org.apache.poi.hssf.extractor.ExcelExtractor;
import org.apache.poi.hssf.usermodel.HSSFWorkbook;
@@ -120,4 +121,14 @@ public final class TestHPSFPropertiesExt
assertTrue(txt.indexOf("PID_REVNUMBER") != -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();
+ }
}
Added: poi/trunk/test-data/hpsf/TestThumbnail.xls
URL: http://svn.apache.org/viewvc/poi/trunk/test-data/hpsf/TestThumbnail.xls?rev=1613256&view=auto
==============================================================================
Binary file - no diff available.
Propchange: poi/trunk/test-data/hpsf/TestThumbnail.xls
------------------------------------------------------------------------------
svn:mime-type = application/octet-stream
---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@poi.apache.org
For additional commands, e-mail: commits-help@poi.apache.org