poi-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From ye...@apache.org
Subject svn commit: r682621 - in /poi/trunk/src: documentation/content/xdocs/changes.xml documentation/content/xdocs/hslf/how-to-shapes.xml documentation/content/xdocs/status.xml java/org/apache/poi/hssf/usermodel/HSSFRow.java
Date Tue, 05 Aug 2008 08:06:51 GMT
Author: yegor
Date: Tue Aug  5 01:06:50 2008
New Revision: 682621

URL: http://svn.apache.org/viewvc?rev=682621&view=rev
Log:
fixed bug #44692: HSSFPicture.resize() stretched image when there was a text next to it

Modified:
    poi/trunk/src/documentation/content/xdocs/changes.xml
    poi/trunk/src/documentation/content/xdocs/hslf/how-to-shapes.xml
    poi/trunk/src/documentation/content/xdocs/status.xml
    poi/trunk/src/java/org/apache/poi/hssf/usermodel/HSSFRow.java

Modified: poi/trunk/src/documentation/content/xdocs/changes.xml
URL: http://svn.apache.org/viewvc/poi/trunk/src/documentation/content/xdocs/changes.xml?rev=682621&r1=682620&r2=682621&view=diff
==============================================================================
--- poi/trunk/src/documentation/content/xdocs/changes.xml (original)
+++ poi/trunk/src/documentation/content/xdocs/changes.xml Tue Aug  5 01:06:50 2008
@@ -37,6 +37,8 @@
 
 		<!-- Don't forget to update status.xml too! -->
         <release version="3.1.1-alpha1" date="2008-??-??">
+           <action dev="POI-DEVELOPERS" type="fix">45472 - Fixed incorrect default
row height in OpenOffice 2.3</action>
+           <action dev="POI-DEVELOPERS" type="fix">44692 - HSSFPicture.resize() stretched
image when there was a text next to it</action>
            <action dev="POI-DEVELOPERS" type="add">45543 - Optionally extract comment
text with PowerPointExtractor, and initial hslf model support for comments</action>
            <action dev="POI-DEVELOPERS" type="fix">45538 - Include excel headers and
footers in the output of ExcelExtractor</action>
            <action dev="POI-DEVELOPERS" type="fix">44894 - refactor duplicate logic
from EventRecordFactory to RecordFactory</action>

Modified: poi/trunk/src/documentation/content/xdocs/hslf/how-to-shapes.xml
URL: http://svn.apache.org/viewvc/poi/trunk/src/documentation/content/xdocs/hslf/how-to-shapes.xml?rev=682621&r1=682620&r2=682621&view=diff
==============================================================================
--- poi/trunk/src/documentation/content/xdocs/hslf/how-to-shapes.xml (original)
+++ poi/trunk/src/documentation/content/xdocs/hslf/how-to-shapes.xml Tue Aug  5 01:06:50 2008
@@ -620,7 +620,6 @@
                   </source>
                   </section>
                   
-                </section>
             <anchor id="HeadersFooters"/>
             <section><title>How to extract Headers / Footers from an existing
presentation</title>
               <source>
@@ -663,6 +662,7 @@
           hdd.setFootersText("Created by POI-HSLF");
                 </source>
               </section>
+                </section>
         </section>
     </body>
 </document>

Modified: poi/trunk/src/documentation/content/xdocs/status.xml
URL: http://svn.apache.org/viewvc/poi/trunk/src/documentation/content/xdocs/status.xml?rev=682621&r1=682620&r2=682621&view=diff
==============================================================================
--- poi/trunk/src/documentation/content/xdocs/status.xml (original)
+++ poi/trunk/src/documentation/content/xdocs/status.xml Tue Aug  5 01:06:50 2008
@@ -34,6 +34,8 @@
 	<!-- Don't forget to update changes.xml too! -->
     <changes>
         <release version="3.1.1-alpha1" date="2008-??-??">
+           <action dev="POI-DEVELOPERS" type="fix">45472 - Fixed incorrect default
row height in OpenOffice 2.3</action>
+           <action dev="POI-DEVELOPERS" type="fix">44692 - HSSFPicture.resize() stretched
image when there was a text next to it</action>
            <action dev="POI-DEVELOPERS" type="add">45543 - Optionally extract comment
text with PowerPointExtractor, and initial hslf model support for comments</action>
            <action dev="POI-DEVELOPERS" type="fix">45538 - Include excel headers and
footers in the output of ExcelExtractor</action>
            <action dev="POI-DEVELOPERS" type="fix">44894 - refactor duplicate logic
from EventRecordFactory to RecordFactory</action>

Modified: poi/trunk/src/java/org/apache/poi/hssf/usermodel/HSSFRow.java
URL: http://svn.apache.org/viewvc/poi/trunk/src/java/org/apache/poi/hssf/usermodel/HSSFRow.java?rev=682621&r1=682620&r2=682621&view=diff
==============================================================================
--- poi/trunk/src/java/org/apache/poi/hssf/usermodel/HSSFRow.java (original)
+++ poi/trunk/src/java/org/apache/poi/hssf/usermodel/HSSFRow.java Tue Aug  5 01:06:50 2008
@@ -465,7 +465,14 @@
 
     public short getHeight()
     {
-        return row.getHeight();
+        short height = row.getHeight();
+
+        //The low-order 15 bits contain the row height.
+        //The 0x8000 bit indicates that the row is standard height (optional) 
+        if ((height & 0x8000) != 0) height = sheet.getDefaultRowHeight();
+        else height &= 0x7FFF;
+
+        return height;
     }
 
     /**
@@ -475,7 +482,7 @@
 
     public float getHeightInPoints()
     {
-        return (row.getHeight() / 20);
+        return ((float)getHeight() / 20);
     }
 
     /**



---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@poi.apache.org
For additional commands, e-mail: commits-help@poi.apache.org


Mime
View raw message