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

add XWPFDocument.getSettings 

git-svn-id: https://svn.apache.org/repos/asf/poi/trunk@1897949 13f79535-47bb-0310-9956-ffa450edef68
This commit is contained in:
PJ Fanning 2022-02-10 22:41:04 +00:00
parent 078375914e
commit 98091532bf
2 changed files with 16 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
poi-ooxml/src/main/java/org/apache/poi/xwpf/usermodel/XWPFDocument.java
View File

@ -1448,6 +1448,14 @@ public class XWPFDocument extends POIXMLDocument implements Document, IBody {
return Collections.unmodifiableList(result);
}
/**
* @return document level settings
* @since POI 5.2.1
*/
public XWPFSettings getSettings() {
return settings;
}
void registerPackagePictureData(XWPFPictureData picData) {
List<XWPFPictureData> list = packagePictures.computeIfAbsent(picData.getChecksum(), k -> new ArrayList<>(1));
if (!list.contains(picData)) {

12
poi/src/main/java/org/apache/poi/ss/formula/atp/WorkdayCalculator.java
View File

@ -69,9 +69,7 @@ public class WorkdayCalculator {
while (workdays != 0) {
endDate.add(Calendar.DAY_OF_YEAR, direction);
excelEndDate += direction;
if (endDate.get(Calendar.DAY_OF_WEEK) != Calendar.SATURDAY
&& endDate.get(Calendar.DAY_OF_WEEK) != Calendar.SUNDAY
&& !isHoliday(excelEndDate, holidays)) {
if (!isWeekend(endDate) && !isHoliday(excelEndDate, holidays)) {
workdays -= direction;
}
}
@ -129,7 +127,12 @@ public class WorkdayCalculator {
protected boolean isWeekend(double aDate) {
Calendar date = LocaleUtil.getLocaleCalendar();
date.setTime(DateUtil.getJavaDate(aDate));
return date.get(Calendar.DAY_OF_WEEK) == Calendar.SATURDAY || date.get(Calendar.DAY_OF_WEEK) == Calendar.SUNDAY;
return isWeekend(date);
}
private boolean isWeekend(Calendar date) {
return date.get(Calendar.DAY_OF_WEEK) != Calendar.SATURDAY
&& date.get(Calendar.DAY_OF_WEEK) != Calendar.SUNDAY;
}
/**
@ -155,4 +158,5 @@ public class WorkdayCalculator {
protected boolean isInARange(double start, double end, double aDate) {
return aDate >= start && aDate <= end;
}
}