diff --git a/src/documentation/content/xdocs/hssf/quick-guide.xml b/src/documentation/content/xdocs/hssf/quick-guide.xml index ebc6753b0..e40dc0dcb 100644 --- a/src/documentation/content/xdocs/hssf/quick-guide.xml +++ b/src/documentation/content/xdocs/hssf/quick-guide.xml @@ -1020,8 +1020,8 @@ HSSFPatriarch patriarch = sheet5.createDrawingPatriarch(); HSSFPicture picture = patriarch.createPicture(new HSSFClientAnchor(), loadPicture( "src/resources/logos/logoKarmokar4.png", wb )); - HSSFClientAnchor prefferedSize = picture.getPrefferedSize(); - picture.setAnchor(prefferedSize); + HSSFClientAnchor preferredSize = picture.getPreferredSize(); + picture.setAnchor(preferredSize); HSSFPicture.resize() works only for JPEG and PNG. Other formats are not yet supported. diff --git a/src/java/org/apache/poi/hssf/usermodel/HSSFPicture.java b/src/java/org/apache/poi/hssf/usermodel/HSSFPicture.java index 79649b06a..9aa0e966d 100644 --- a/src/java/org/apache/poi/hssf/usermodel/HSSFPicture.java +++ b/src/java/org/apache/poi/hssf/usermodel/HSSFPicture.java @@ -79,7 +79,7 @@ public class HSSFPicture HSSFClientAnchor anchor = (HSSFClientAnchor)getAnchor(); anchor.setAnchorType(2); - HSSFClientAnchor pref = getPrefferedSize(); + HSSFClientAnchor pref = getPreferredSize(); int row2 = anchor.getRow1() + (pref.getRow2() - pref.getRow1()); int col2 = anchor.getCol1() + (pref.getCol2() - pref.getCol1()); @@ -94,19 +94,19 @@ public class HSSFPicture } /** - * Calculate the preffered size for this picture. + * Calculate the preferred size for this picture. * - * @return HSSFClientAnchor with the preffered size for this image + * @return HSSFClientAnchor with the preferred size for this image * @since POI 3.0.2 */ - public HSSFClientAnchor getPrefferedSize(){ + public HSSFClientAnchor getPreferredSize(){ HSSFClientAnchor anchor = new HSSFClientAnchor(); EscherBSERecord bse = (EscherBSERecord)patriarch.sheet.book.getBSERecord(pictureIndex); byte[] data = bse.getBlipRecord().getPicturedata(); int type = bse.getBlipTypeWin32(); switch (type){ - //we can calculate the preffered size only for JPEG and PNG + //we can calculate the preferred size only for JPEG and PNG //other formats like WMF, EMF and PICT are not supported in Java case HSSFWorkbook.PICTURE_TYPE_JPEG: case HSSFWorkbook.PICTURE_TYPE_PNG: diff --git a/src/testcases/org/apache/poi/hssf/usermodel/TestHSSFPicture.java b/src/testcases/org/apache/poi/hssf/usermodel/TestHSSFPicture.java index 45f92647b..25d6684c4 100644 --- a/src/testcases/org/apache/poi/hssf/usermodel/TestHSSFPicture.java +++ b/src/testcases/org/apache/poi/hssf/usermodel/TestHSSFPicture.java @@ -36,7 +36,7 @@ public class TestHSSFPicture extends TestCase{ int idx1 = loadPicture( "src/resources/logos/logoKarmokar4.png", wb); HSSFPicture picture1 = p1.createPicture(new HSSFClientAnchor(), idx1); - HSSFClientAnchor anchor1 = picture1.getPrefferedSize(); + HSSFClientAnchor anchor1 = picture1.getPreferredSize(); //assert against what would BiffViewer print if we insert the image in xls and dump the file assertEquals(0, anchor1.getCol1());