Author: yegor
Date: Mon Dec 24 01:48:11 2007
New Revision: 606684
URL: http://svn.apache.org/viewvc?rev=606684&view=rev
Log:
fix reopen of bug 42999: incorrect AnchorHeight calculations in
HSSFClientAnchor.getAnchorHeightInPoints
Modified:
poi/trunk/src/java/org/apache/poi/hssf/usermodel/HSSFClientAnchor.java
poi/trunk/src/testcases/org/apache/poi/hssf/usermodel/TestHSSFClientAnchor.java
Modified: poi/trunk/src/java/org/apache/poi/hssf/usermodel/HSSFClientAnchor.java
URL:
http://svn.apache.org/viewvc/poi/trunk/src/java/org/apache/poi/hssf/usermodel/HSSFClientAnchor.java?rev=606684&r1=606683&r2=606684&view=diff
==============================================================================
--- poi/trunk/src/java/org/apache/poi/hssf/usermodel/HSSFClientAnchor.java
(original)
+++ poi/trunk/src/java/org/apache/poi/hssf/usermodel/HSSFClientAnchor.java Mon
Dec 24 01:48:11 2007
@@ -82,8 +82,8 @@
*/
public float getAnchorHeightInPoints(HSSFSheet sheet )
{
- int y1 = Math.min( getDy1(), getDy2() );
- int y2 = Math.max( getDy1(), getDy2() );
+ int y1 = getDy1();
+ int y2 = getDy2();
int row1 = Math.min( getRow1(), getRow2() );
int row2 = Math.max( getRow1(), getRow2() );
Modified:
poi/trunk/src/testcases/org/apache/poi/hssf/usermodel/TestHSSFClientAnchor.java
URL:
http://svn.apache.org/viewvc/poi/trunk/src/testcases/org/apache/poi/hssf/usermodel/TestHSSFClientAnchor.java?rev=606684&r1=606683&r2=606684&view=diff
==============================================================================
---
poi/trunk/src/testcases/org/apache/poi/hssf/usermodel/TestHSSFClientAnchor.java
(original)
+++
poi/trunk/src/testcases/org/apache/poi/hssf/usermodel/TestHSSFClientAnchor.java
Mon Dec 24 01:48:11 2007
@@ -85,4 +85,23 @@
assertEquals(anchor[i].getRow2(), record.getRow2());
}
}
+
+ public void testAnchorHeightInPoints(){
+ HSSFWorkbook wb = new HSSFWorkbook();
+ HSSFSheet sheet = wb.createSheet();
+
+ HSSFClientAnchor[] anchor = {
+ new HSSFClientAnchor( 0 , 0, 0 , 0 ,(short)0, 1,(short)1, 3),
+ new HSSFClientAnchor( 0 , 254 , 0 , 126 ,(short)0, 1,(short)1, 3),
+ new HSSFClientAnchor( 0 , 128 , 0 , 128 ,(short)0, 1,(short)1, 3),
+ new HSSFClientAnchor( 0 , 0 , 0 , 128 ,(short)0, 1,(short)1, 3),
+ };
+ float[] ref = {24.0f, 18.0f, 24.0f, 30.0f};
+ for (int i = 0; i < anchor.length; i++) {
+ float height = anchor[i].getAnchorHeightInPoints(sheet);
+ assertEquals(ref[i], height, 0);
+ }
+
+ }
+
}
---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
