You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@poi.apache.org by ye...@apache.org on 2012/02/27 16:22:23 UTC
svn commit: r1294181 - in /poi/trunk/src:
documentation/content/xdocs/status.xml
java/org/apache/poi/hssf/usermodel/HSSFSheet.java
ooxml/java/org/apache/poi/xssf/usermodel/XSSFSheet.java
testcases/org/apache/poi/ss/usermodel/BaseTestSheet.java
Author: yegor
Date: Mon Feb 27 15:22:22 2012
New Revision: 1294181
URL: http://svn.apache.org/viewvc?rev=1294181&view=rev
Log:
Bugzilla 52574 - support setting header / footer page margins in HSSF
Modified:
poi/trunk/src/documentation/content/xdocs/status.xml
poi/trunk/src/java/org/apache/poi/hssf/usermodel/HSSFSheet.java
poi/trunk/src/ooxml/java/org/apache/poi/xssf/usermodel/XSSFSheet.java
poi/trunk/src/testcases/org/apache/poi/ss/usermodel/BaseTestSheet.java
Modified: poi/trunk/src/documentation/content/xdocs/status.xml
URL: http://svn.apache.org/viewvc/poi/trunk/src/documentation/content/xdocs/status.xml?rev=1294181&r1=1294180&r2=1294181&view=diff
==============================================================================
--- poi/trunk/src/documentation/content/xdocs/status.xml (original)
+++ poi/trunk/src/documentation/content/xdocs/status.xml Mon Feb 27 15:22:22 2012
@@ -34,6 +34,8 @@
<changes>
<release version="3.8-beta6" date="2012-??-??">
+ <action dev="poi-developers" type="add">52574 - support setting header / footer page margins in HSSF </action>
+ <action dev="poi-developers" type="add">52583 - fixed WorkbookUtil#createSafeSheetName to escape colon </action>
<action dev="poi-developers" type="add">51710 - fixed reading shared formulas in XSSF </action>
<action dev="poi-developers" type="add">52708 - misc improvements in CellFormat </action>
<action dev="poi-developers" type="add">52690 - added a getter for length of encrypted data in Ecma and Agile decryptors</action>
Modified: poi/trunk/src/java/org/apache/poi/hssf/usermodel/HSSFSheet.java
URL: http://svn.apache.org/viewvc/poi/trunk/src/java/org/apache/poi/hssf/usermodel/HSSFSheet.java?rev=1294181&r1=1294180&r2=1294181&view=diff
==============================================================================
--- poi/trunk/src/java/org/apache/poi/hssf/usermodel/HSSFSheet.java (original)
+++ poi/trunk/src/java/org/apache/poi/hssf/usermodel/HSSFSheet.java Mon Feb 27 15:22:22 2012
@@ -1062,7 +1062,14 @@ public final class HSSFSheet implements
* @return the size of the margin
*/
public double getMargin(short margin) {
- return _sheet.getPageSettings().getMargin(margin);
+ switch (margin){
+ case FooterMargin:
+ return _sheet.getPageSettings().getPrintSetup().getFooterMargin();
+ case HeaderMargin:
+ return _sheet.getPageSettings().getPrintSetup().getHeaderMargin();
+ default:
+ return _sheet.getPageSettings().getMargin(margin);
+ }
}
/**
@@ -1071,7 +1078,16 @@ public final class HSSFSheet implements
* @param size the size of the margin
*/
public void setMargin(short margin, double size) {
- _sheet.getPageSettings().setMargin(margin, size);
+ switch (margin){
+ case FooterMargin:
+ _sheet.getPageSettings().getPrintSetup().setFooterMargin(size);
+ break;
+ case HeaderMargin:
+ _sheet.getPageSettings().getPrintSetup().setHeaderMargin(size);
+ break;
+ default:
+ _sheet.getPageSettings().setMargin(margin, size);
+ }
}
private WorksheetProtectionBlock getProtectionBlock() {
Modified: poi/trunk/src/ooxml/java/org/apache/poi/xssf/usermodel/XSSFSheet.java
URL: http://svn.apache.org/viewvc/poi/trunk/src/ooxml/java/org/apache/poi/xssf/usermodel/XSSFSheet.java?rev=1294181&r1=1294180&r2=1294181&view=diff
==============================================================================
--- poi/trunk/src/ooxml/java/org/apache/poi/xssf/usermodel/XSSFSheet.java (original)
+++ poi/trunk/src/ooxml/java/org/apache/poi/xssf/usermodel/XSSFSheet.java Mon Feb 27 15:22:22 2012
@@ -2673,7 +2673,7 @@ public class XSSFSheet extends POIXMLDoc
CTCellFormula sf = (CTCellFormula)f.copy();
CellRangeAddress sfRef = CellRangeAddress.valueOf(sf.getRef());
CellReference cellRef = new CellReference(cell);
- // If the shared formula range preceeds the master cell then the preseeing part is discarded, e.g.
+ // If the shared formula range preceeds the master cell then the preceding part is discarded, e.g.
// if the cell is E60 and the shared formula range is C60:M85 then the effective range is E60:M85
// see more details in https://issues.apache.org/bugzilla/show_bug.cgi?id=51710
if(cellRef.getCol() > sfRef.getFirstColumn() || cellRef.getRow() > sfRef.getFirstRow()){
Modified: poi/trunk/src/testcases/org/apache/poi/ss/usermodel/BaseTestSheet.java
URL: http://svn.apache.org/viewvc/poi/trunk/src/testcases/org/apache/poi/ss/usermodel/BaseTestSheet.java?rev=1294181&r1=1294180&r2=1294181&view=diff
==============================================================================
--- poi/trunk/src/testcases/org/apache/poi/ss/usermodel/BaseTestSheet.java (original)
+++ poi/trunk/src/testcases/org/apache/poi/ss/usermodel/BaseTestSheet.java Mon Feb 27 15:22:22 2012
@@ -557,6 +557,11 @@ public abstract class BaseTestSheet exte
sheet.setMargin(Sheet.BottomMargin, 13.0);
assertEquals(13.0, sheet.getMargin(Sheet.BottomMargin), 0.0);
+ sheet.setMargin(Sheet.FooterMargin, 5.6);
+ assertEquals(5.6, sheet.getMargin(Sheet.FooterMargin), 0.0);
+ sheet.setMargin(Sheet.HeaderMargin, 11.5);
+ assertEquals(11.5, sheet.getMargin(Sheet.HeaderMargin), 0.0);
+
// incorrect margin constant
try {
sheet.setMargin((short) 65, 15);
---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@poi.apache.org
For additional commands, e-mail: commits-help@poi.apache.org