Apache
/
poi
mirror of https://github.com/apache/poi.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

[bug-55330] add setMargin(PageMargin, double) 

git-svn-id: https://svn.apache.org/repos/asf/poi/trunk@1902890 13f79535-47bb-0310-9956-ffa450edef68
This commit is contained in:
PJ Fanning 2022-07-20 19:32:28 +00:00
parent 5355725197
commit fa045845f5
4 changed files with 84 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

25
poi-ooxml/src/main/java/org/apache/poi/xssf/streaming/SXSSFSheet.java
View File

@ -799,12 +799,33 @@ public class SXSSFSheet implements Sheet, OoxmlSheetExtensions {
/**
* Sets the size of the margin in inches.
*
* @param margin which margin to get
* @param margin which margin to set
* @param size the size of the margin
* @see Sheet#LeftMargin
* @see Sheet#RightMargin
* @see Sheet#TopMargin
* @see Sheet#BottomMargin
* @see Sheet#HeaderMargin
* @see Sheet#FooterMargin
* @deprecated use {@link #setMargin(PageMargin, double)} instead
*/
@Override
@Deprecated
@Removal(version = "7.0.0")
public void setMargin(short margin, double size) {
_sh.setMargin(margin,size);
_sh.setMargin(margin, size);
}
/**
* Sets the size of the margin in inches.
*
* @param margin which margin to set
* @param size the size of the margin
* @since POI 5.2.3
*/
@Override
public void setMargin(PageMargin margin, double size) {
_sh.setMargin(margin, size);
}
/**

29
poi-ooxml/src/main/java/org/apache/poi/xssf/usermodel/XSSFSheet.java
View File

@ -1264,7 +1264,7 @@ public class XSSFSheet extends POIXMLDocumentPart implements Sheet, OoxmlSheetEx
/**
* Sets the size of the margin in inches.
*
* @param margin which margin to get
* @param margin which margin to set
* @param size the size of the margin
* @see Sheet#LeftMargin
* @see Sheet#RightMargin
@ -1272,28 +1272,43 @@ public class XSSFSheet extends POIXMLDocumentPart implements Sheet, OoxmlSheetEx
* @see Sheet#BottomMargin
* @see Sheet#HeaderMargin
* @see Sheet#FooterMargin
* @deprecated use {@link #setMargin(PageMargin, double)} instead
*/
@Override
@Deprecated
@Removal(version = "7.0.0")
public void setMargin(short margin, double size) {
setMargin(PageMargin.getByShortValue(margin), size);
}
/**
* Sets the size of the margin in inches.
*
* @param margin which margin to set
* @param size the size of the margin
* @since POI 5.2.3
*/
@Override
public void setMargin(PageMargin margin, double size) {
CTPageMargins pageMargins = worksheet.isSetPageMargins() ?
worksheet.getPageMargins() : worksheet.addNewPageMargins();
switch (margin) {
case LeftMargin:
case LEFT:
pageMargins.setLeft(size);
break;
case RightMargin:
case RIGHT:
pageMargins.setRight(size);
break;
case TopMargin:
case TOP:
pageMargins.setTop(size);
break;
case BottomMargin:
case BOTTOM:
pageMargins.setBottom(size);
break;
case HeaderMargin:
case HEADER:
pageMargins.setHeader(size);
break;
case FooterMargin:
case FOOTER:
pageMargins.setFooter(size);
break;
default :

31
poi/src/main/java/org/apache/poi/hssf/usermodel/HSSFSheet.java
View File

@ -1341,20 +1341,41 @@ public final class HSSFSheet implements Sheet {
/**
* Sets the size of the margin in inches.
*
* @param margin which margin to get
* @param size the size of the margin
* @param margin which margin to set
* @param size the size of the margin
* @see Sheet#LeftMargin
* @see Sheet#RightMargin
* @see Sheet#TopMargin
* @see Sheet#BottomMargin
* @see Sheet#HeaderMargin
* @see Sheet#FooterMargin
* @deprecated use {@link #setMargin(PageMargin, double)} instead
*/
@Override
@Deprecated
@Removal(version = "7.0.0")
public void setMargin(short margin, double size) {
setMargin(PageMargin.getByShortValue(margin), size);
}
/**
* Sets the size of the margin in inches.
*
* @param margin which margin to set
* @param size the size of the margin
* @since POI 5.2.3
*/
@Override
public void setMargin(PageMargin margin, double size) {
switch (margin) {
case FooterMargin:
case FOOTER:
_sheet.getPageSettings().getPrintSetup().setFooterMargin(size);
break;
case HeaderMargin:
case HEADER:
_sheet.getPageSettings().getPrintSetup().setHeaderMargin(size);
break;
default:
_sheet.getPageSettings().setMargin(margin, size);
_sheet.getPageSettings().setMargin(margin.getLegacyApiValue(), size);
}
}

14
poi/src/main/java/org/apache/poi/ss/usermodel/Sheet.java
View File

@ -642,11 +642,23 @@ public interface Sheet extends Iterable<Row> {
/**
* Sets the size of the margin in inches.
*
* @param margin which margin to get
* @param margin which margin to set
* @param size the size of the margin
* @deprecated use {@link #setMargin(PageMargin, double)} instead
*/
@Deprecated
@Removal(version = "7.0.0")
void setMargin(short margin, double size);
/**
* Sets the size of the margin in inches.
*
* @param margin which margin to set
* @param size the size of the margin
* @since POI 5.2.3
*/
void setMargin(PageMargin margin, double size);
/**
* Answer whether protection is enabled or disabled
*