Author: fanningpj
Date: Thu Feb 10 22:41:04 2022
New Revision: 1897949
URL: http://svn.apache.org/viewvc?rev=1897949&view=rev
Log:
add XWPFDocument.getSettings
Modified:
poi/trunk/poi-ooxml/src/main/java/org/apache/poi/xwpf/usermodel/XWPFDocument.java
poi/trunk/poi/src/main/java/org/apache/poi/ss/formula/atp/WorkdayCalculator.java
Modified:
poi/trunk/poi-ooxml/src/main/java/org/apache/poi/xwpf/usermodel/XWPFDocument.java
URL:
http://svn.apache.org/viewvc/poi/trunk/poi-ooxml/src/main/java/org/apache/poi/xwpf/usermodel/XWPFDocument.java?rev=1897949&r1=1897948&r2=1897949&view=diff
==============================================================================
---
poi/trunk/poi-ooxml/src/main/java/org/apache/poi/xwpf/usermodel/XWPFDocument.java
(original)
+++
poi/trunk/poi-ooxml/src/main/java/org/apache/poi/xwpf/usermodel/XWPFDocument.java
Thu Feb 10 22:41:04 2022
@@ -1448,6 +1448,14 @@ public class XWPFDocument extends POIXML
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)) {
Modified:
poi/trunk/poi/src/main/java/org/apache/poi/ss/formula/atp/WorkdayCalculator.java
URL:
http://svn.apache.org/viewvc/poi/trunk/poi/src/main/java/org/apache/poi/ss/formula/atp/WorkdayCalculator.java?rev=1897949&r1=1897948&r2=1897949&view=diff
==============================================================================
---
poi/trunk/poi/src/main/java/org/apache/poi/ss/formula/atp/WorkdayCalculator.java
(original)
+++
poi/trunk/poi/src/main/java/org/apache/poi/ss/formula/atp/WorkdayCalculator.java
Thu Feb 10 22:41:04 2022
@@ -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;
}
+
}
---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]
