fixed a silly typo in the method signature. It should be HFFSPicture.getPreferredSize(), not HFFSPicture.getPrefferedSize()
git-svn-id: https://svn.apache.org/repos/asf/poi/trunk@591667 13f79535-47bb-0310-9956-ffa450edef68
This commit is contained in:
parent
7d858d747c
commit
c93e470560
@ -1020,8 +1020,8 @@
|
|||||||
HSSFPatriarch patriarch = sheet5.createDrawingPatriarch();
|
HSSFPatriarch patriarch = sheet5.createDrawingPatriarch();
|
||||||
|
|
||||||
HSSFPicture picture = patriarch.createPicture(new HSSFClientAnchor(), loadPicture( "src/resources/logos/logoKarmokar4.png", wb ));
|
HSSFPicture picture = patriarch.createPicture(new HSSFClientAnchor(), loadPicture( "src/resources/logos/logoKarmokar4.png", wb ));
|
||||||
HSSFClientAnchor prefferedSize = picture.getPrefferedSize();
|
HSSFClientAnchor preferredSize = picture.getPreferredSize();
|
||||||
picture.setAnchor(prefferedSize);
|
picture.setAnchor(preferredSize);
|
||||||
</source>
|
</source>
|
||||||
<warning>
|
<warning>
|
||||||
HSSFPicture.resize() works only for JPEG and PNG. Other formats are not yet supported.
|
HSSFPicture.resize() works only for JPEG and PNG. Other formats are not yet supported.
|
||||||
|
@ -79,7 +79,7 @@ public class HSSFPicture
|
|||||||
HSSFClientAnchor anchor = (HSSFClientAnchor)getAnchor();
|
HSSFClientAnchor anchor = (HSSFClientAnchor)getAnchor();
|
||||||
anchor.setAnchorType(2);
|
anchor.setAnchorType(2);
|
||||||
|
|
||||||
HSSFClientAnchor pref = getPrefferedSize();
|
HSSFClientAnchor pref = getPreferredSize();
|
||||||
|
|
||||||
int row2 = anchor.getRow1() + (pref.getRow2() - pref.getRow1());
|
int row2 = anchor.getRow1() + (pref.getRow2() - pref.getRow1());
|
||||||
int col2 = anchor.getCol1() + (pref.getCol2() - pref.getCol1());
|
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
|
* @since POI 3.0.2
|
||||||
*/
|
*/
|
||||||
public HSSFClientAnchor getPrefferedSize(){
|
public HSSFClientAnchor getPreferredSize(){
|
||||||
HSSFClientAnchor anchor = new HSSFClientAnchor();
|
HSSFClientAnchor anchor = new HSSFClientAnchor();
|
||||||
|
|
||||||
EscherBSERecord bse = (EscherBSERecord)patriarch.sheet.book.getBSERecord(pictureIndex);
|
EscherBSERecord bse = (EscherBSERecord)patriarch.sheet.book.getBSERecord(pictureIndex);
|
||||||
byte[] data = bse.getBlipRecord().getPicturedata();
|
byte[] data = bse.getBlipRecord().getPicturedata();
|
||||||
int type = bse.getBlipTypeWin32();
|
int type = bse.getBlipTypeWin32();
|
||||||
switch (type){
|
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
|
//other formats like WMF, EMF and PICT are not supported in Java
|
||||||
case HSSFWorkbook.PICTURE_TYPE_JPEG:
|
case HSSFWorkbook.PICTURE_TYPE_JPEG:
|
||||||
case HSSFWorkbook.PICTURE_TYPE_PNG:
|
case HSSFWorkbook.PICTURE_TYPE_PNG:
|
||||||
|
@ -36,7 +36,7 @@ public class TestHSSFPicture extends TestCase{
|
|||||||
|
|
||||||
int idx1 = loadPicture( "src/resources/logos/logoKarmokar4.png", wb);
|
int idx1 = loadPicture( "src/resources/logos/logoKarmokar4.png", wb);
|
||||||
HSSFPicture picture1 = p1.createPicture(new HSSFClientAnchor(), idx1);
|
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
|
//assert against what would BiffViewer print if we insert the image in xls and dump the file
|
||||||
assertEquals(0, anchor1.getCol1());
|
assertEquals(0, anchor1.getCol1());
|
||||||
|
Loading…
Reference in New Issue
Block a user